From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 15 Sep 2015 21:21:06 +0000 (+0000)
Subject: Adapt to changes in Commons Security
X-Git-Tag: argeo-slc-2.1.7~78
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c17b3666a01eb9e34d93861be01babb397fb05e4;hp=ee53b65ba03c7b927a7768325b9bfc6f8185965f;p=gpl%2Fargeo-slc.git

Adapt to changes in Commons Security

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

diff --git a/demo/all.policy b/demo/all.policy
new file mode 100644
index 000000000..facb61327
--- /dev/null
+++ b/demo/all.policy
@@ -0,0 +1,3 @@
+grant {
+  permission java.security.AllPermission;
+};
\ No newline at end of file
diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 4cf08652b..adbb47dd5 100644
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -18,7 +18,9 @@ org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
 org.argeo.slc.server.repo,\
 
-
+org.osgi.framework.security=osgi
+java.security.policy=file:../../all.policy
+ 
 org.osgi.service.http.port=7070
 org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 
diff --git a/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF b/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
index d0f876800..aa3700c99 100644
--- a/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
+++ b/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.debug.ui,
  org.eclipse.ui.ide,
  org.eclipse.core.variables,
- org.eclipse.pde.build,
  org.eclipse.pde.ui;bundle-version="3.4.0",
  org.eclipse.jdt.ui;bundle-version="3.4.2"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java b/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java
index 11135f208..8265e7453 100644
--- a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java
+++ b/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java
@@ -40,7 +40,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.core.plugin.PluginRegistry;
-import org.eclipse.pde.internal.build.IPDEBuildConstants;
 import org.eclipse.pde.launching.IPDELauncherConstants;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -396,7 +395,8 @@ public class OsgiLaunchHelper implements OsgiLauncherConstants {
 				// debug("Skip source bundle " + bundleId);
 				continue bundles;
 			} else if (bundleId
-					.equals(IPDEBuildConstants.BUNDLE_SIMPLE_CONFIGURATOR)) {
+					.equals("org.eclipse.equinox.simpleconfigurator")) {
+				// IPDEBuildConstants.BUNDLE_SIMPLE_CONFIGURATOR
 				// skip simple configurator in order to avoid side-effects
 				continue bundles;
 			}
diff --git a/org.argeo.slc.client.ui/plugin.xml b/org.argeo.slc.client.ui/plugin.xml
index 6f802b40f..b44662989 100644
--- a/org.argeo.slc.client.ui/plugin.xml
+++ b/org.argeo.slc.client.ui/plugin.xml
@@ -128,7 +128,7 @@
 		  <enabledWhen>
 		    <with variable="roles">
 		      <iterate ifEmpty="false" operator="or">
-		        <equals value="ROLE_SLC" />
+		        <equals value="cn=org.argeo.slc.user,ou=roles,ou=node" />
 		      </iterate>
 		    </with>
 		  </enabledWhen>
diff --git a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index aaaa924f0..c821088da 100644
--- a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -9,8 +9,8 @@
        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
 	<!-- REFERENCES -->
-	<reference id="authenticationManager"
-		interface="org.springframework.security.authentication.AuthenticationManager" />
+	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
+	<reference id="userTransaction" interface="javax.transaction.UserTransaction" />
 
 	<set id="defaultRpmRepositories" cardinality="0..N"
 		interface="org.argeo.slc.rpmfactory.RpmRepository" />
@@ -48,17 +48,15 @@
 	</beans:bean>
 
 	<!-- ROLES -->
-	<reference id="userAdminService" interface="org.argeo.security.UserAdminService" />
-
 	<beans:bean id="ROLE_SLC"
 		class="org.argeo.security.core.SimpleRoleRegistration" init-method="run">
-		<beans:property name="role" value="ROLE_SLC" />
-		<beans:property name="userAdminService" ref="userAdminService" />
+		<beans:property name="role" value="org.argeo.slc.user" />
+		<beans:property name="userAdmin" ref="userAdmin" />
+		<beans:property name="userTransaction" ref="userTransaction" />
 	</beans:bean>
 
 	<beans:bean
 		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-		<beans:property name="authenticationManager" ref="authenticationManager" />
 	</beans:bean>
 </beans:beans>
 
diff --git a/org.argeo.slc.server.repo/repository-h2.xml b/org.argeo.slc.server.repo/repository-h2.xml
index 18d5ffb91..c87f1d4f4 100644
--- a/org.argeo.slc.server.repo/repository-h2.xml
+++ b/org.argeo.slc.server.repo/repository-h2.xml
@@ -69,7 +69,5 @@
 		</SecurityManager>
 		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
 		</AccessManager>
-		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
-		</LoginModule>
 	</Security>
 </Repository>
\ No newline at end of file
diff --git a/org.argeo.slc.server.repo/repository-pg-dist.xml b/org.argeo.slc.server.repo/repository-pg-dist.xml
index f95a15eab..0e40bc711 100644
--- a/org.argeo.slc.server.repo/repository-pg-dist.xml
+++ b/org.argeo.slc.server.repo/repository-pg-dist.xml
@@ -74,7 +74,5 @@
 		</SecurityManager>
 		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
 		</AccessManager>
-		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
-		</LoginModule>
 	</Security>
 </Repository>
\ No newline at end of file
diff --git a/org.argeo.slc.server.repo/repository-pg-docs.xml b/org.argeo.slc.server.repo/repository-pg-docs.xml
index d8a9a6b83..d67b1030f 100644
--- a/org.argeo.slc.server.repo/repository-pg-docs.xml
+++ b/org.argeo.slc.server.repo/repository-pg-docs.xml
@@ -74,7 +74,5 @@
 		</SecurityManager>
 		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
 		</AccessManager>
-		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
-		</LoginModule>
 	</Security>
 </Repository>
\ No newline at end of file
diff --git a/org.argeo.slc.server.repo/repository-pg-java.xml b/org.argeo.slc.server.repo/repository-pg-java.xml
index 254d1bbe9..38326255f 100644
--- a/org.argeo.slc.server.repo/repository-pg-java.xml
+++ b/org.argeo.slc.server.repo/repository-pg-java.xml
@@ -74,7 +74,5 @@
 		</SecurityManager>
 		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
 		</AccessManager>
-		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
-		</LoginModule>
 	</Security>
 </Repository>
\ No newline at end of file
diff --git a/org.argeo.slc.server.repo/repository-pg-rpm.xml b/org.argeo.slc.server.repo/repository-pg-rpm.xml
index ee5b1fd67..b35028dc7 100644
--- a/org.argeo.slc.server.repo/repository-pg-rpm.xml
+++ b/org.argeo.slc.server.repo/repository-pg-rpm.xml
@@ -74,7 +74,5 @@
 		</SecurityManager>
 		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
 		</AccessManager>
-		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
-		</LoginModule>
 	</Security>
 </Repository>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9cef06785..762dc9d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.18-SNAPSHOT</version>
+		<version>2.1.29-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>