Author: ivol37 at gmail.com
Date: Wed Nov 10 11:14:30 2010
New Revision: 326
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginGadgetImpl.java
- copied, changed from r325,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginServiceImpl.java
Removed:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginServiceImpl.java
Modified:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
Modified:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
Wed Nov 10 11:14:30 2010
@@ -17,7 +17,7 @@
package org.amdatu.authorization.logingadget.osgi;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
-import org.amdatu.authorization.logingadget.service.LoginServiceImpl;
+import org.amdatu.authorization.logingadget.service.LoginGadgetImpl;
import org.amdatu.authorization.loginservice.AuthorizationService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -40,13 +40,14 @@
public void init(BundleContext context, DependencyManager manager) throws
Exception {
// Create the LoginServiceImpl which has dependencies with the Log
service
// and HTTP service
-
manager.add(createComponent().setInterface(ResourceProvider.class.getName(),
null).setImplementation(
-
LoginServiceImpl.class).add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
-
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
-
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-
.add(createServiceDependency().setService(AuthorizationService.class).setRequired(true))
-
.add(createConfigurationDependency().setPid(LoginServiceImpl.PID)));
+
manager.add(createComponent().setInterface(ResourceProvider.class.getName(),
null)
+ .setImplementation(LoginGadgetImpl.class)
+
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
+
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
+
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
+
.add(createServiceDependency().setService(AuthorizationService.class).setRequired(true))
+ .add(createConfigurationDependency().setPid(LoginGadgetImpl.PID)));
}
@Override
Copied:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginGadgetImpl.java
(from r325,
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginServiceImpl.java)
==============================================================================
---
/trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginServiceImpl.java
(original)
+++
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/service/LoginGadgetImpl.java
Wed Nov 10 11:14:30 2010
@@ -31,9 +31,9 @@
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
-public class LoginServiceImpl implements ResourceProvider, ManagedService {
+public class LoginGadgetImpl implements ResourceProvider, ManagedService {
// The PID and configuration properties
- public final static String PID =
"org.amdatu.authorization.logingadget.service";
+ public final static String PID = "org.amdatu.authorization.logingadget";
private final static String HOSTNAME = "hostname";
private final static String PORTNR = "portnr";
@@ -58,10 +58,11 @@
// Register the gadget with the Gadget management service. Note that
we can do this as
// many times as we want, since the gadget URL is the unique identifier
- GadgetDefinition gadgetDef = new GadgetDefinition("http://"; +
m_hostname + ":" + m_portnr + "/" + Activator.RESOURCE_ID +
"/jsp/LoginGadget.jsp",
- GadgetCategory.AMDATU_PLATFORM, true);
+ String gadgetSpecUrl = "http://"; + m_hostname + ":" + m_portnr + "/" +
Activator.RESOURCE_ID + "/jsp/LoginGadget.jsp";
+ GadgetDefinition gadgetDef = new GadgetDefinition(gadgetSpecUrl,
GadgetCategory.AMDATU_PLATFORM, true);
gadgetDef.setRank(0);
m_gadgetManagement.addGadget(gadgetDef);
+ m_logService.log(LogService.LOG_INFO, "Login gadget registered on URL
'" + gadgetSpecUrl + "'");
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
initialized");
}
@@ -80,6 +81,7 @@
return Activator.RESOURCE_ID;
}
+ @SuppressWarnings("unchecked")
public void updated(Dictionary dictionary) throws ConfigurationException {
if (dictionary != null) {
checkAvailability(dictionary, new String[] {HOSTNAME, PORTNR});
@@ -88,6 +90,7 @@
}
}
+ @SuppressWarnings("unchecked")
private void checkAvailability(Dictionary dictionary, String[]
mandatoryKeys) throws ConfigurationException {
for (String mandatoryKey : mandatoryKeys) {
if (dictionary.get(mandatoryKey) == null) {
