Author: ivol37 at gmail.com
Date: Wed Nov 10 17:06:15 2010
New Revision: 383
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
- copied, changed from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
- copied, changed from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
- copied, changed from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
- copied, changed from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
- copied, changed from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
- copied, changed from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/ConfigurationAdminGuiceModule.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/oauth/
- copied from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/
- copied from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/
- copied from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/
- copied from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/
Removed:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/osgi/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/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/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/oauth/AmdatuOAuthServlet.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/EchoServlet.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorService.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/application/service/GuiceInjectorServlet.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/PersonServiceDispatcher.java
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.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
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
Wed Nov 10 17:06:15 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.GadgetCategory;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.application.GadgetCategory;
+import org.amdatu.opensocial.shindig.application.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
Wed Nov 10 17:06:15 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.GadgetCategory;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.application.GadgetCategory;
+import org.amdatu.opensocial.shindig.application.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
Wed Nov 10 17:06:15 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.GadgetCategory;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.application.GadgetCategory;
+import org.amdatu.opensocial.shindig.application.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
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
Wed Nov 10 17:06:15 2010
@@ -16,8 +16,8 @@
*/
package org.amdatu.opensocial.gadgetmanagement;
-import org.amdatu.opensocial.shindig.GadgetCategory;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.application.GadgetCategory;
+import org.amdatu.opensocial.shindig.application.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
Wed Nov 10 17:06:15 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.GadgetStore;
+import org.amdatu.opensocial.shindig.application.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
Wed Nov 10 17:06:15 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.GadgetCategory;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
-import org.amdatu.opensocial.shindig.GadgetStore;
-import org.amdatu.opensocial.shindig.OpenSocialConstants;
+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.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/application/GadgetCategory.java
(from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetCategory.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetCategory.java
Wed Nov 10 17:06:15 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;
+package org.amdatu.opensocial.shindig.application;
/**
* Represents a gadget category.
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
(from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetDefinition.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetDefinition.java
Wed Nov 10 17:06:15 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;
+package org.amdatu.opensocial.shindig.application;
public class GadgetDefinition implements Comparable<GadgetDefinition>{
// Attributes
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
(from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/GadgetStore.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/GadgetStore.java
Wed Nov 10 17:06:15 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;
+package org.amdatu.opensocial.shindig.application;
import java.util.Map;
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
(from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OAuthModule.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OAuthModule.java
Wed Nov 10 17:06:15 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;
+package org.amdatu.opensocial.shindig.application;
import com.google.inject.Module;
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
(from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/OpenSocialConstants.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/OpenSocialConstants.java
Wed Nov 10 17:06:15 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;
+package org.amdatu.opensocial.shindig.application;
public interface OpenSocialConstants {
/**
Copied:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
(from r382,
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java)
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/SocialApiModule.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/SocialApiModule.java
Wed Nov 10 17:06:15 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;
+package org.amdatu.opensocial.shindig.application;
import com.google.inject.Module;
Added:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/ConfigurationAdminGuiceModule.java
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/ConfigurationAdminGuiceModule.java
Wed Nov 10 17:06:15 2010
@@ -0,0 +1,55 @@
+/*
+ Copyright (C) 2010 Amdatu.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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.module;
+
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.name.Names;
+import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.cm.ManagedService;
+
+/**
+ * A Guice Module that provides bindings for key-value pairs in a
Configuration. Register
+ * and instance of this object with the service PID to use, and the object can
then
+ * be registered to a Guice injector as a module.
+ */
+public class ConfigurationAdminGuiceModule extends AbstractModule implements
ManagedService {
+ private volatile Properties m_properties = new Properties();
+
+ @Override
+ protected void configure() {
+ // We make a copy of the properties, since we don't know what
bindProperties does with them.
+ Names.bindProperties(binder(), new Properties(m_properties));
+ }
+
+ public void updated(Dictionary dictionary) throws ConfigurationException {
+ m_properties = copyFromDictionary(dictionary);
+ }
+
+ private Properties copyFromDictionary(Dictionary source) {
+ Properties properties = new Properties();
+ Enumeration keys = source.keys();
+ while (keys.hasMoreElements()) {
+ Object key = keys.nextElement();
+ properties.put(key, source.get(key));
+ }
+ return properties;
+ }
+}
Added:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/OAuthModuleImpl.java
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/OAuthModuleImpl.java
Wed Nov 10 17:06:15 2010
@@ -0,0 +1,101 @@
+/*
+ Copyright (C) 2010 Amdatu.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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.module;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import org.amdatu.opensocial.shindig.application.OAuthModule;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shindig.common.crypto.BasicBlobCrypter;
+import org.apache.shindig.common.crypto.BlobCrypter;
+import org.apache.shindig.common.crypto.Crypto;
+import org.apache.shindig.gadgets.http.HttpFetcher;
+import org.apache.shindig.gadgets.oauth.OAuthFetcherConfig;
+import org.apache.shindig.gadgets.oauth.OAuthRequest;
+import org.apache.shindig.gadgets.oauth.OAuthStore;
+import org.osgi.service.log.LogService;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import com.google.inject.name.Names;
+
+public class OAuthModuleImpl extends AbstractModule implements OAuthModule {
+
+ private static final Logger logger =
Logger.getLogger(OAuthModuleImpl.class.getName());
+
+ private volatile LogService m_logService;
+ private volatile OAuthStore m_gadgetStore;
+
+
+ public void start() {
+ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
started");
+ }
+
+
+ @Override
+ protected void configure() {
+ // Used for encrypting client-side OAuth state.
+
bind(BlobCrypter.class).annotatedWith(Names.named(OAuthFetcherConfig.OAUTH_STATE_CRYPTER))
+ .toProvider(OAuthCrypterProvider.class);
+
+ // Used for persistent storage of OAuth access tokens.
+ bind(OAuthStore.class).toInstance(m_gadgetStore);
+ bind(OAuthRequest.class).toProvider(OAuthRequestProvider.class);
+ }
+
+ @Singleton
+ public static class OAuthCrypterProvider implements Provider<BlobCrypter> {
+
+ private final BlobCrypter crypter;
+
+ @Inject
+ public OAuthCrypterProvider(@Named("shindig.signing.state-key") String
stateCrypterPath)
+ throws IOException {
+ if (StringUtils.isBlank(stateCrypterPath)) {
+ logger.info("Using random key for OAuth client-side state
encryption");
+ crypter = new
BasicBlobCrypter(Crypto.getRandomBytes(BasicBlobCrypter.MASTER_KEY_MIN_LEN));
+ } else {
+ logger.info("Using file " + stateCrypterPath + " for OAuth
client-side state encryption");
+ crypter = new BasicBlobCrypter(new File(stateCrypterPath));
+ }
+ }
+
+ public BlobCrypter get() {
+ return crypter;
+ }
+ }
+
+ public static class OAuthRequestProvider implements Provider<OAuthRequest>
{
+ private final HttpFetcher fetcher;
+ private final OAuthFetcherConfig config;
+
+ @Inject
+ public OAuthRequestProvider(HttpFetcher fetcher, OAuthFetcherConfig
config) {
+ this.fetcher = fetcher;
+ this.config = config;
+ }
+
+ public OAuthRequest get() {
+ return new OAuthRequest(config, fetcher);
+ }
+ }
+}
\ No newline at end of file
Added:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/SocialApiModuleImpl.java
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/module/SocialApiModuleImpl.java
Wed Nov 10 17:06:15 2010
@@ -0,0 +1,114 @@
+/*
+ Copyright (C) 2010 Amdatu.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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.module;
+
+import java.util.List;
+import java.util.Set;
+
+import org.amdatu.opensocial.shindig.application.SocialApiModule;
+import
org.amdatu.opensocial.shindig.application.service.PersonServiceDispatcher;
+import org.apache.shindig.auth.AnonymousAuthenticationHandler;
+import org.apache.shindig.auth.AuthenticationHandler;
+import org.apache.shindig.common.servlet.ParameterFetcher;
+import org.apache.shindig.protocol.DataServiceServletFetcher;
+import org.apache.shindig.protocol.conversion.BeanConverter;
+import org.apache.shindig.protocol.conversion.BeanJsonConverter;
+import org.apache.shindig.protocol.conversion.BeanXStreamConverter;
+import org.apache.shindig.protocol.conversion.xstream.XStreamConfiguration;
+import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
+import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
+import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
+import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
+import org.apache.shindig.social.opensocial.service.ActivityHandler;
+import org.apache.shindig.social.opensocial.service.AppDataHandler;
+import org.apache.shindig.social.opensocial.service.MessageHandler;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
+import org.apache.shindig.social.opensocial.spi.ActivityService;
+import org.apache.shindig.social.opensocial.spi.AppDataService;
+import org.apache.shindig.social.opensocial.spi.MessageService;
+import org.apache.shindig.social.opensocial.spi.PersonService;
+import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.TypeLiteral;
+import com.google.inject.internal.ImmutableSet;
+import com.google.inject.name.Names;
+
+/**
+ * This module binds the Social Api services.
+ * @author ivol
+ */
+public class SocialApiModuleImpl extends AbstractModule implements
SocialApiModule {
+ // Service dependencies injected by the dependency manager
+ private volatile LogService m_logService;
+ private volatile BundleContext m_bundleContext;
+ private volatile AppDataService m_appDataServiceStore;
+
+ public void start() {
+ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
started");
+ }
+
+ @Override
+ protected void configure() {
+ // Some standard bindings
+
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet")).to(DataServiceServletFetcher.class);
+
+ bind(Boolean.class)
+
.annotatedWith(Names.named(AnonymousAuthenticationHandler.ALLOW_UNAUTHENTICATED))
+ .toInstance(Boolean.TRUE);
+ bind(XStreamConfiguration.class).to(XStream081Configuration.class);
+
bind(Long.class).annotatedWith(Names.named("org.apache.shindig.serviceExpirationDurationMinutes")).toInstance(60L);
+
+ // Register bean converters (Json, XML and Atom)
+
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(BeanXStreamConverter.class);
+
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(BeanJsonConverter.class);
+
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.atom")).to(BeanXStreamAtomConverter.class);
+
+ // Register authentication handler providers
+ bind(new
TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(AuthenticationHandlerProvider.class);
+
+ // TODO: these are example bindings for now
+ // See http://jira.amdatu.org/jira/browse/AMDATU-5.
+
bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db")).toInstance("/conf/canonicaldb.json");
+ bind(ActivityService.class).to(JsonDbOpensocialService.class);
+ bind(AppDataService.class).toInstance(m_appDataServiceStore);
+ bind(MessageService.class).to(JsonDbOpensocialService.class);
+ //requestStaticInjection(SampleRealm.class);
+
+ // Register the person service dispatcher as the PersonService. The
person service will lookup an implementation
+ // of PersonService upon invocation and pass the call to that service.
+ PersonService personService = new
PersonServiceDispatcher(m_bundleContext, m_logService);
+ bind(PersonService.class).toInstance(personService);
+
+ // Use the sample oAuth datastore
+
bind(OAuthDataStore.class).to(org.apache.shindig.social.sample.oauth.SampleOAuthDataStore.class);
+
+
+ bind(new
TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.social.handlers"))
+ .toInstance(getHandlers());
+ }
+
+ protected Set<Object> getHandlers() {
+ ImmutableSet.Builder<Object> handlers = ImmutableSet.builder();
+ handlers.addAll(ImmutableSet.<Object>of(ActivityHandler.class,
AppDataHandler.class,
+ PersonHandler.class, MessageHandler.class));
+ /// NOT necessary??? handlers.add(SampleContainerHandler.class);
+ return handlers.build();
+ }
+}
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/oauth/AmdatuOAuthServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/oauth/AmdatuOAuthServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/oauth/AmdatuOAuthServlet.java
Wed Nov 10 17:06:15 2010
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.amdatu.opensocial.shindig.oauth;
+package org.amdatu.opensocial.shindig.application.oauth;
import java.io.IOException;
import java.io.OutputStream;
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/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/osgi/Activator.java
Wed Nov 10 17:06:15 2010
@@ -14,26 +14,26 @@
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.osgi;
+package org.amdatu.opensocial.shindig.application.osgi;
import org.amdatu.core.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.core.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.GadgetStore;
-import org.amdatu.opensocial.shindig.OAuthModule;
-import org.amdatu.opensocial.shindig.SocialApiModule;
+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.application.persistence.CassandraAppDataServiceStore;
+import
org.amdatu.opensocial.shindig.application.persistence.CassandraOAuthStore;
+import
org.amdatu.opensocial.shindig.application.persistence.GadgetColumnFamilyProvider;
+import org.amdatu.opensocial.shindig.application.persistence.GadgetStoreImpl;
+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;
-import org.amdatu.opensocial.shindig.persistence.CassandraAppDataServiceStore;
-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/application/persistence/CassandraAppDataServiceStore.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/persistence/CassandraAppDataServiceStore.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraAppDataServiceStore.java
Wed Nov 10 17:06:15 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.persistence;
+package org.amdatu.opensocial.shindig.application.persistence;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -25,7 +25,7 @@
import com.google.common.collect.Maps;
import org.amdatu.libraries.utilities.ConversionUtil;
-import org.amdatu.opensocial.shindig.OpenSocialConstants;
+import org.amdatu.opensocial.shindig.application.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/persistence/CassandraOAuthStore.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/CassandraOAuthStore.java
Wed Nov 10 17:06:15 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.persistence;
+package org.amdatu.opensocial.shindig.application.persistence;
import java.util.HashMap;
import java.util.Map;
@@ -23,8 +23,9 @@
import net.oauth.OAuthConsumer;
import net.oauth.OAuthServiceProvider;
import net.oauth.signature.RSA_SHA1;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
-import org.amdatu.opensocial.shindig.GadgetStore;
+
+import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.application.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/persistence/GadgetColumnFamilyProvider.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetColumnFamilyProvider.java
Wed Nov 10 17:06:15 2010
@@ -14,14 +14,14 @@
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.persistence;
+package org.amdatu.opensocial.shindig.application.persistence;
import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition;
import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
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.GadgetStore;
+import org.amdatu.opensocial.shindig.application.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/persistence/GadgetStoreImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/persistence/GadgetStoreImpl.java
Wed Nov 10 17:06:15 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.persistence;
+package org.amdatu.opensocial.shindig.application.persistence;
import java.io.IOException;
import java.io.InputStream;
@@ -28,9 +28,9 @@
import org.amdatu.core.cassandra.persistencemanager.CassandraException;
import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.opensocial.shindig.GadgetCategory;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
-import org.amdatu.opensocial.shindig.GadgetStore;
+import org.amdatu.opensocial.shindig.application.GadgetCategory;
+import org.amdatu.opensocial.shindig.application.GadgetDefinition;
+import org.amdatu.opensocial.shindig.application.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/EchoServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/EchoServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/EchoServlet.java
Wed Nov 10 17:06:15 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.service;
+package org.amdatu.opensocial.shindig.application.service;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorService.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorService.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorService.java
Wed Nov 10 17:06:15 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.service;
+package org.amdatu.opensocial.shindig.application.service;
import javax.servlet.Servlet;
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/service/GuiceInjectorServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorServiceImpl.java
Wed Nov 10 17:06:15 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.service;
+package org.amdatu.opensocial.shindig.application.service;
import java.io.IOException;
import java.util.ArrayList;
@@ -29,8 +29,8 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
-import org.amdatu.opensocial.shindig.OAuthModule;
-import org.amdatu.opensocial.shindig.SocialApiModule;
+import org.amdatu.opensocial.shindig.application.OAuthModule;
+import org.amdatu.opensocial.shindig.application.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/application/service/GuiceInjectorServlet.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServlet.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/GuiceInjectorServlet.java
Wed Nov 10 17:06:15 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.service;
+package org.amdatu.opensocial.shindig.application.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/application/service/PersonServiceDispatcher.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/PersonServiceDispatcher.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/PersonServiceDispatcher.java
Wed Nov 10 17:06:15 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.service;
+package org.amdatu.opensocial.shindig.application.service;
import java.util.Set;
import java.util.concurrent.ExecutionException;
Modified:
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/shindig-application/src/main/java/org/amdatu/opensocial/shindig/application/service/ShindigRegistrationServiceImpl.java
Wed Nov 10 17:06:15 2010
@@ -14,9 +14,9 @@
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.service;
+package org.amdatu.opensocial.shindig.application.service;
-import static org.amdatu.opensocial.shindig.osgi.Activator.RESOURCE_ID;
+import static
org.amdatu.opensocial.shindig.application.osgi.Activator.RESOURCE_ID;
import java.io.File;
import java.io.FileOutputStream;
@@ -33,8 +33,8 @@
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.opensocial.shindig.oauth.AmdatuOAuthServlet;
-import org.amdatu.opensocial.shindig.osgi.Activator;
+import org.amdatu.opensocial.shindig.application.oauth.AmdatuOAuthServlet;
+import org.amdatu.opensocial.shindig.application.osgi.Activator;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.apache.shindig.auth.AuthenticationServletFilter;
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
Wed Nov 10 17:06:15 2010
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.util.logging.Logger;
-import org.amdatu.opensocial.shindig.OAuthModule;
+import org.amdatu.opensocial.shindig.application.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
Wed Nov 10 17:06:15 2010
@@ -19,8 +19,8 @@
import java.util.List;
import java.util.Set;
-import org.amdatu.opensocial.shindig.SocialApiModule;
-import org.amdatu.opensocial.shindig.service.PersonServiceDispatcher;
+import org.amdatu.opensocial.shindig.application.SocialApiModule;
+import
org.amdatu.opensocial.shindig.application.service.PersonServiceDispatcher;
import org.apache.shindig.auth.AnonymousAuthenticationHandler;
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.servlet.ParameterFetcher;
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
Wed Nov 10 17:06:15 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.GadgetCategory;
-import org.amdatu.opensocial.shindig.GadgetDefinition;
+import org.amdatu.opensocial.shindig.application.GadgetCategory;
+import org.amdatu.opensocial.shindig.application.GadgetDefinition;
import org.apache.felix.dm.Component;
import org.json.JSONException;
import org.json.JSONObject;
