Moving json/twitter-search to extra/twitter-search

Arun Gupta · Arun Gupta · commit bf0198ba1755 · 2013-09-13T09:48:55.000-07:00
diff --git a/extra/pom.xml b/extra/pom.xml
@@ -14,7 +14,8 @@
     <packaging>pom</packaging>
     <name>Java EE 7 Extra Samples</name>
 
-  <modules>
-    <module>quartz</module>
-  </modules>
+    <modules>
+        <module>quartz</module>
+        <module>twitter-search</module>
+    </modules>
 </project>
diff --git a/extra/twitter-search/pom.xml b/extra/twitter-search/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.javaee7.json</groupId>
-        <artifactId>json-samples</artifactId>
+        <groupId>org.javaee7.extra</groupId>
+        <artifactId>extra-samples</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.javaee7.json</groupId>
+    <groupId>org.javaee7.extra</groupId>
     <artifactId>twitter-search</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
diff --git a/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TestServlet.java b/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TestServlet.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.javaee7.json.twitter.search;
+package org.javaee7.extra.twitter.search;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TwitterSearch.java b/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TwitterSearch.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.javaee7.json.twitter.search;
+package org.javaee7.extra.twitter.search;
 
 import javax.inject.Inject;
 import org.glassfish.samples.twitter.api.SearchResults;
diff --git a/extra/twitter-search/src/main/webapp/WEB-INF/beans.xml b/extra/twitter-search/src/main/webapp/WEB-INF/beans.xml
diff --git a/extra/twitter-search/src/main/webapp/index.jsp b/extra/twitter-search/src/main/webapp/index.jsp
diff --git a/json/pom.xml b/json/pom.xml
@@ -19,7 +19,6 @@
         <module>object-reader</module>
         <module>streaming-generate</module>
         <module>streaming-parser</module>
-        <module>twitter-search</module>
     </modules>
 
 </project>
