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/07/17 00:02:20 UTC
svn commit: r677445 - in /incubator/shindig/trunk/java:
server/src/main/webapp/WEB-INF/ social-api/
social-api/src/main/java/org/apache/shindig/social/
social-api/src/main/java/org/apache/shindig/social/abdera/
social-api/src/main/java/org/apache/shind...
Author: doll
Date: Wed Jul 16 15:02:19 2008
New Revision: 677445
URL: http://svn.apache.org/viewvc?rev=677445&view=rev
Log:
Deleting the abdera java restful code.
The social/dataservice package is now the main restful implementation for the java code.
Removed:
incubator/shindig/trunk/java/social-api/RESTFUL-ADAPTER-README
incubator/shindig/trunk/java/social-api/RESTFUL-DISPATCHING-README
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RestServerServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerRouteManager.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/samplecontainer/
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml?rev=677445&r1=677444&r2=677445&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml Wed Jul 16 15:02:19 2008
@@ -90,13 +90,8 @@
<servlet>
<servlet-name>restapiServlet</servlet-name>
<servlet-class>
- org.apache.shindig.social.RestServerServlet
+ org.apache.shindig.social.dataservice.DataServiceServlet
</servlet-class>
- <init-param>
- <param-name>org.apache.abdera.protocol.server.Provider</param-name>
- <param-value>org.apache.shindig.social.abdera.SocialApiProvider
- </param-value>
- </init-param>
</servlet>
<servlet-mapping>
@@ -108,7 +103,7 @@
<servlet-name>proxy</servlet-name>
<url-pattern>/gadgets/proxy/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>makeRequest</servlet-name>
<url-pattern>/gadgets/makeRequest</url-pattern>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml?rev=677445&r1=677444&r2=677445&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml Wed Jul 16 15:02:19 2008
@@ -51,24 +51,12 @@
</servlet-class>
</servlet>
- <!-- Serve the new rest code -->
- <servlet>
- <servlet-name>jsonrest</servlet-name>
- <servlet-class>
- org.apache.shindig.social.dataservice.DataServiceServlet
- </servlet-class>
- </servlet>
-
<!-- Serve REST api -->
<servlet>
<servlet-name>restapiServlet</servlet-name>
<servlet-class>
- org.apache.shindig.social.RestServerServlet
+ org.apache.shindig.social.dataservice.DataServiceServlet
</servlet-class>
- <init-param>
- <param-name>org.apache.abdera.protocol.server.Provider</param-name>
- <param-value>org.apache.shindig.social.abdera.SocialApiProvider</param-value>
- </init-param>
</servlet>
<servlet-mapping>
@@ -77,11 +65,6 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>jsonrest</servlet-name>
- <url-pattern>/social/jsonrest/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>restapiServlet</servlet-name>
<url-pattern>/social/rest/*</url-pattern>
</servlet-mapping>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=677445&r1=677444&r2=677445&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Wed Jul 16 15:02:19 2008
@@ -81,14 +81,6 @@
</servlet-class>
</servlet>
- <!-- Serve the new rest code -->
- <servlet>
- <servlet-name>jsonrest</servlet-name>
- <servlet-class>
- org.apache.shindig.social.dataservice.DataServiceServlet
- </servlet-class>
- </servlet>
-
<!-- javascript serving -->
<servlet>
<servlet-name>js</servlet-name>
@@ -99,12 +91,8 @@
<servlet>
<servlet-name>restapiServlet</servlet-name>
<servlet-class>
- org.apache.shindig.social.RestServerServlet
+ org.apache.shindig.social.dataservice.DataServiceServlet
</servlet-class>
- <init-param>
- <param-name>org.apache.abdera.protocol.server.Provider</param-name>
- <param-value>org.apache.shindig.social.abdera.SocialApiProvider</param-value>
- </init-param>
</servlet>
<servlet-mapping>
@@ -143,11 +131,6 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>jsonrest</servlet-name>
- <url-pattern>/social/jsonrest/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>restapiServlet</servlet-name>
<url-pattern>/social/rest/*</url-pattern>
</servlet-mapping>
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java?rev=677445&r1=677444&r2=677445&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java Wed Jul 16 15:02:19 2008
@@ -19,12 +19,10 @@
package org.apache.shindig.social;
import org.apache.shindig.common.servlet.ParameterFetcher;
-import org.apache.shindig.social.abdera.SocialRouteManager;
import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
import org.apache.shindig.social.dataservice.HandlerProvider;
import org.apache.shindig.social.opensocial.OpenSocialDataHandler;
import org.apache.shindig.social.samplecontainer.SampleContainerHandlerProvider;
-import org.apache.shindig.social.samplecontainer.SampleContainerRouteManager;
import org.apache.shindig.social.samplecontainer.StateFileDataHandler;
import com.google.common.collect.Lists;
@@ -48,7 +46,6 @@
bind(new TypeLiteral<List<GadgetDataHandler>>() {})
.toProvider(GadgetDataHandlersProvider.class);
- bind(SocialRouteManager.class).to(SampleContainerRouteManager.class);
bind(HandlerProvider.class).to(SampleContainerHandlerProvider.class);
bind(ParameterFetcher.class).annotatedWith(Names.named("GadgetDataServlet")).to(GadgetDataServletFetcher.class);
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=677445&r1=677444&r2=677445&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Wed Jul 16 15:02:19 2008
@@ -18,21 +18,8 @@
*/
package org.apache.shindig.social;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
-import com.google.inject.name.Names;
-
import org.apache.shindig.common.servlet.ParameterFetcher;
-import org.apache.shindig.social.abdera.SocialRouteManager;
-import org.apache.shindig.social.dataservice.ActivityService;
-import org.apache.shindig.social.dataservice.AppDataService;
import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
-import org.apache.shindig.social.dataservice.PersonService;
-import org.apache.shindig.social.opensocial.ActivitiesService;
-import org.apache.shindig.social.opensocial.DataService;
-import org.apache.shindig.social.opensocial.PeopleService;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.ActivityImpl;
import org.apache.shindig.social.opensocial.model.Address;
@@ -51,12 +38,14 @@
import org.apache.shindig.social.opensocial.model.PhoneImpl;
import org.apache.shindig.social.opensocial.model.Url;
import org.apache.shindig.social.opensocial.model.UrlImpl;
-import org.apache.shindig.social.samplecontainer.BasicActivitiesService;
-import org.apache.shindig.social.samplecontainer.BasicDataService;
-import org.apache.shindig.social.samplecontainer.BasicPeopleService;
-import org.apache.shindig.social.samplecontainer.SampleContainerRouteManager;
import org.apache.shindig.social.samplecontainer.XmlStateFileFetcher;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.inject.AbstractModule;
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+
import java.net.URI;
import java.util.Date;
import java.util.HashMap;
@@ -75,7 +64,6 @@
protected void configure() {
bind(XmlStateFileFetcher.class).to(MockXmlStateFileFetcher.class);
- bind(SocialRouteManager.class).to(SampleContainerRouteManager.class);
bind(ParameterFetcher.class).annotatedWith(Names.named("GadgetDataServlet")).to(GadgetDataServletFetcher.class);
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet")).to(DataServiceServletFetcher.class);