Author: [email protected]
Date: Mon Apr 4 09:47:47 2011
New Revision: 933
Log:
[sandbox] tm: align to trunk version
Modified:
sandbox/bdekruijff/amdatu-tm/pom.xml
sandbox/bdekruijff/amdatu-tm/tenantmanager/pom.xml
sandbox/bdekruijff/amdatu-tm/tenantmanager/src/main/java/org/amdatu/tm/tenantmanager/osgi/Activator.java
sandbox/bdekruijff/amdatu-tm/useradminstore-fs/pom.xml
Modified: sandbox/bdekruijff/amdatu-tm/pom.xml
==============================================================================
--- sandbox/bdekruijff/amdatu-tm/pom.xml (original)
+++ sandbox/bdekruijff/amdatu-tm/pom.xml Mon Apr 4 09:47:47 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.amdatu</groupId>
<artifactId>amdatu</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</parent>
<groupId>org.amdatu.tm</groupId>
<artifactId>tm</artifactId>
Modified: sandbox/bdekruijff/amdatu-tm/tenantmanager/pom.xml
==============================================================================
--- sandbox/bdekruijff/amdatu-tm/tenantmanager/pom.xml (original)
+++ sandbox/bdekruijff/amdatu-tm/tenantmanager/pom.xml Mon Apr 4 09:47:47 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.amdatu.tm</groupId>
<artifactId>tm</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>tenantmanager</artifactId>
<packaging>bundle</packaging>
@@ -32,7 +32,7 @@
<artifactId>tenant</artifactId>
<scope>provided</scope>
<type>bundle</type>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.useradmin</groupId>
Modified:
sandbox/bdekruijff/amdatu-tm/tenantmanager/src/main/java/org/amdatu/tm/tenantmanager/osgi/Activator.java
==============================================================================
---
sandbox/bdekruijff/amdatu-tm/tenantmanager/src/main/java/org/amdatu/tm/tenantmanager/osgi/Activator.java
(original)
+++
sandbox/bdekruijff/amdatu-tm/tenantmanager/src/main/java/org/amdatu/tm/tenantmanager/osgi/Activator.java
Mon Apr 4 09:47:47 2011
@@ -19,6 +19,9 @@
import org.amdatu.core.tenant.Tenant;
import org.amdatu.tm.tenantmanager.TenantManagerService;
+import org.amdatu.tm.tenantmanager.service.TenantAwareEventHook;
+import org.amdatu.tm.tenantmanager.service.TenantAwareFindHook;
+import org.amdatu.tm.tenantmanager.service.TenantAwareListnerHook;
import org.amdatu.tm.tenantmanager.service.TenantManagerServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
@@ -26,6 +29,9 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
+import org.osgi.framework.hooks.service.EventHook;
+import org.osgi.framework.hooks.service.FindHook;
+import org.osgi.framework.hooks.service.ListenerHook;
import org.osgi.service.log.LogService;
import org.osgi.service.useradmin.UserAdmin;
@@ -36,6 +42,21 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
+// manager.add(
+// createComponent()
+// .setImplementation(TenantAwareEventHook.class)
+// .setInterface(EventHook.class.getName(), null));
+//
+// manager.add(
+// createComponent()
+// .setImplementation(TenantAwareFindHook.class)
+// .setInterface(FindHook.class.getName(), null));
+//
+// manager.add(
+// createComponent()
+// .setImplementation(TenantAwareListnerHook.class)
+// .setInterface(ListenerHook.class.getName(), null));
+
manager.add(
createAdapterService(Tenant.class, null)
.setImplementation(TenantManagerServiceImpl.class)
Modified: sandbox/bdekruijff/amdatu-tm/useradminstore-fs/pom.xml
==============================================================================
--- sandbox/bdekruijff/amdatu-tm/useradminstore-fs/pom.xml (original)
+++ sandbox/bdekruijff/amdatu-tm/useradminstore-fs/pom.xml Mon Apr 4
09:47:47 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.amdatu</groupId>
<artifactId>org.amdatu.core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</parent>
<groupId>org.amdatu.core</groupId>
<artifactId>useradminstore-fs</artifactId>
@@ -19,7 +19,7 @@
<artifactId>tenant</artifactId>
<scope>provided</scope>
<type>bundle</type>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.useradmin</groupId>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
