Author: [email protected]
Date: Tue Mar 29 17:02:44 2011
New Revision: 919
Log:
AMDATU-283 cleanup old resource/context code
Modified:
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
Modified:
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
(original)
+++
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friend/sgadget/service/FriendsGadgetServiceImpl.java
Tue Mar 29 17:02:44 2011
@@ -16,8 +16,6 @@
*/
package org.amdatu.example.friend.sgadget.service;
-import static org.amdatu.example.friends.gadget.osgi.Activator.RESOURCE_ID;
-
import java.net.URL;
import org.amdatu.example.friends.gadget.osgi.Activator;
@@ -25,31 +23,27 @@
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.opensocial.shindig.GadgetDefinition;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
/**
* This friends gadget service implements WebResourceProvider to provide the
resources that make up this gadget (like
* the gadget XML).
+ *
* @author ivol
*/
public class FriendsGadgetServiceImpl implements ResourceProvider {
+
// Service and other dependencies, injected by the OSGi framework
private volatile LogService m_logService;
private volatile GadgetManagement m_gadgetManagement;
-
- // Instance variables, injected by the OSGi framework
private volatile BundleContext m_bundleContext;
- // Other instance variables
- private Component m_httpContextComponent;
-
/**
* The init() method is invoked by the Felix dependency manager.
*/
public void init() {
- GadgetDefinition gadgetDef = new GadgetDefinition("/" +
Activator.RESOURCE_ID + "/jsp/FriendsGadget.jsp",
+ GadgetDefinition gadgetDef = new GadgetDefinition(Activator.ALIAS +
"/jsp/FriendsGadget.jsp",
ExampleGadgetRepositoryService.AMDATU_EXAMPLE_CATEGORY, false);
gadgetDef.setServiceName("friends");
m_gadgetManagement.addGadget(gadgetDef);
@@ -61,21 +55,14 @@
* The destroy() method is invoked by the Felix dependency manager.
*/
public void destroy() {
- // Stop our private HTTP Context service
- m_httpContextComponent.stop();
-
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
destroyed");
}
public URL getResource(String name) {
- final String pathPrefix = "/" + Activator.RESOURCE_ID + "/";
- if(name != null && name.startsWith(pathPrefix)){
- return
m_bundleContext.getBundle().getResource(name.substring(pathPrefix.length()));
+ final String pathPrefix = Activator.ALIAS + "/";
+ if (name != null && name.startsWith(pathPrefix)) {
+ return
m_bundleContext.getBundle().getResource(name.substring(pathPrefix.length()));
}
return null;
}
-
- public String getResourceId() {
- return RESOURCE_ID;
- }
}
Modified:
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
==============================================================================
---
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
(original)
+++
branches/AMDATU-283-dev/amdatu-example/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
Tue Mar 29 17:02:44 2011
@@ -35,19 +35,16 @@
* @author ivol
*/
public class Activator extends DependencyActivatorBase {
- // The resource identifier for this bundle. Resources are only considered
to be 'ours' when
- // it is prefixed with this id.
- public final static String RESOURCE_ID = "examples/gadget/friends";
+
+ public final static String CONTEXTID = "amdatu-examples";
+ public final static String ALIAS = "/examples/gadget/friends";
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- // Create the FriendsGadgetService which has dependencies with the Log
service
- // and HTTP service
-
- // Provide context and alias information for resources
+
Dictionary<String, Object> svcProperties = new Hashtable<String,
Object>();
- svcProperties.put(DispatcherService.CONTEXT_ID_KEY, RESOURCE_ID);
- svcProperties.put(DispatcherService.ALIAS_KEY, "/" + RESOURCE_ID);
+ svcProperties.put(DispatcherService.CONTEXT_ID_KEY, CONTEXTID);
+ svcProperties.put(DispatcherService.ALIAS_KEY, ALIAS);
Component friendsgadgetService = createComponent()
.setInterface(ResourceProvider.class.getName(), svcProperties)
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
