From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 22 Sep 2015 10:50:01 +0000 (+0000)
Subject: Interpret the properties of UserAdmin service reference.
X-Git-Tag: argeo-commons-2.1.30~126
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=facc75a4aa15d208661ab0f9fd0e4317ebfc33cd;p=lgpl%2Fargeo-commons.git

Interpret the properties of UserAdmin service reference.

git-svn-id: https://svn.argeo.org/commons/trunk@8431 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.security.ui.admin/META-INF/spring/common.xml b/org.argeo.security.ui.admin/META-INF/spring/common.xml
index 7f55a858c..38d87da4c 100644
--- a/org.argeo.security.ui.admin/META-INF/spring/common.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/common.xml
@@ -10,11 +10,11 @@
 		<property name="userTransaction" ref="userTransaction" />
 	</bean>
 
-	<bean id="userAdminWrapper"
-		class="org.argeo.security.ui.admin.internal.UserAdminWrapper"
+	<bean id="userAdminWrapper" class="org.argeo.security.ui.admin.internal.UserAdminWrapper"
 		scope="singleton" lazy-init="false">
 		<property name="userTransaction" ref="userTransaction" />
 		<property name="userAdmin" ref="userAdmin" />
+		<property name="userAdminServiceReference" ref="userAdmin" />
 	</bean>
 
 	<bean
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
index 794230ff6..6b077e08f 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
@@ -1,20 +1,27 @@
 package org.argeo.security.ui.admin.internal;
 
 import java.util.ArrayList;
+import java.util.Dictionary;
 import java.util.List;
 
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
+import org.argeo.osgi.useradmin.UserAdminConf;
+import org.osgi.framework.ServiceReference;
 import org.osgi.service.useradmin.UserAdmin;
 import org.osgi.service.useradmin.UserAdminEvent;
 import org.osgi.service.useradmin.UserAdminListener;
 
 /** Simplifies the interaction with the UserAdmin in this bundle */
 public class UserAdminWrapper {
+	private Log log = LogFactory.getLog(UserAdminWrapper.class);
 
 	private UserAdmin userAdmin;
+	private ServiceReference<UserAdmin> userAdminServiceReference;
 	private UserTransaction userTransaction;
 
 	// Registered listeners
@@ -62,6 +69,18 @@ public class UserAdminWrapper {
 		this.userAdmin = userAdmin;
 	}
 
+	public void setUserAdminServiceReference(
+			ServiceReference<UserAdmin> userAdminServiceReference) {
+		this.userAdminServiceReference = userAdminServiceReference;
+		for (String uri : userAdminServiceReference.getPropertyKeys()) {
+			if (!uri.startsWith("/"))
+				continue;
+			log.debug(uri);
+			Dictionary<String, ?> props = UserAdminConf.uriAsProperties(uri);
+			log.debug(props);
+		}
+	}
+
 	public void setUserTransaction(UserTransaction userTransaction) {
 		this.userTransaction = userTransaction;
 	}