Author: ivol37 at gmail.com
Date: Mon Nov 29 17:11:06 2010
New Revision: 454
Log:
[AMDATU-162] Removed Shindig dependencies from gadgets; gadgets do not have a
direct dependency on a opensocial container (this only applied to an
integration test installing these gadgets and invoking them)
Modified:
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/Activator.java
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
trunk/amdatu-opensocial/dashboard/pom.xml
trunk/amdatu-opensocial/dashboard/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
trunk/amdatu-semanticweb/sparqlendpoint/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
Modified:
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/login/gadget/osgi/Activator.java
Mon Nov 29 17:11:06 2010
@@ -16,10 +16,9 @@
*/
package org.amdatu.authorization.login.gadget.osgi;
-import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.opensocial.shindig.ShindigService;
import org.amdatu.authorization.login.gadget.service.LoginGadgetImpl;
import org.amdatu.authorization.login.service.LoginService;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
@@ -48,7 +47,6 @@
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
.add(createServiceDependency().setService(LoginService.class).setRequired(true))
-
.add(createServiceDependency().setService(ShindigService.class).setRequired(true))
.add(createConfigurationDependency().setPid(LoginGadgetImpl.PID)));
}
Modified:
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
(original)
+++
trunk/amdatu-example/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
Mon Nov 29 17:11:06 2010
@@ -18,7 +18,6 @@
import org.amdatu.example.course.gadget.service.CourseGadgetServiceImpl;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.opensocial.shindig.ShindigService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
@@ -46,7 +45,6 @@
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-
.add(createServiceDependency().setService(ShindigService.class).setRequired(true))
.add(createConfigurationDependency().setPid(CourseGadgetServiceImpl.PID));
manager.add(friendsgadgetService);
}
Modified:
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
(original)
+++
trunk/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
Mon Nov 29 17:11:06 2010
@@ -18,7 +18,6 @@
import org.amdatu.example.friend.sgadget.service.FriendsGadgetServiceImpl;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.opensocial.shindig.ShindigService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
@@ -48,7 +47,6 @@
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
.add(createServiceDependency().setService(HttpService.class).setRequired(true))
-
.add(createServiceDependency().setService(ShindigService.class).setRequired(true))
.add(createConfigurationDependency().setPid(FriendsGadgetServiceImpl.PID));
manager.add(friendsgadgetService);
}
Modified: trunk/amdatu-opensocial/dashboard/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/dashboard/pom.xml (original)
+++ trunk/amdatu-opensocial/dashboard/pom.xml Mon Nov 29 17:11:06 2010
@@ -19,13 +19,7 @@
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>shindig</artifactId>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified:
trunk/amdatu-opensocial/dashboard/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/dashboard/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/dashboard/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
Mon Nov 29 17:11:06 2010
@@ -17,7 +17,6 @@
package org.amdatu.opensocial.dashboard.osgi;
import org.amdatu.opensocial.dashboard.service.DashboardServiceImpl;
-import org.amdatu.opensocial.shindig.ShindigService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
@@ -45,7 +44,6 @@
.setImplementation(DashboardServiceImpl.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-
.add(createServiceDependency().setService(ShindigService.class).setRequired(true))
.add(createServiceDependency().setService(HttpService.class).setRequired(true)));
}
Modified:
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
Mon Nov 29 17:11:06 2010
@@ -21,7 +21,6 @@
import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.opensocial.profile.service.FriendColumnFamilyProvider;
import org.amdatu.opensocial.profile.service.PersonServiceImpl;
-import org.amdatu.opensocial.shindig.ShindigService;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
@@ -46,7 +45,6 @@
.setInterface(new String[]{PersonService.class.getName(),
org.apache.shindig.social.opensocial.spi.PersonService.class.getName()}, null)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(ColumnFamilyAvailable.class,
filter).setRequired(true))
-
.add(createServiceDependency().setService(ShindigService.class).setRequired(true))
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true)));
}
Modified:
trunk/amdatu-semanticweb/sparqlendpoint/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
==============================================================================
---
trunk/amdatu-semanticweb/sparqlendpoint/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
(original)
+++
trunk/amdatu-semanticweb/sparqlendpoint/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
Mon Nov 29 17:11:06 2010
@@ -17,11 +17,10 @@
package org.amdatu.semanticweb.sparqlendpoint;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.opensocial.shindig.ShindigService;
+import org.amdatu.semanticweb.sesame.SesameService;
import org.amdatu.semanticweb.sparqlendpoint.service.SPARQLEndpointServiceImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.semanticweb.sesame.SesameService;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
@@ -46,7 +45,6 @@
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
.add(createServiceDependency().setService(SesameService.class).setRequired(true))
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-
.add(createServiceDependency().setService(ShindigService.class).setRequired(true))
.add(createConfigurationDependency().setPid(SPARQLEndpointServiceImpl.PID)));
}
