From aa238ddb6873a19ecf92f68ad717b209da705e35 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 25 Nov 2014 12:40:23 +0000
Subject: [PATCH] Rename source directories

git-svn-id: https://svn.argeo.org/commons/trunk@7517 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.osgi.boot/.classpath                       | 12 +++++++-----
 .../.settings/org.eclipse.jdt.core.prefs             | 12 ------------
 org.argeo.osgi.boot/bnd.bnd                          |  2 ++
 .../org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java   |  0
 .../org/argeo/osgi/boot/OsgiBootRuntimeTest.java     |  0
 .../org/argeo/osgi/boot/Activator.java               |  0
 .../org/argeo/osgi/boot/AdminThread.java             |  0
 .../org/argeo/osgi/boot/DistributionBundle.java      |  0
 .../org/argeo/osgi/boot/Launcher.java                |  0
 .../org/argeo/osgi/boot/OsgiBoot.java                |  0
 .../org/argeo/osgi/boot/OsgiBootException.java       |  0
 .../org/argeo/osgi/boot/OsgiBootUtils.java           |  0
 .../boot/internal/springutil/AntPathMatcher.java     |  0
 .../boot/internal/springutil/CollectionUtils.java    |  0
 .../osgi/boot/internal/springutil/ObjectUtils.java   |  0
 .../osgi/boot/internal/springutil/PathMatcher.java   |  0
 .../osgi/boot/internal/springutil/StringUtils.java   |  0
 .../internal/springutil/SystemPropertyUtils.java     |  0
 org.argeo.osgi.boot/pom.xml                          |  8 --------
 19 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.argeo.osgi.boot/bnd.bnd
 rename org.argeo.osgi.boot/{src/test/java => ext/test}/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java (100%)
 rename org.argeo.osgi.boot/{src/test/java => ext/test}/org/argeo/osgi/boot/OsgiBootRuntimeTest.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/Activator.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/AdminThread.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/DistributionBundle.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/Launcher.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/OsgiBoot.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/OsgiBootException.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/OsgiBootUtils.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/internal/springutil/PathMatcher.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/internal/springutil/StringUtils.java (100%)
 rename org.argeo.osgi.boot/{src/main/java => newsrc}/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java (100%)

diff --git a/org.argeo.osgi.boot/.classpath b/org.argeo.osgi.boot/.classpath
index 2f7e966c4..cbc801ced 100644
--- a/org.argeo.osgi.boot/.classpath
+++ b/org.argeo.osgi.boot/.classpath
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<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/J2SE-1.4"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="newsrc" />
+	<classpathentry kind="src" path="ext/test" />
+	<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.osgi.boot/.settings/org.eclipse.jdt.core.prefs b/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ba812fb90..000000000
--- a/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Jun 26 11:15:56 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/org.argeo.osgi.boot/bnd.bnd b/org.argeo.osgi.boot/bnd.bnd
new file mode 100644
index 000000000..7c2fe0177
--- /dev/null
+++ b/org.argeo.osgi.boot/bnd.bnd
@@ -0,0 +1,2 @@
+Bundle-Activator: org.argeo.osgi.boot.Activator
+Import-Package: org.eclipse.*;resolution:=optional,*
diff --git a/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java
similarity index 100%
rename from org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java
rename to org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java
diff --git a/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
similarity index 100%
rename from org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
rename to org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/Activator.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/Activator.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/AdminThread.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/AdminThread.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/DistributionBundle.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/DistributionBundle.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/DistributionBundle.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/DistributionBundle.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/Launcher.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/Launcher.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/OsgiBoot.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/OsgiBoot.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootException.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/OsgiBootException.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootException.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/OsgiBootException.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/OsgiBootUtils.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/OsgiBootUtils.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/PathMatcher.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/PathMatcher.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/StringUtils.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/StringUtils.java
diff --git a/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java b/org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java
similarity index 100%
rename from org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java
rename to org.argeo.osgi.boot/newsrc/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java
diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml
index eae04e72f..f25907bb2 100644
--- a/org.argeo.osgi.boot/pom.xml
+++ b/org.argeo.osgi.boot/pom.xml
@@ -12,14 +12,6 @@
 	<name>Commons OSGi Boot</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.4</source>
-					<target>1.4</target>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-- 
2.30.2