You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by do...@apache.org on 2008/04/16 13:16:29 UTC
svn commit: r648665 - in /incubator/shindig/trunk: java/ java/gadgets/
java/gadgets/src/main/java/org/apache/shindig/social/
java/gadgets/src/main/webapp/WEB-INF/
java/gadgets/src/test/java/org/apache/shindig/social/ java/social-api/
java/social-api/sr...
Author: doll
Date: Wed Apr 16 04:16:12 2008
New Revision: 648665
URL: http://svn.apache.org/viewvc?rev=648665&view=rev
Log:
Patch from SHINDIG-199
Moved the social java classes from java/gadgets to java/social-api. Did some clumsy maven stuff to make this still compile.
The sample container is broken, future patches will fix it.
Added:
incubator/shindig/trunk/java/pom.xml
- copied, changed from r647714, incubator/shindig/trunk/pom/parent/pom.xml
incubator/shindig/trunk/java/social-api/src/main/java/
incubator/shindig/trunk/java/social-api/src/main/java/org/
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/
- copied from r647714, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/AbstractGadgetData.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractGadgetData.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/DataResponse.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataResponse.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataHandler.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/Mandatory.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Mandatory.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/README
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/README
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/RequestItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseError.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/ResponseError.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseItem.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/ResponseItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/
- copied from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/
- copied from r648664, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/
incubator/shindig/trunk/java/social-api/src/test/
incubator/shindig/trunk/java/social-api/src/test/java/
incubator/shindig/trunk/java/social-api/src/test/java/org/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/
- copied from r647714, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/GadgetDataTest.java
- copied unchanged from r648664, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/GadgetDataTest.java
Removed:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/
incubator/shindig/trunk/pom/parent/pom.xml
Modified:
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java
incubator/shindig/trunk/java/social-api/src/main/webapp/WEB-INF/web.xml
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=648665&r1=648664&r2=648665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Wed Apr 16 04:16:12 2008
@@ -22,7 +22,7 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-parent</artifactId>
<version>1-SNAPSHOT</version>
- <relativePath>../../pom/parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.shindig</groupId>
@@ -105,10 +105,6 @@
<excludeResources>true</excludeResources>
<attach>true</attach>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml?rev=648665&r1=648664&r2=648665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml Wed Apr 16 04:16:12 2008
@@ -57,14 +57,6 @@
</servlet-class>
</servlet>
- <!-- Serve social data -->
- <servlet>
- <servlet-name>socialdata</servlet-name>
- <servlet-class>
- org.apache.shindig.social.GadgetDataServlet
- </servlet-class>
- </servlet>
-
<!-- javascript serving -->
<servlet>
<servlet-name>js</servlet-name>
@@ -89,10 +81,5 @@
<servlet-mapping>
<servlet-name>metadata</servlet-name>
<url-pattern>/metadata</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>socialdata</servlet-name>
- <url-pattern>/socialdata</url-pattern>
</servlet-mapping>
</web-app>
Copied: incubator/shindig/trunk/java/pom.xml (from r647714, incubator/shindig/trunk/pom/parent/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/pom.xml?p2=incubator/shindig/trunk/java/pom.xml&p1=incubator/shindig/trunk/pom/parent/pom.xml&r1=647714&r2=648665&rev=648665&view=diff
==============================================================================
--- incubator/shindig/trunk/pom/parent/pom.xml (original)
+++ incubator/shindig/trunk/java/pom.xml Wed Apr 16 04:16:12 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -36,6 +38,11 @@
<url>http://incubator.apache.org/shindig</url>
<inceptionYear>2007</inceptionYear>
+ <modules>
+ <module>gadgets</module>
+ <module>social-api</module>
+ </modules>
+
<mailingLists>
<mailingList>
<name>Shindig Dev List</name>
@@ -63,8 +70,8 @@
<url>scp://people.apache.org/www/incubator.apache.org/shindig</url>
</site>
</distributionManagement>
-
- <!--
+
+ <!--
<ciManagement>
<system>continuum</system>
<url>http://vmbuild.apache.org/continuum/</url>
@@ -98,6 +105,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -145,9 +156,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.3</version>
- <configuration>
+ <configuration>
<source>1.5</source>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=648665&r1=648664&r2=648665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Wed Apr 16 04:16:12 2008
@@ -22,7 +22,7 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-parent</artifactId>
<version>1-SNAPSHOT</version>
- <relativePath>../../pom/parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.shindig</groupId>
@@ -80,10 +80,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -97,7 +93,7 @@
</plugin>
</plugins>
</build>
-
+
<repositories>
<!-- For Abdera -->
<repository>
@@ -135,9 +131,19 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<version>0.4.0-incubating-SNAPSHOT</version>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-server</artifactId>
+ </dependency>
+ <dependency>
+ <version>1-SNAPSHOT</version>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>gadgets</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java?rev=648665&r1=648664&r2=648665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java Wed Apr 16 04:16:12 2008
@@ -11,7 +11,6 @@
import org.apache.shindig.social.opensocial.model.Name;
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.model.Phone;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -20,6 +19,8 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import java.io.StringReader;
import java.net.URI;
@@ -28,9 +29,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
/**
* @author Cassandra Doll <do...@google.com>
Modified: incubator/shindig/trunk/java/social-api/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/webapp/WEB-INF/web.xml?rev=648665&r1=648664&r2=648665&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shindig/trunk/java/social-api/src/main/webapp/WEB-INF/web.xml Wed Apr 16 04:16:12 2008
@@ -22,4 +22,29 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
+ <!-- configuration -->
+ <!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
+ <context-param>
+ <param-name>guice-modules</param-name>
+ <param-value>org.apache.shindig.gadgets.http.HttpGuiceModule</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.apache.shindig.gadgets.http.GuiceServletContextListener
+ </listener-class>
+ </listener>
+
+ <!-- Serve social data -->
+ <servlet>
+ <servlet-name>socialdata</servlet-name>
+ <servlet-class>
+ org.apache.shindig.social.GadgetDataServlet
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>socialdata</servlet-name>
+ <url-pattern>/socialdata</url-pattern>
+ </servlet-mapping>
</web-app>