Author: ivol37 at gmail.com
Date: Wed Nov 10 12:14:41 2010
New Revision: 340
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Modified:
trunk/amdatu-authorization/login-service/pom.xml
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/osgi/Activator.java
Modified: trunk/amdatu-authorization/login-service/pom.xml
==============================================================================
--- trunk/amdatu-authorization/login-service/pom.xml (original)
+++ trunk/amdatu-authorization/login-service/pom.xml Wed Nov 10 12:14:41 2010
@@ -27,6 +27,12 @@
<type>bundle</type>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/osgi/Activator.java
Wed Nov 10 12:14:41 2010
@@ -18,7 +18,6 @@
import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.authorization.login.service.service.LoginServiceImpl;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
@@ -34,7 +33,7 @@
// 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 = "authorization";
-
+
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
// Create and register the authorization service.
@@ -44,11 +43,10 @@
.setImplementation(LoginServiceImpl.class)
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(ConfigTemplateManager.class).setRequired(true))
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true)));
}
-
+
@Override
- public void destroy(BundleContext context, DependencyManager manager)
throws Exception {
+ public void destroy(BundleContext context, DependencyManager manager)
throws Exception {
}
}