Improve security

Improve source jars generation for plugins

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

diff --git a/security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/jcrsecuritydao-osgi.xml b/security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/jcrsecuritydao-osgi.xml
index 2797fd975017705aa81990a1cfc8d988362f72e4..e893e9bfd90c95d3d340bf07430cbdef9929fb3a 100644 (file)
--- a/security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/jcrsecuritydao-osgi.xml
+++ b/security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/jcrsecuritydao-osgi.xml
@@ -16,7 +16,7 @@
                        unbind-method="unregister" />\r
        </reference>\r
        <reference id="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=${org.argeo.node.repo.alias})" cardinality="0..1">\r
+               filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})" cardinality="0..1">\r
                <listener ref="osJcrAuthenticationProvider" bind-method="register"\r
                        unbind-method="unregister" />\r
        </reference>\r

diff --git a/security/modules/org.argeo.security.dao.jackrabbit/security.properties b/security/modules/org.argeo.security.dao.jackrabbit/security.properties
index 9397ba9deed0065483939e8f982f5b92e1631e05..beebcb5dcead9375a40a9453acc3712e1ae2d4e5 100644 (file)
--- a/security/modules/org.argeo.security.dao.jackrabbit/security.properties
+++ b/security/modules/org.argeo.security.dao.jackrabbit/security.properties
@@ -1,2 +1,2 @@
 argeo.security.systemKey=argeo
-org.argeo.node.repo.alias=node
+argeo.node.repo.alias=node

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
index 1d1de4b15f2a25abb4d6bbb4b74f0ca9a5c38f91..69931f5748295e2104d66bc2cdfaadf5a885717e 100644 (file)
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
@@ -8,7 +8,7 @@
 \r
        <!-- REFERENCES -->\r
        <reference id="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=node)" />\r
+               filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})" />\r
        <reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />\r
 \r
        <!-- SERVICES -->\r

diff --git a/security/modules/org.argeo.security.dao.ldap/ldap.properties b/security/modules/org.argeo.security.dao.ldap/ldap.properties
index 043b63465251d30dea5d6ed7fcb9facac4960a70..5d7833babf4357f9e5c84431758976d5a65d2427 100644 (file)
--- a/security/modules/org.argeo.security.dao.ldap/ldap.properties
+++ b/security/modules/org.argeo.security.dao.ldap/ldap.properties
@@ -1,3 +1,5 @@
+argeo.node.repo.alias=node
+
 argeo.security.defaultRole=ROLE_USER
 argeo.security.rolePrefix=ROLE_
 

diff --git a/security/modules/org.argeo.security.services.admin/.project b/security/modules/org.argeo.security.services.admin/.project
deleted file mode 100644 (file)
index fc06e31..0000000
--- a/security/modules/org.argeo.security.services.admin/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.security.services.admin</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>

diff --git a/security/modules/org.argeo.security.services.admin/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.services.admin/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index e8c6199..0000000
--- a/security/modules/org.argeo.security.services.admin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-SymbolicName: org.argeo.security.services.admin
-Bundle-Version: 0.3.2.SNAPSHOT
-Import-Package: org.argeo.security,
- org.argeo.security.core,
- org.springframework.beans.factory.config;specification-version="2.5.6.SEC01",
- org.springframework.security;specification-version="2.0.4.A",
- org.springframework.security.adapters;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.anonymous;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.encoding;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.rememberme;specification-version="2.0.6.RELEASE"
-Bundle-Name: Security Admin Services

diff --git a/security/modules/org.argeo.security.services.admin/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.services.admin/META-INF/spring/osgi.xml
deleted file mode 100644 (file)
index cf8646e..0000000
--- a/security/modules/org.argeo.security.services.admin/META-INF/spring/osgi.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <!-- REFERENCES -->\r
-       <reference id="userAdminDao" interface="org.argeo.security.UserAdminDao" />\r
-\r
-       <!-- SERVICES -->\r
-       <service ref="securityService" interface="org.argeo.security.UserAdminService" />\r
-</beans:beans>
\ No newline at end of file

diff --git a/security/modules/org.argeo.security.services.admin/META-INF/spring/services.xml b/security/modules/org.argeo.security.services.admin/META-INF/spring/services.xml
deleted file mode 100644 (file)
index e7b9a4b..0000000
--- a/security/modules/org.argeo.security.services.admin/META-INF/spring/services.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-       <bean id="securityService" class="org.argeo.security.core.DefaultUserAdminService">
-               <property name="userAdminDao" ref="userAdminDao" />
-       </bean>
-</beans>
\ No newline at end of file

diff --git a/security/modules/org.argeo.security.services.admin/build.properties b/security/modules/org.argeo.security.services.admin/build.properties
deleted file mode 100644 (file)
index 5f22cdd..0000000
--- a/security/modules/org.argeo.security.services.admin/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/

diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index f90373a0edabd9a1d1c2b2149c44cdad3edaceb5..999e666f36e07f1b9a0eb438ea14c9729b16a33c 100644 (file)
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -1,7 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-       <groupId>org.argeo.commons</groupId>
+               <groupId>org.argeo.commons</groupId>
                <version>0.3.2-SNAPSHOT</version>
                <artifactId>security</artifactId>
                <relativePath>..</relativePath>
@@ -58,6 +59,13 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
+                               <configuration>
+                                       <!-- Prevents source jars to contain misleading data -->
+                                       <excludes>
+                                               <exclude>plugin.xml</exclude>
+                                               <exclude>META-INF/MANIFEST.MF</exclude>
+                                       </excludes>
+                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>

diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index dd309a0c5d9910ec164de3ec3200411ccabcefa7..9e9fdf5e9821d1e9d38404723363a25d3420da6a 100644 (file)
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -35,6 +35,13 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
+                               <configuration>
+                                       <!-- Prevents source jars to contain misleading data -->
+                                       <excludes>
+                                               <exclude>plugin.xml</exclude>
+                                               <exclude>META-INF/MANIFEST.MF</exclude>
+                                       </excludes>
+                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>