Author: ivol37 at gmail.com
Date: Thu Nov 11 08:49:37 2010
New Revision: 385

Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout

Added:
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
      - copied, changed from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
      - copied, changed from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
      - copied, changed from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
      - copied, changed from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
      - copied, changed from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
      - copied, changed from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
Removed:
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
Modified:
   trunk/amdatu-opensocial/gadgetmanagement/pom.xml
   
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/GadgetManagement.java
   
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
   
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/OAuthModuleImpl.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/SocialApiModuleImpl.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/Activator.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraAppDataServiceStore.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraOAuthStore.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetColumnFamilyProvider.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetStoreImpl.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorServiceImpl.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/OAuthModuleImpl.java
   
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/SocialApiModuleImpl.java

Modified: trunk/amdatu-opensocial/gadgetmanagement/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/gadgetmanagement/pom.xml    (original)
+++ trunk/amdatu-opensocial/gadgetmanagement/pom.xml    Thu Nov 11 08:49:37 2010
@@ -27,13 +27,13 @@
       <type>bundle</type>
     </dependency>
     <dependency>
-      <groupId>org.amdatu.core.cassandra</groupId>
+      <groupId>org.amdatu.core.cassandra.application</groupId>
       <artifactId>persistencemanager</artifactId>
       <scope>provided</scope>
       <type>bundle</type>
     </dependency>   
     <dependency>
-      <groupId>org.amdatu.core.cassandra</groupId>
+      <groupId>org.amdatu.core.cassandra.application</groupId>
       <artifactId>listener</artifactId>
       <scope>provided</scope>
       <type>bundle</type>

Modified: 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/GadgetManagement.java
==============================================================================
--- 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/GadgetManagement.java
 (original)
+++ 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/GadgetManagement.java
 Thu Nov 11 08:49:37 2010
@@ -16,8 +16,8 @@
  */
 package org.amdatu.opensocial.gadgetmanagement;
 
