From 00154c058c3ce91af6e264e6f5842e22724ea709 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 25 Nov 2014 13:16:18 +0000
Subject: [PATCH] New project conventions

git-svn-id: https://svn.argeo.org/commons/trunk@7531 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.security.core/build.properties      |  1 -
 org.argeo.security.jackrabbit/.classpath      | 10 +++---
 org.argeo.security.jackrabbit/bnd.bnd         |  4 +++
 .../build.properties                          |  5 +--
 org.argeo.security.jackrabbit/pom.xml         | 31 -------------------
 .../jackrabbit/ArgeoAccessManager.java        |  0
 .../security/jackrabbit/ArgeoLoginModule.java |  0
 .../jackrabbit/ArgeoSecurityManager.java      |  0
 .../jackrabbit/ArgeoSystemPrincipal.java      |  0
 .../jackrabbit/GrantedAuthorityPrincipal.java |  0
 .../jackrabbit/JackrabbitSecurityModel.java   |  0
 11 files changed, 11 insertions(+), 40 deletions(-)
 create mode 100644 org.argeo.security.jackrabbit/bnd.bnd
 rename org.argeo.security.jackrabbit/src/{main/java => }/org/argeo/security/jackrabbit/ArgeoAccessManager.java (100%)
 rename org.argeo.security.jackrabbit/src/{main/java => }/org/argeo/security/jackrabbit/ArgeoLoginModule.java (100%)
 rename org.argeo.security.jackrabbit/src/{main/java => }/org/argeo/security/jackrabbit/ArgeoSecurityManager.java (100%)
 rename org.argeo.security.jackrabbit/src/{main/java => }/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java (100%)
 rename org.argeo.security.jackrabbit/src/{main/java => }/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java (100%)
 rename org.argeo.security.jackrabbit/src/{main/java => }/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java (100%)

diff --git a/org.argeo.security.core/build.properties b/org.argeo.security.core/build.properties
index c988eeb5d..a25d2eaec 100644
--- a/org.argeo.security.core/build.properties
+++ b/org.argeo.security.core/build.properties
@@ -9,4 +9,3 @@ additional.bundles = org.springframework.transaction,\
                      slf4j.org.apache.commons.logging
 source.. = src/,\
            ext/test/
-bin.. = bin/
diff --git a/org.argeo.security.jackrabbit/.classpath b/org.argeo.security.jackrabbit/.classpath
index 5641c7ca3..d2953a684 100644
--- a/org.argeo.security.jackrabbit/.classpath
+++ b/org.argeo.security.jackrabbit/.classpath
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src" />
+	<classpathentry kind="con"
+		path="org.eclipse.pde.core.requiredPlugins" />
+	<classpathentry kind="con"
+		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
+	<classpathentry kind="output" path="bin" />
 </classpath>
diff --git a/org.argeo.security.jackrabbit/bnd.bnd b/org.argeo.security.jackrabbit/bnd.bnd
new file mode 100644
index 000000000..6cd12f83d
--- /dev/null
+++ b/org.argeo.security.jackrabbit/bnd.bnd
@@ -0,0 +1,4 @@
+Fragment-Host: org.apache.jackrabbit
+Import-Package: org.springframework.core,\
+org.argeo.jcr,\
+*
diff --git a/org.argeo.security.jackrabbit/build.properties b/org.argeo.security.jackrabbit/build.properties
index 5fc538bc8..30f715358 100644
--- a/org.argeo.security.jackrabbit/build.properties
+++ b/org.argeo.security.jackrabbit/build.properties
@@ -1,4 +1 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
+source.. = src/
diff --git a/org.argeo.security.jackrabbit/pom.xml b/org.argeo.security.jackrabbit/pom.xml
index a18c453dd..d615194b8 100644
--- a/org.argeo.security.jackrabbit/pom.xml
+++ b/org.argeo.security.jackrabbit/pom.xml
@@ -10,37 +10,6 @@
 	</parent>
 	<artifactId>org.argeo.security.jackrabbit</artifactId>
 	<name>Commons Security Jackrabbit</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-
-				<configuration>
-					<instructions>
-						<Fragment-Host>org.apache.jackrabbit</Fragment-Host>
-						<Export-Package>org.argeo.security.jackrabbit.*</Export-Package>
-						<Import-Package>
-							org.springframework.core,
-							org.argeo.jcr,
-							*</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
diff --git a/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoAccessManager.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessManager.java
similarity index 100%
rename from org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoAccessManager.java
rename to org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessManager.java
diff --git a/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoLoginModule.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoLoginModule.java
similarity index 100%
rename from org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoLoginModule.java
rename to org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoLoginModule.java
diff --git a/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
similarity index 100%
rename from org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
rename to org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
diff --git a/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java
similarity index 100%
rename from org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java
rename to org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java
diff --git a/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java
similarity index 100%
rename from org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java
rename to org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java
diff --git a/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java
similarity index 100%
rename from org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java
rename to org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java
-- 
2.30.2