Author: [email protected]
Date: Tue Oct 4 15:47:44 2011
New Revision: 1432
Log:
[AMDATUCASSANDRA-101] Fixed whiteboard registration of this example gadget
Added:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetDefinition.java
Modified:
trunk/amdatu-opensocial/examples/friends-gadget/pom.xml
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/osgi/Activator.java
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetServiceImpl.java
trunk/amdatu-opensocial/examples/friends-gadget/src/main/resources/jsp/FriendsGadget.jsp
Modified: trunk/amdatu-opensocial/examples/friends-gadget/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/examples/friends-gadget/pom.xml (original)
+++ trunk/amdatu-opensocial/examples/friends-gadget/pom.xml Tue Oct 4
15:47:44 2011
@@ -14,6 +14,11 @@
<dependencies>
<dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.dispatcher</artifactId>
<type>bundle</type>
Modified:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/osgi/Activator.java
Tue Oct 4 15:47:44 2011
@@ -15,21 +15,23 @@
*/
package org.amdatu.opensocial.example.friends.gadget.osgi;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import
org.amdatu.opensocial.example.friends.gadget.service.FriendsGadgetServiceImpl;
-import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.web.dispatcher.DispatcherService;
-import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.web.jsp.JspSupport;
-import org.amdatu.web.resource.ResourceSupport;
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyActivatorBase;
-import org.apache.felix.dm.DependencyManager;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.http.HttpService;
-import org.osgi.service.log.LogService;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.amdatu.core.tenant.Tenant;
+import
org.amdatu.opensocial.example.friends.gadget.service.FriendsGadgetDefinition;
+import
org.amdatu.opensocial.example.friends.gadget.service.FriendsGadgetServiceImpl;
+import org.amdatu.opensocial.gadgetmanagement.GadgetDefinitionProvider;
+import org.amdatu.web.dispatcher.DispatcherService;
+import org.amdatu.web.httpcontext.ResourceProvider;
+import org.amdatu.web.jsp.JspSupport;
+import org.amdatu.web.resource.ResourceSupport;
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.log.LogService;
/**
* This is the OSGi activator for this gadget bundle.
@@ -56,9 +58,13 @@
.setInterface(ResourceProvider.class.getName(), properties)
.setImplementation(FriendsGadgetServiceImpl.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
.add(createServiceDependency().setService(HttpService.class).setRequired(true));
- manager.add(friendsgadgetService);
+ manager.add(friendsgadgetService);
+
+ // Register a login gadget definition for each tenant
+ manager.add(createAdapterService(Tenant.class, null)
+ .setInterface(GadgetDefinitionProvider.class.getName(), null)
+ .setImplementation(FriendsGadgetDefinition.class));
}
@Override
Added:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetDefinition.java
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetDefinition.java
Tue Oct 4 15:47:44 2011
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2011 The Amdatu Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.amdatu.opensocial.example.friends.gadget.service;
+
+import org.amdatu.opensocial.example.friends.gadget.osgi.Activator;
+import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
+import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
+import org.amdatu.opensocial.gadgetmanagement.GadgetDefinitionProvider;
+
+public class FriendsGadgetDefinition implements GadgetDefinitionProvider {
+ private final static GadgetCategory EXAMPLE_CATEGORY = new
GadgetCategory("amdatu_examples", "Amdatu Examples");
+
+ public GadgetDefinition[] getDefinitions() {
+ GadgetDefinition gadgetDef = new GadgetDefinition(
+ Activator.ALIAS + "/jsp/FriendsGadget.jsp", // gadget URL
+ EXAMPLE_CATEGORY, // category
+ false); // default visible on the dashboard
+ gadgetDef.setServiceName("friends");
+ return new GadgetDefinition[] {gadgetDef};
+ }
+}
\ No newline at end of file
Modified:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/examples/friends-gadget/src/main/java/org/amdatu/opensocial/example/friends/gadget/service/FriendsGadgetServiceImpl.java
Tue Oct 4 15:47:44 2011
@@ -15,15 +15,12 @@
*/
package org.amdatu.opensocial.example.friends.gadget.service;
-import java.net.URL;
-
-import org.amdatu.opensocial.example.friends.gadget.osgi.Activator;
-import
org.amdatu.opensocial.example.gadgetrepository.ExampleGadgetRepositoryService;
-import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
-import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.web.httpcontext.ResourceProvider;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
+import java.net.URL;
+
+import org.amdatu.opensocial.example.friends.gadget.osgi.Activator;
+import org.amdatu.web.httpcontext.ResourceProvider;
+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
@@ -35,18 +32,12 @@
// Service and other dependencies, injected by the OSGi framework
private volatile LogService m_logService;
- private volatile GadgetManagement m_gadgetManagement;
private volatile BundleContext m_bundleContext;
/**
* The init() method is invoked by the Felix dependency manager.
*/
public void init() {
- GadgetDefinition gadgetDef = new GadgetDefinition(Activator.ALIAS +
"/jsp/FriendsGadget.jsp",
- ExampleGadgetRepositoryService.AMDATU_EXAMPLE_CATEGORY, false);
- gadgetDef.setServiceName("friends");
- m_gadgetManagement.addGadget(gadgetDef);
-
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
initialized");
}
Modified:
trunk/amdatu-opensocial/examples/friends-gadget/src/main/resources/jsp/FriendsGadget.jsp
==============================================================================
---
trunk/amdatu-opensocial/examples/friends-gadget/src/main/resources/jsp/FriendsGadget.jsp
(original)
+++
trunk/amdatu-opensocial/examples/friends-gadget/src/main/resources/jsp/FriendsGadget.jsp
Tue Oct 4 15:47:44 2011
@@ -1,8 +1,3 @@
-<%@ page language="java" session="false" buffer="none" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-
-<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
-
<?xml version="1.0" encoding="UTF-8" ?>
<!--
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +18,11 @@
* under the License.
-->
+<%@ page language="java" session="false" buffer="none" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
+
+<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
+
<Module>
<ModulePrefs
title="Friends OAuth Gadget"
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
