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 (file)
index 0000000..facb613
--- /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 4cf08652bde73045354c2720ffe32d38c2512456..adbb47dd5d5f5cb02671583beebb4b9fd4e0b23a 100644 (file)
--- 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 d0f876800a489d19b49a9c00a8264d2bb84f8e66..aa3700c991facb747d5179abbf2fa3d4558205c0 100644 (file)
--- 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 11135f208528fdb37eda7a336425c23e4f372665..8265e74535049d3e0fca3406f0adf1c7cf42a3c2 100644 (file)
--- 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 6f802b40fa12300a529a104387f1a4bd2768a195..b44662989de6a9286b3e3ea7e733f7c8f1b253e1 100644 (file)
--- 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 aaaa924f04427170bf08ea432662c112d38ef4ef..c821088da62341e4f74cfbac8715ad36b76fbbf3 100644 (file)
--- 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">\r
 \r
        <!-- REFERENCES -->\r
-       <reference id="authenticationManager"\r
-               interface="org.springframework.security.authentication.AuthenticationManager" />\r
+       <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
+       <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
 \r
        <set id="defaultRpmRepositories" cardinality="0..N"\r
                interface="org.argeo.slc.rpmfactory.RpmRepository" />\r
@@ -48,17 +48,15 @@
        </beans:bean>\r
 \r
        <!-- ROLES -->\r
-       <reference id="userAdminService" interface="org.argeo.security.UserAdminService" />\r
-\r
        <beans:bean id="ROLE_SLC"\r
                class="org.argeo.security.core.SimpleRoleRegistration" init-method="run">\r
-               <beans:property name="role" value="ROLE_SLC" />\r
-               <beans:property name="userAdminService" ref="userAdminService" />\r
+               <beans:property name="role" value="org.argeo.slc.user" />\r
+               <beans:property name="userAdmin" ref="userAdmin" />\r
+               <beans:property name="userTransaction" ref="userTransaction" />\r
        </beans:bean>\r
 \r
        <beans:bean\r
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">\r
-               <beans:property name="authenticationManager" ref="authenticationManager" />\r
        </beans:bean>\r
 </beans:beans>\r
 \r

diff --git a/org.argeo.slc.server.repo/repository-h2.xml b/org.argeo.slc.server.repo/repository-h2.xml
index 18d5ffb9167b33854ff2c9dae8ee3287b82e5568..c87f1d4f4df1eabc7b5685f5d3af3cdd34a079e0 100644 (file)
--- 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 f95a15eabba1a9f48a5ce314b185fd93ff888e9e..0e40bc711f6e5dc919dd288393857ca133e96c1d 100644 (file)
--- 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 d8a9a6b8303dac93b446880ca5a26238101a5934..d67b1030f1a584b0d4637dfb24f07f211edbf386 100644 (file)
--- 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 254d1bbe94b8dfa4c80b289ed050fd6d994f890b..38326255f7ecbf196c7a7cda44059949e22dc414 100644 (file)
--- 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 ee5b1fd67cb33419bdab468c6e1d3d1345d0caa8..b35028dc7273577e0345ee928546402023860047 100644 (file)
--- 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 9cef06785158630897d9f5c6569530e730a70741..762dc9d276d188b608ec79662f65899d1ad6df2d 100644 (file)
--- 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>