From eca689d9863786cc76fd8e1af20adc69733c0c08 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 30 Mar 2011 14:49:44 +0000
Subject: [PATCH] Improve security Improve source jars generation for plugins

git-svn-id: https://svn.argeo.org/commons/trunk@4407 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/jcrsecuritydao-osgi.xml   |  2 +-
 .../security.properties                       |  2 +-
 .../META-INF/spring/ldap-osgi.xml             |  2 +-
 .../ldap.properties                           |  2 ++
 .../.project                                  | 22 -------------------
 .../META-INF/MANIFEST.MF                      | 12 ----------
 .../META-INF/spring/osgi.xml                  | 14 ------------
 .../META-INF/spring/services.xml              | 10 ---------
 .../build.properties                          |  1 -
 security/plugins/pom.xml                      | 12 ++++++++--
 server/plugins/pom.xml                        |  7 ++++++
 11 files changed, 22 insertions(+), 64 deletions(-)
 delete mode 100644 security/modules/org.argeo.security.services.admin/.project
 delete mode 100644 security/modules/org.argeo.security.services.admin/META-INF/MANIFEST.MF
 delete mode 100644 security/modules/org.argeo.security.services.admin/META-INF/spring/osgi.xml
 delete mode 100644 security/modules/org.argeo.security.services.admin/META-INF/spring/services.xml
 delete mode 100644 security/modules/org.argeo.security.services.admin/build.properties

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 2797fd975..e893e9bfd 100644
--- 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" />
 	</reference>
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=${org.argeo.node.repo.alias})" cardinality="0..1">
+		filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})" cardinality="0..1">
 		<listener ref="osJcrAuthenticationProvider" bind-method="register"
 			unbind-method="unregister" />
 	</reference>
diff --git a/security/modules/org.argeo.security.dao.jackrabbit/security.properties b/security/modules/org.argeo.security.dao.jackrabbit/security.properties
index 9397ba9de..beebcb5dc 100644
--- 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 1d1de4b15..69931f574 100644
--- 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 @@
 
 	<!-- REFERENCES -->
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=node)" />
+		filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})" />
 	<reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />
 
 	<!-- SERVICES -->
diff --git a/security/modules/org.argeo.security.dao.ldap/ldap.properties b/security/modules/org.argeo.security.dao.ldap/ldap.properties
index 043b63465..5d7833bab 100644
--- 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
index fc06e31f6..000000000
--- 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
index e8c6199ea..000000000
--- 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
index cf8646e29..000000000
--- 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"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<!-- REFERENCES -->
-	<reference id="userAdminDao" interface="org.argeo.security.UserAdminDao" />
-
-	<!-- SERVICES -->
-	<service ref="securityService" interface="org.argeo.security.UserAdminService" />
-</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
index e7b9a4b28..000000000
--- 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
index 5f22cdd44..000000000
--- 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 f90373a0e..999e666f3 100644
--- 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 dd309a0c5..9e9fdf5e9 100644
--- 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>
-- 
2.30.2