From: Mathieu Baudier Date: Tue, 10 Feb 2015 08:55:20 +0000 (+0000) Subject: Move to legacy X-Git-Tag: argeo-commons-2.1.30~409 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=fbb9156c2aacbc96772ac97218e0990702cc1c00;p=lgpl%2Fargeo-commons.git Move to legacy git-svn-id: https://svn.argeo.org/commons/trunk@7770 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.node.repo.jackrabbit/.project b/org.argeo.node.repo.jackrabbit/.project deleted file mode 100644 index 648ec17d9..000000000 --- a/org.argeo.node.repo.jackrabbit/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.node.repo.jackrabbit - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.node.repo.jackrabbit/.settings/org.eclipse.pde.core.prefs b/org.argeo.node.repo.jackrabbit/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index aae24717e..000000000 --- a/org.argeo.node.repo.jackrabbit/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Wed Feb 23 10:53:42 CET 2011 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml b/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml deleted file mode 100644 index 957dda144..000000000 --- a/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - javax.jcr.Repository - org.argeo.jcr.MaintainedRepository - - - - - - - - \ No newline at end of file diff --git a/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml b/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml deleted file mode 100644 index 6648c1550..000000000 --- a/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - osgibundle:noderepo.properties - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.node.repo.jackrabbit/bnd.bnd b/org.argeo.node.repo.jackrabbit/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.node.repo.jackrabbit/build.properties b/org.argeo.node.repo.jackrabbit/build.properties deleted file mode 100644 index a275ae638..000000000 --- a/org.argeo.node.repo.jackrabbit/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -bin.includes = META-INF/,\ - noderepo.properties,\ - repository-h2.xml,\ - repository-postgresql.xml diff --git a/org.argeo.node.repo.jackrabbit/noderepo.properties b/org.argeo.node.repo.jackrabbit/noderepo.properties deleted file mode 100644 index c91d51d08..000000000 --- a/org.argeo.node.repo.jackrabbit/noderepo.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Workspace used by the node session -argeo.node.repo.defaultWorkspace=main -#argeo.node.repo.securityWorkspace=security -argeo.node.repo.forceCndImport=true - -# Repository base directory -argeo.node.repo.home=${osgi.instance.area}/node - -## H2 Embedded (DEFAULT) -argeo.node.repo.configuration=osgibundle:repository-h2.xml -argeo.node.repo.dburl=jdbc:h2:${osgi.instance.area}/node/h2/repository -argeo.node.repo.dbuser=sa -argeo.node.repo.dbpassword= - -# ADVANCED -argeo.node.repo.maxPoolSize=10 \ No newline at end of file diff --git a/org.argeo.node.repo.jackrabbit/pom.xml b/org.argeo.node.repo.jackrabbit/pom.xml deleted file mode 100644 index a3c5695b4..000000000 --- a/org.argeo.node.repo.jackrabbit/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.13-SNAPSHOT - argeo-commons - .. - - org.argeo.node.repo.jackrabbit - Commons Server Node Repository Jackrabbit - Default Node Repository Based on Jackrabbit - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId};singleton:=true - - META-INF/spring/*.xml;create-asynchronously:=false - - *, - com.mysql.jdbc;resolution:=optional, - org.h2;resolution:=optional, - org.postgresql;resolution:=optional, - javax.jcr, - org.apache.jackrabbit.core, - org.apache.jackrabbit.core.config, - org.argeo.jackrabbit, - org.argeo.jcr, - org.springframework.beans.factory.config, - - - - - - - \ No newline at end of file diff --git a/org.argeo.node.repo.jackrabbit/repository-h2.xml b/org.argeo.node.repo.jackrabbit/repository-h2.xml deleted file mode 100644 index 583bf4c1c..000000000 --- a/org.argeo.node.repo.jackrabbit/repository-h2.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.node.repo.jackrabbit/repository-memory.xml b/org.argeo.node.repo.jackrabbit/repository-memory.xml deleted file mode 100644 index b41cfad6d..000000000 --- a/org.argeo.node.repo.jackrabbit/repository-memory.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.node.repo.jackrabbit/repository-mysql.xml b/org.argeo.node.repo.jackrabbit/repository-mysql.xml deleted file mode 100644 index 208cd1de1..000000000 --- a/org.argeo.node.repo.jackrabbit/repository-mysql.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.node.repo.jackrabbit/repository-postgresql.xml b/org.argeo.node.repo.jackrabbit/repository-postgresql.xml deleted file mode 100644 index 811f0c6bc..000000000 --- a/org.argeo.node.repo.jackrabbit/repository-postgresql.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.auth.ldap/.project b/org.argeo.security.auth.ldap/.project deleted file mode 100644 index 0c72d5914..000000000 --- a/org.argeo.security.auth.ldap/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.security.auth.ldap - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-jcr.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-jcr.xml deleted file mode 100644 index 3235e66f4..000000000 --- a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-jcr.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - /org/argeo/jcr/argeo.cnd - - - - - - - - - - - - - ${argeo.ldap.userClass} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-osgi.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-osgi.xml deleted file mode 100644 index c03964209..000000000 --- a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-osgi.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml deleted file mode 100644 index 105be7df5..000000000 --- a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml deleted file mode 100644 index e63e01a95..000000000 --- a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - osgibundle:ldap.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.argeo.security.auth.ldap/bnd.bnd b/org.argeo.security.auth.ldap/bnd.bnd deleted file mode 100644 index 54130229d..000000000 --- a/org.argeo.security.auth.ldap/bnd.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Import-Package: org.argeo.jcr,\ -com.sun.jndi.ldap;resolution:=optional,\ -org.springframework.ldap.core.support,\ -* \ No newline at end of file diff --git a/org.argeo.security.auth.ldap/build.properties b/org.argeo.security.auth.ldap/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/org.argeo.security.auth.ldap/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/org.argeo.security.auth.ldap/ldap.properties b/org.argeo.security.auth.ldap/ldap.properties deleted file mode 100644 index 0f5164ff3..000000000 --- a/org.argeo.security.auth.ldap/ldap.properties +++ /dev/null @@ -1,32 +0,0 @@ -argeo.security.defaultRole=ROLE_USER -argeo.security.rolePrefix=ROLE_ - -argeo.security.systemKey=argeo -argeo.security.superUsername=root - -argeo.ldap.rootdn=dc=demo,dc=example,dc=org -argeo.ldap.protocol=ldap -argeo.ldap.host=localhost -# default are for Apache Directory Server -argeo.ldap.port=10389 -argeo.ldap.manager.userdn=uid=admin,ou=system -argeo.ldap.manager.password=secret - -# USER -argeo.ldap.userClass=inetOrgPerson -argeo.ldap.osUserClass=posixAccount -argeo.ldap.userBase=ou=People -argeo.ldap.usernameAttribute=uid -argeo.ldap.passwordAttribute=userPassword -# ROLES -argeo.ldap.groupClass=groupOfNames -argeo.ldap.groupBase=ou=Roles -argeo.ldap.groupRoleAttribute=cn -argeo.ldap.groupMemberAttribute=member -# OS GROUPS -argeo.ldap.osGroupClass=posixGroup -argeo.ldap.osGroupBase=ou=Group -argeo.ldap.osGroupNameAttribute=cn -argeo.ldap.osGroupMemberAttribute=memberUid - -argeo.ldap.password.useSalt=false \ No newline at end of file diff --git a/org.argeo.security.auth.ldap/pom.xml b/org.argeo.security.auth.ldap/pom.xml deleted file mode 100644 index cfb49c11c..000000000 --- a/org.argeo.security.auth.ldap/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.13-SNAPSHOT - argeo-commons - .. - - org.argeo.security.auth.ldap - Commons Security Auth LDAP - \ No newline at end of file diff --git a/org.argeo.security.dao.cli/.project b/org.argeo.security.dao.cli/.project deleted file mode 100644 index 807ba67a3..000000000 --- a/org.argeo.security.dao.cli/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.security.dao.cli - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.security.dao.cli/META-INF/spring/security-cli-osgi.xml b/org.argeo.security.dao.cli/META-INF/spring/security-cli-osgi.xml deleted file mode 100644 index f2bcd97b7..000000000 --- a/org.argeo.security.dao.cli/META-INF/spring/security-cli-osgi.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml b/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml deleted file mode 100644 index f79cf0db1..000000000 --- a/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - osgibundle:security.properties - - - - - - - - /org/argeo/jcr/argeo.cnd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.cli/bnd.bnd b/org.argeo.security.dao.cli/bnd.bnd deleted file mode 100644 index 0df3b4a65..000000000 --- a/org.argeo.security.dao.cli/bnd.bnd +++ /dev/null @@ -1 +0,0 @@ -Import-Package: org.argeo.jcr,* \ No newline at end of file diff --git a/org.argeo.security.dao.cli/pom.xml b/org.argeo.security.dao.cli/pom.xml deleted file mode 100644 index ebc72f50e..000000000 --- a/org.argeo.security.dao.cli/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.13-SNAPSHOT - argeo-commons - .. - - org.argeo.security.dao.cli - Commons Security DAO CLI - \ No newline at end of file diff --git a/org.argeo.security.dao.cli/security.properties b/org.argeo.security.dao.cli/security.properties deleted file mode 100644 index 42df9259a..000000000 --- a/org.argeo.security.dao.cli/security.properties +++ /dev/null @@ -1,3 +0,0 @@ -argeo.security.systemKey=argeo -argeo.node.repo.securityWorkspace=security -argeo.keyring.secreteKeyLength=256 diff --git a/org.argeo.security.dao.jackrabbit/.project b/org.argeo.security.dao.jackrabbit/.project deleted file mode 100644 index b537a75a5..000000000 --- a/org.argeo.security.dao.jackrabbit/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.security.dao.jackrabbit - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.security.dao.jackrabbit/META-INF/spring/remote.xml b/org.argeo.security.dao.jackrabbit/META-INF/spring/remote.xml deleted file mode 100644 index b44585dc0..000000000 --- a/org.argeo.security.dao.jackrabbit/META-INF/spring/remote.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-osgi.xml b/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-osgi.xml deleted file mode 100644 index 7ca23acfa..000000000 --- a/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-osgi.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml b/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml deleted file mode 100644 index 6a7bdeca5..000000000 --- a/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - osgibundle:security.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /org/argeo/jcr/argeo.cnd - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.jackrabbit/bnd.bnd b/org.argeo.security.dao.jackrabbit/bnd.bnd deleted file mode 100644 index 0df3b4a65..000000000 --- a/org.argeo.security.dao.jackrabbit/bnd.bnd +++ /dev/null @@ -1 +0,0 @@ -Import-Package: org.argeo.jcr,* \ No newline at end of file diff --git a/org.argeo.security.dao.jackrabbit/build.properties b/org.argeo.security.dao.jackrabbit/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/org.argeo.security.dao.jackrabbit/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/org.argeo.security.dao.jackrabbit/pom.xml b/org.argeo.security.dao.jackrabbit/pom.xml deleted file mode 100644 index 34e2201a3..000000000 --- a/org.argeo.security.dao.jackrabbit/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.13-SNAPSHOT - argeo-commons - .. - - org.argeo.security.dao.jackrabbit - Commons Security DAO Jackrabbit - \ No newline at end of file diff --git a/org.argeo.security.dao.jackrabbit/security.properties b/org.argeo.security.dao.jackrabbit/security.properties deleted file mode 100644 index beebcb5dc..000000000 --- a/org.argeo.security.dao.jackrabbit/security.properties +++ /dev/null @@ -1,2 +0,0 @@ -argeo.security.systemKey=argeo -argeo.node.repo.alias=node diff --git a/org.argeo.security.dao.ldap/.project b/org.argeo.security.dao.ldap/.project deleted file mode 100644 index cd8b39380..000000000 --- a/org.argeo.security.dao.ldap/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.security.dao.ldap - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml deleted file mode 100644 index 3235e66f4..000000000 --- a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - /org/argeo/jcr/argeo.cnd - - - - - - - - - - - - - ${argeo.ldap.userClass} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-osgi.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-osgi.xml deleted file mode 100644 index 9e6e3f24b..000000000 --- a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-osgi.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml deleted file mode 100644 index 8fc2b2d0d..000000000 --- a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml deleted file mode 100644 index ede9e2919..000000000 --- a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - osgibundle:ldap.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - top - ${argeo.ldap.groupClass} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.argeo.security.dao.ldap/bnd.bnd b/org.argeo.security.dao.ldap/bnd.bnd deleted file mode 100644 index 54130229d..000000000 --- a/org.argeo.security.dao.ldap/bnd.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Import-Package: org.argeo.jcr,\ -com.sun.jndi.ldap;resolution:=optional,\ -org.springframework.ldap.core.support,\ -* \ No newline at end of file diff --git a/org.argeo.security.dao.ldap/build.properties b/org.argeo.security.dao.ldap/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/org.argeo.security.dao.ldap/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/org.argeo.security.dao.ldap/ldap.properties b/org.argeo.security.dao.ldap/ldap.properties deleted file mode 100644 index 0f5164ff3..000000000 --- a/org.argeo.security.dao.ldap/ldap.properties +++ /dev/null @@ -1,32 +0,0 @@ -argeo.security.defaultRole=ROLE_USER -argeo.security.rolePrefix=ROLE_ - -argeo.security.systemKey=argeo -argeo.security.superUsername=root - -argeo.ldap.rootdn=dc=demo,dc=example,dc=org -argeo.ldap.protocol=ldap -argeo.ldap.host=localhost -# default are for Apache Directory Server -argeo.ldap.port=10389 -argeo.ldap.manager.userdn=uid=admin,ou=system -argeo.ldap.manager.password=secret - -# USER -argeo.ldap.userClass=inetOrgPerson -argeo.ldap.osUserClass=posixAccount -argeo.ldap.userBase=ou=People -argeo.ldap.usernameAttribute=uid -argeo.ldap.passwordAttribute=userPassword -# ROLES -argeo.ldap.groupClass=groupOfNames -argeo.ldap.groupBase=ou=Roles -argeo.ldap.groupRoleAttribute=cn -argeo.ldap.groupMemberAttribute=member -# OS GROUPS -argeo.ldap.osGroupClass=posixGroup -argeo.ldap.osGroupBase=ou=Group -argeo.ldap.osGroupNameAttribute=cn -argeo.ldap.osGroupMemberAttribute=memberUid - -argeo.ldap.password.useSalt=false \ No newline at end of file diff --git a/org.argeo.security.dao.ldap/pom.xml b/org.argeo.security.dao.ldap/pom.xml deleted file mode 100644 index 753244c8e..000000000 --- a/org.argeo.security.dao.ldap/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.1.13-SNAPSHOT - argeo-commons - .. - - org.argeo.security.dao.ldap - Commons Security DAO LDAP - \ No newline at end of file diff --git a/org.argeo.security.equinox/.classpath b/org.argeo.security.equinox/.classpath deleted file mode 100644 index d2953a684..000000000 --- a/org.argeo.security.equinox/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/org.argeo.security.equinox/.project b/org.argeo.security.equinox/.project deleted file mode 100644 index e4dd594e8..000000000 --- a/org.argeo.security.equinox/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.security.equinox - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.argeo.security.equinox/META-INF/spring/loginModules.xml b/org.argeo.security.equinox/META-INF/spring/loginModules.xml deleted file mode 100644 index 7a3e8025a..000000000 --- a/org.argeo.security.equinox/META-INF/spring/loginModules.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - osgibundle:security.properties - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.argeo.security.equinox/META-INF/spring/osgi.xml b/org.argeo.security.equinox/META-INF/spring/osgi.xml deleted file mode 100644 index 17ece3a08..000000000 --- a/org.argeo.security.equinox/META-INF/spring/osgi.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - \ No newline at end of file diff --git a/org.argeo.security.equinox/bnd.bnd b/org.argeo.security.equinox/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.security.equinox/build.properties b/org.argeo.security.equinox/build.properties deleted file mode 100644 index ae2abc5ff..000000000 --- a/org.argeo.security.equinox/build.properties +++ /dev/null @@ -1 +0,0 @@ -source.. = src/ \ No newline at end of file diff --git a/org.argeo.security.equinox/plugin.xml b/org.argeo.security.equinox/plugin.xml deleted file mode 100644 index 2cc81f137..000000000 --- a/org.argeo.security.equinox/plugin.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.argeo.security.equinox/pom.xml b/org.argeo.security.equinox/pom.xml deleted file mode 100644 index 6ed313768..000000000 --- a/org.argeo.security.equinox/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - 2.1.13-SNAPSHOT - argeo-commons - .. - - org.argeo.security.equinox - Commons Security Equinox - jar - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId};singleton:=true - *, - org.springframework.core, - org.argeo.eclipse.spring - - - - - - - - - - - - - - - - - org.argeo.commons - org.argeo.eclipse.ui.workbench - 2.1.13-SNAPSHOT - - - - - - - - org.argeo.commons - org.argeo.util - 2.1.13-SNAPSHOT - - - org.argeo.commons - org.argeo.security.core - 2.1.13-SNAPSHOT - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.equinox/security.properties b/org.argeo.security.equinox/security.properties deleted file mode 100644 index 70e75cce2..000000000 --- a/org.argeo.security.equinox/security.properties +++ /dev/null @@ -1,5 +0,0 @@ -argeo.security.systemKey=argeo - -argeo.security.anonymousRole=ROLE_ANONYMOUS - -argeo.i18n.availableLocales= \ No newline at end of file diff --git a/org.argeo.security.equinox/src/org/argeo/security/equinox/OsSpringLoginModule.java b/org.argeo.security.equinox/src/org/argeo/security/equinox/OsSpringLoginModule.java deleted file mode 100644 index 09f86b798..000000000 --- a/org.argeo.security.equinox/src/org/argeo/security/equinox/OsSpringLoginModule.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.security.equinox; - -import java.util.Map; - -import javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.login.LoginException; - -import org.argeo.security.OsAuthenticationToken; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.jaas.SecurityContextLoginModule; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; - -/** Login module which caches one subject per thread. */ -public class OsSpringLoginModule extends SecurityContextLoginModule { - // private final static Log log = - // LogFactory.getLog(OsSpringLoginModule.class); - - private AuthenticationManager authenticationManager; - - private Subject subject; - - public OsSpringLoginModule() { - - } - - @SuppressWarnings("rawtypes") - public void initialize(Subject subject, CallbackHandler callbackHandler, - Map sharedState, Map options) { - super.initialize(subject, callbackHandler, sharedState, options); - this.subject = subject; - } - - public boolean login() throws LoginException { - // thread already logged in - if (SecurityContextHolder.getContext().getAuthentication() != null) - return super.login(); - - OsAuthenticationToken oat = new OsAuthenticationToken(); - Authentication authentication = authenticationManager.authenticate(oat); - registerAuthentication(authentication); - return super.login(); - } - - @Override - public boolean logout() throws LoginException { - subject.getPrincipals().clear(); - return super.logout(); - } - - /** - * Register an {@link Authentication} in the security context. - * - * @param authentication - * has to implement {@link Authentication}. - */ - protected void registerAuthentication(Object authentication) { - SecurityContextHolder.getContext().setAuthentication( - (Authentication) authentication); - } - - public void setAuthenticationManager( - AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; - } -} diff --git a/org.argeo.security.equinox/src/org/argeo/security/equinox/SpringLoginModule.java b/org.argeo.security.equinox/src/org/argeo/security/equinox/SpringLoginModule.java deleted file mode 100644 index f07a203ff..000000000 --- a/org.argeo.security.equinox/src/org/argeo/security/equinox/SpringLoginModule.java +++ /dev/null @@ -1,244 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.security.equinox; - -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.UUID; - -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.login.LoginException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.security.NodeAuthenticationToken; -import org.argeo.util.LocaleCallback; -import org.argeo.util.LocaleUtils; -import org.springframework.security.authentication.AnonymousAuthenticationToken; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.jaas.SecurityContextLoginModule; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; - -/** Login module which caches one subject per thread. */ -public class SpringLoginModule extends SecurityContextLoginModule { - final static String NODE_REPO_URI = "argeo.node.repo.uri"; - - private final static Log log = LogFactory.getLog(SpringLoginModule.class); - - private AuthenticationManager authenticationManager; - - private CallbackHandler callbackHandler; - - private Subject subject; - - private Long waitBetweenFailedLoginAttempts = 5 * 1000l; - - private Boolean remote = false; - private Boolean anonymous = false; - /** Comma separated list of locales */ - private String availableLocales = ""; - - private String key = null; - private String anonymousRole = "ROLE_ANONYMOUS"; - - public SpringLoginModule() { - - } - - @SuppressWarnings("rawtypes") - public void initialize(Subject subject, CallbackHandler callbackHandler, - Map sharedState, Map options) { - super.initialize(subject, callbackHandler, sharedState, options); - this.callbackHandler = callbackHandler; - this.subject = subject; - } - - public boolean login() throws LoginException { - try { - // thread already logged in - if (SecurityContextHolder.getContext().getAuthentication() != null) - return super.login(); - - if (remote && anonymous) - throw new LoginException( - "Cannot have a Spring login module which is remote and anonymous"); - - // reset all principals and credentials - if (log.isTraceEnabled()) - log.trace("Resetting all principals and credentials of " - + subject); - if (subject.getPrincipals() != null) - subject.getPrincipals().clear(); - if (subject.getPrivateCredentials() != null) - subject.getPrivateCredentials().clear(); - if (subject.getPublicCredentials() != null) - subject.getPublicCredentials().clear(); - - Locale selectedLocale = null; - // deals first with public access since it's simple - if (anonymous) { - // multi locale - if (callbackHandler != null && availableLocales != null - && !availableLocales.trim().equals("")) { - LocaleCallback localeCallback = new LocaleCallback( - availableLocales); - callbackHandler.handle(new Callback[] { localeCallback }); - selectedLocale = localeCallback.getSelectedLocale(); - } - - // TODO integrate with JCR? - Object principal = UUID.randomUUID().toString(); - List authorities = Collections - .singletonList(new SimpleGrantedAuthority(anonymousRole)); - AnonymousAuthenticationToken anonymousToken = new AnonymousAuthenticationToken( - key, principal, authorities); - Authentication auth = authenticationManager - .authenticate(anonymousToken); - registerAuthentication(auth); - } else { - if (callbackHandler == null) - throw new LoginException("No call back handler available"); - - // ask for username and password - NameCallback nameCallback = new NameCallback("User"); - PasswordCallback passwordCallback = new PasswordCallback( - "Password", false); - final String defaultNodeUrl = System - .getProperty(NODE_REPO_URI, - "http://localhost:7070/org.argeo.jcr.webapp/remoting/node"); - NameCallback urlCallback = new NameCallback("Site URL", - defaultNodeUrl); - LocaleCallback localeCallback = new LocaleCallback( - availableLocales); - - // handle callbacks - if (remote) - callbackHandler.handle(new Callback[] { nameCallback, - passwordCallback, urlCallback, localeCallback }); - else - callbackHandler.handle(new Callback[] { nameCallback, - passwordCallback, localeCallback }); - - selectedLocale = localeCallback.getSelectedLocale(); - - // create credentials - String username = nameCallback.getName(); - if (username == null || username.trim().equals("")) - return false; - - String password = ""; - if (passwordCallback.getPassword() != null) - password = String.valueOf(passwordCallback.getPassword()); - - NodeAuthenticationToken credentials; - if (remote) { - String url = urlCallback.getName(); - credentials = new NodeAuthenticationToken(username, - password, url); - } else { - credentials = new NodeAuthenticationToken(username, - password); - } - - Authentication authentication; - try { - authentication = authenticationManager - .authenticate(credentials); - } catch (BadCredentialsException e) { - // wait between failed login attempts - Thread.sleep(waitBetweenFailedLoginAttempts); - throw e; - } - registerAuthentication(authentication); - } - - if (selectedLocale != null) - LocaleUtils.threadLocale.set(selectedLocale); - - return super.login(); - } catch (LoginException e) { - throw e; - } catch (ThreadDeath e) { - LoginException le = new LoginException( - "Spring Security login thread died"); - le.initCause(e); - throw le; - } catch (Exception e) { - LoginException le = new LoginException( - "Spring Security login failed"); - le.initCause(e); - throw le; - } - } - - @Override - public boolean logout() throws LoginException { - subject.getPrincipals().clear(); - return super.logout(); - } - - /** - * Register an {@link Authentication} in the security context. - * - * @param authentication - * has to implement {@link Authentication}. - */ - protected void registerAuthentication(Object authentication) { - SecurityContextHolder.getContext().setAuthentication( - (Authentication) authentication); - } - - public void setAuthenticationManager( - AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; - } - - /** Authenticates on a remote node */ - public void setRemote(Boolean remote) { - this.remote = remote; - } - - /** - * Request anonymous authentication (incompatible with remote) - */ - public void setAnonymous(Boolean anonymous) { - this.anonymous = anonymous; - } - - /** Role identifying an anonymous user */ - public void setAnonymousRole(String anonymousRole) { - this.anonymousRole = anonymousRole; - } - - /** System key */ - public void setKey(String key) { - this.key = key; - } - - public void setAvailableLocales(String locales) { - this.availableLocales = locales; - } - -}