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

git-svn-id: https://svn.argeo.org/commons/trunk@7535 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.security.ldap/.classpath            | 10 +++---
 org.argeo.security.ldap/bnd.bnd               |  4 +++
 org.argeo.security.ldap/build.properties      |  5 +--
 .../ldap/ArgeoLdapShaPasswordEncoder.java     |  0
 .../ldap/ArgeoLdapUserDetailsManager.java     |  0
 .../security/ldap/ArgeoUserAdminDaoLdap.java  |  0
 .../ldap/jcr/JcrLdapSynchronizer.java         |  0
 .../ldap/jcr/JcrUserDetailsContextMapper.java |  0
 org.argeo.security.mvc/.classpath             | 10 +++---
 org.argeo.security.mvc/bnd.bnd                |  1 +
 org.argeo.security.mvc/build.properties       |  2 +-
 org.argeo.security.mvc/pom.xml                | 33 ++-----------------
 .../security/mvc/ArgeoRememberMeServices.java |  0
 .../security/mvc/ArgeoUserInterceptor.java    |  0
 .../security/mvc/UsersRolesController.java    |  0
 15 files changed, 22 insertions(+), 43 deletions(-)
 create mode 100644 org.argeo.security.ldap/bnd.bnd
 rename org.argeo.security.ldap/src/{main/java => }/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java (100%)
 rename org.argeo.security.ldap/src/{main/java => }/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java (100%)
 rename org.argeo.security.ldap/src/{main/java => }/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java (100%)
 rename org.argeo.security.ldap/src/{main/java => }/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java (100%)
 rename org.argeo.security.ldap/src/{main/java => }/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java (100%)
 create mode 100644 org.argeo.security.mvc/bnd.bnd
 rename org.argeo.security.mvc/src/{main/java => }/org/argeo/security/mvc/ArgeoRememberMeServices.java (100%)
 rename org.argeo.security.mvc/src/{main/java => }/org/argeo/security/mvc/ArgeoUserInterceptor.java (100%)
 rename org.argeo.security.mvc/src/{main/java => }/org/argeo/security/mvc/UsersRolesController.java (100%)

diff --git a/org.argeo.security.ldap/.classpath b/org.argeo.security.ldap/.classpath
index 5641c7ca3..d2953a684 100644
--- a/org.argeo.security.ldap/.classpath
+++ b/org.argeo.security.ldap/.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.ldap/bnd.bnd b/org.argeo.security.ldap/bnd.bnd
new file mode 100644
index 000000000..12f35fa05
--- /dev/null
+++ b/org.argeo.security.ldap/bnd.bnd
@@ -0,0 +1,4 @@
+Import-Package: org.springframework.core,\
+org.springframework.dao,\
+javax.jcr.nodetype,\
+*
\ No newline at end of file
diff --git a/org.argeo.security.ldap/build.properties b/org.argeo.security.ldap/build.properties
index 5fc538bc8..30f715358 100644
--- a/org.argeo.security.ldap/build.properties
+++ b/org.argeo.security.ldap/build.properties
@@ -1,4 +1 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
+source.. = src/
diff --git a/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java
similarity index 100%
rename from org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java
rename to org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java
diff --git a/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java
similarity index 100%
rename from org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java
rename to org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java
diff --git a/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java
similarity index 100%
rename from org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java
rename to org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java
diff --git a/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java
similarity index 100%
rename from org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java
rename to org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java
diff --git a/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java
similarity index 100%
rename from org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java
rename to org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java
diff --git a/org.argeo.security.mvc/.classpath b/org.argeo.security.mvc/.classpath
index ff41fbb4d..d2953a684 100644
--- a/org.argeo.security.mvc/.classpath
+++ b/org.argeo.security.mvc/.classpath
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" 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="bin"/>
+	<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.mvc/bnd.bnd b/org.argeo.security.mvc/bnd.bnd
new file mode 100644
index 000000000..630bdd797
--- /dev/null
+++ b/org.argeo.security.mvc/bnd.bnd
@@ -0,0 +1 @@
+Import-Package: javax.servlet,*
diff --git a/org.argeo.security.mvc/build.properties b/org.argeo.security.mvc/build.properties
index a740a346d..1414da572 100644
--- a/org.argeo.security.mvc/build.properties
+++ b/org.argeo.security.mvc/build.properties
@@ -1,2 +1,2 @@
 additional.bundles = org.springframework.beans
-source.. = src/main/java/
+source.. = src/
diff --git a/org.argeo.security.mvc/pom.xml b/org.argeo.security.mvc/pom.xml
index dcee8b322..4fe9ca336 100644
--- a/org.argeo.security.mvc/pom.xml
+++ b/org.argeo.security.mvc/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
@@ -8,35 +10,6 @@
 	</parent>
 	<artifactId>org.argeo.security.mvc</artifactId>
 	<name>Commons Security MVC</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>
-						<Export-Package>
-							org.argeo.security.mvc.*
-						</Export-Package>
-						<Import-Package>*,javax.servlet</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- Argeo Server -->
 		<dependency>
diff --git a/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoRememberMeServices.java b/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java
similarity index 100%
rename from org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoRememberMeServices.java
rename to org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java
diff --git a/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java b/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoUserInterceptor.java
similarity index 100%
rename from org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java
rename to org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoUserInterceptor.java
diff --git a/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/org.argeo.security.mvc/src/org/argeo/security/mvc/UsersRolesController.java
similarity index 100%
rename from org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
rename to org.argeo.security.mvc/src/org/argeo/security/mvc/UsersRolesController.java
-- 
2.30.2