Author: ivol37 at gmail.com
Date: Thu Nov 11 08:53:26 2010
New Revision: 388
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/
- copied from r386,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/
Removed:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/
Modified:
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/service/CourseGadgetServiceImpl.java
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/EchoServlet.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorService.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServiceImpl.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServlet.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/PersonServiceDispatcher.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
Modified:
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
==============================================================================
---
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
(original)
+++
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/service/LoginGadgetImpl.java
Thu Nov 11 08:53:26 2010
@@ -23,8 +23,8 @@
import org.amdatu.authorization.login.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
Modified:
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/service/CourseGadgetServiceImpl.java
==============================================================================
---
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/service/CourseGadgetServiceImpl.java
(original)
+++
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/service/CourseGadgetServiceImpl.java
Thu Nov 11 08:53:26 2010
@@ -23,8 +23,8 @@
import org.amdatu.example.course.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
Modified:
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
==============================================================================
---
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
(original)
+++
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
Thu Nov 11 08:53:26 2010
@@ -25,8 +25,8 @@
import org.amdatu.example.friends.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.java
==============================================================================
---
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.java
Thu Nov 11 08:53:26 2010
@@ -20,7 +20,7 @@
import java.util.Set;
import org.amdatu.opensocial.shindig.SocialApiModule;
-import
org.amdatu.opensocial.shindig.application.service.PersonServiceDispatcher;
+import org.amdatu.opensocial.shindig.service.PersonServiceDispatcher;
import org.apache.shindig.auth.AnonymousAuthenticationHandler;
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.servlet.ParameterFetcher;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Thu Nov 11 08:53:26 2010
@@ -24,9 +24,6 @@
import org.amdatu.opensocial.shindig.GadgetStore;
import org.amdatu.opensocial.shindig.OAuthModule;
import org.amdatu.opensocial.shindig.SocialApiModule;
-import org.amdatu.opensocial.shindig.application.service.GuiceInjectorService;
-import
org.amdatu.opensocial.shindig.application.service.GuiceInjectorServiceImpl;
-import
org.amdatu.opensocial.shindig.application.service.ShindigRegistrationServiceImpl;
import org.amdatu.opensocial.shindig.module.ConfigurationAdminGuiceModule;
import org.amdatu.opensocial.shindig.module.OAuthModuleImpl;
import org.amdatu.opensocial.shindig.module.SocialApiModuleImpl;
@@ -34,6 +31,9 @@
import org.amdatu.opensocial.shindig.persistence.CassandraOAuthStore;
import org.amdatu.opensocial.shindig.persistence.GadgetColumnFamilyProvider;
import org.amdatu.opensocial.shindig.persistence.GadgetStoreImpl;
+import org.amdatu.opensocial.shindig.service.GuiceInjectorService;
+import org.amdatu.opensocial.shindig.service.GuiceInjectorServiceImpl;
+import org.amdatu.opensocial.shindig.service.ShindigRegistrationServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.apache.shindig.gadgets.oauth.OAuthStore;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/EchoServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/EchoServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/EchoServlet.java
Thu Nov 11 08:53:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.service;
+package org.amdatu.opensocial.shindig.service;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorService.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorService.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorService.java
Thu Nov 11 08:53:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.service;
+package org.amdatu.opensocial.shindig.service;
import javax.servlet.Servlet;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServiceImpl.java
Thu Nov 11 08:53:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.service;
+package org.amdatu.opensocial.shindig.service;
import java.io.IOException;
import java.util.ArrayList;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServlet.java
Thu Nov 11 08:53:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.service;
+package org.amdatu.opensocial.shindig.service;
/**
* This interface enables dependencies on the availability of the Guice
injector servlet using service dependencies.
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/PersonServiceDispatcher.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/PersonServiceDispatcher.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/PersonServiceDispatcher.java
Thu Nov 11 08:53:26 2010
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.service;
+package org.amdatu.opensocial.shindig.service;
import java.util.Set;
import java.util.concurrent.ExecutionException;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
Thu Nov 11 08:53:26 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.opensocial.shindig.application.service;
+package org.amdatu.opensocial.shindig.service;
import static org.amdatu.opensocial.shindig.osgi.Activator.RESOURCE_ID;
Modified:
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
==============================================================================
---
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
(original)
+++
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
Thu Nov 11 08:53:26 2010
@@ -29,8 +29,8 @@
import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.semanticweb.sesame.SPARQLQueryHandler;
import org.amdatu.semanticweb.sesame.SesameService;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.json.JSONException;
import org.json.JSONObject;