-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;
 
 /**
  * This service provides CRUD operations on all gadgets definitions available 
in the gadget store. The gadget

Modified: 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
==============================================================================
--- 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
   (original)
+++ 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
   Thu Nov 11 08:49:37 2010
@@ -22,7 +22,7 @@
 import 
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
 import org.amdatu.web.httpcontext.HttpContextServiceFactory;
 import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetStore;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;

Modified: 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
--- 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
      (original)
+++ 
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
      Thu Nov 11 08:49:37 2010
@@ -50,10 +50,10 @@
 import org.amdatu.web.httpcontext.BasicHttpSession;
 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.application.GadgetStore;
-import org.amdatu.opensocial.shindig.application.OpenSocialConstants;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetStore;
+import org.amdatu.opensocial.shindig.OpenSocialConstants;
 import org.apache.felix.dm.Component;
 import org.apache.shindig.auth.BlobCrypterSecurityToken;
 import org.apache.shindig.common.crypto.BasicBlobCrypter;

Copied: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
 (from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java)
==============================================================================
--- 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
    (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
 Thu Nov 11 08:49:37 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;
+package org.amdatu.opensocial.shindig;
 
 /**
  * Represents a gadget category.

Copied: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
 (from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java)
==============================================================================
--- 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
  (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
       Thu Nov 11 08:49:37 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;
+package org.amdatu.opensocial.shindig;
 
 public class GadgetDefinition implements Comparable<GadgetDefinition>{
     // Attributes

Copied: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
 (from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java)
==============================================================================
--- 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
       (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
    Thu Nov 11 08:49:37 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;
+package org.amdatu.opensocial.shindig;
 
 import java.util.Map;
 

Copied: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
 (from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java)
==============================================================================
--- 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
       (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
    Thu Nov 11 08:49:37 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;
+package org.amdatu.opensocial.shindig;
 
 import com.google.inject.Module;
 

Copied: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
 (from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java)
==============================================================================
--- 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
       (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
    Thu Nov 11 08:49:37 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;
+package org.amdatu.opensocial.shindig;
 
 public interface OpenSocialConstants {
     /**

Copied: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
 (from r383, 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java)
==============================================================================
--- 
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
   (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
        Thu Nov 11 08:49:37 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;
+package org.amdatu.opensocial.shindig;
 
 import com.google.inject.Module;
 

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/OAuthModuleImpl.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/OAuthModuleImpl.java
     (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/OAuthModuleImpl.java
     Thu Nov 11 08:49:37 2010
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import org.amdatu.opensocial.shindig.application.OAuthModule;
+import org.amdatu.opensocial.shindig.OAuthModule;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shindig.common.crypto.BasicBlobCrypter;
 import org.apache.shindig.common.crypto.BlobCrypter;

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/SocialApiModuleImpl.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/SocialApiModuleImpl.java
 (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/SocialApiModuleImpl.java
 Thu Nov 11 08:49:37 2010
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.amdatu.opensocial.shindig.application.SocialApiModule;
+import org.amdatu.opensocial.shindig.SocialApiModule;
 import 
org.amdatu.opensocial.shindig.application.service.PersonServiceDispatcher;
 import org.apache.shindig.auth.AnonymousAuthenticationHandler;
 import org.apache.shindig.auth.AuthenticationHandler;

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/Activator.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/Activator.java
     (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/Activator.java
     Thu Nov 11 08:49:37 2010
@@ -21,9 +21,9 @@
 import 
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
 import org.amdatu.web.httpcontext.HttpContextServiceFactory;
 import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
-import org.amdatu.opensocial.shindig.application.OAuthModule;
-import org.amdatu.opensocial.shindig.application.SocialApiModule;
+import org.amdatu.opensocial.shindig.GadgetStore;
+import org.amdatu.opensocial.shindig.OAuthModule;
+import org.amdatu.opensocial.shindig.SocialApiModule;
 import 
org.amdatu.opensocial.shindig.application.persistence.CassandraAppDataServiceStore;
 import 
org.amdatu.opensocial.shindig.application.persistence.CassandraOAuthStore;
 import 
org.amdatu.opensocial.shindig.application.persistence.GadgetColumnFamilyProvider;

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraAppDataServiceStore.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraAppDataServiceStore.java
   (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraAppDataServiceStore.java
   Thu Nov 11 08:49:37 2010
@@ -25,7 +25,7 @@
 
 import com.google.common.collect.Maps;
 import org.amdatu.libraries.utilities.ConversionUtil;
-import org.amdatu.opensocial.shindig.application.OpenSocialConstants;
+import org.amdatu.opensocial.shindig.OpenSocialConstants;
 import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.protocol.DataCollection;

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraOAuthStore.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraOAuthStore.java
    (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraOAuthStore.java
    Thu Nov 11 08:49:37 2010
@@ -24,8 +24,8 @@
 import net.oauth.OAuthServiceProvider;
 import net.oauth.signature.RSA_SHA1;
 
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetStore;
 import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.gadgets.GadgetException;
 import org.apache.shindig.gadgets.oauth.*;

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetColumnFamilyProvider.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetColumnFamilyProvider.java
     (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetColumnFamilyProvider.java
     Thu Nov 11 08:49:37 2010
@@ -21,7 +21,7 @@
 import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
 import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
 import 
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetStore;
 
 /**
  * This service only provides the Role Column Family. Note that the 
CassandraStorageProvider has

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetStoreImpl.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetStoreImpl.java
        (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetStoreImpl.java
        Thu Nov 11 08:49:37 2010
@@ -28,9 +28,9 @@
 
 import org.amdatu.core.cassandra.persistencemanager.CassandraException;
 import 
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.opensocial.shindig.application.GadgetCategory;
-import org.amdatu.opensocial.shindig.application.GadgetDefinition;
-import org.amdatu.opensocial.shindig.application.GadgetStore;
+import org.amdatu.opensocial.shindig.GadgetCategory;
+import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.GadgetStore;
 import org.apache.commons.io.IOUtils;
 import org.apache.shindig.gadgets.oauth.BasicOAuthStore;
 import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret;

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/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/application/service/GuiceInjectorServiceImpl.java
   Thu Nov 11 08:49:37 2010
@@ -29,8 +29,8 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServlet;
 
-import org.amdatu.opensocial.shindig.application.OAuthModule;
-import org.amdatu.opensocial.shindig.application.SocialApiModule;
+import org.amdatu.opensocial.shindig.OAuthModule;
+import org.amdatu.opensocial.shindig.SocialApiModule;
 import org.amdatu.opensocial.shindig.module.ConfigurationAdminGuiceModule;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;

Modified: 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/OAuthModuleImpl.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/OAuthModuleImpl.java
 (original)
+++ 
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/module/OAuthModuleImpl.java
 Thu Nov 11 08:49:37 2010
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import org.amdatu.opensocial.shindig.application.OAuthModule;
+import org.amdatu.opensocial.shindig.OAuthModule;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shindig.common.crypto.BasicBlobCrypter;
 import org.apache.shindig.common.crypto.BlobCrypter;

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:49:37 2010
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.amdatu.opensocial.shindig.application.SocialApiModule;
+import org.amdatu.opensocial.shindig.SocialApiModule;
 import 
org.amdatu.opensocial.shindig.application.service.PersonServiceDispatcher;
 import org.apache.shindig.auth.AnonymousAuthenticationHandler;
 import org.apache.shindig.auth.AuthenticationHandler;

Reply via email to