From eebaa683a3c470ad22a5eaa5c32f816a2ea2cbbb Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 25 Nov 2014 12:31:10 +0000
Subject: [PATCH] New project conventions

git-svn-id: https://svn.argeo.org/commons/trunk@7515 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.util/.classpath                          | 14 +++++++-------
 org.argeo.util/bnd.bnd                             |  0
 org.argeo.util/build.properties                    |  6 ------
 .../org/argeo/util/CsvParserEncodingTestCase.java  |  0
 .../org/argeo/util/CsvParserParseFileTest.java     |  0
 .../test}/org/argeo/util/CsvParserTestCase.java    |  0
 .../util/CsvParserWithQuotedSeparatorTest.java     |  0
 .../test}/org/argeo/util/CsvWriterTestCase.java    |  0
 .../test}/org/argeo/util/ReferenceFile.csv         |  0
 .../test}/org/argeo/util/TestParse-ISO.csv         |  0
 .../test}/org/argeo/util/TestParse-UTF-8.csv       |  0
 .../test}/org/argeo/util/ThroughputTest.java       |  0
 .../{main/java => }/org/argeo/ArgeoException.java  |  0
 .../java => }/org/argeo/ArgeoLogListener.java      |  0
 .../src/{main/java => }/org/argeo/ArgeoLogger.java |  0
 .../{main/java => }/org/argeo/ArgeoMonitor.java    |  0
 .../{main/java => }/org/argeo/OperatingSystem.java |  0
 .../src/{main/java => }/org/argeo/StreamUtils.java |  0
 .../{main/java => }/org/argeo/util/CsvParser.java  |  0
 .../org/argeo/util/CsvParserWithLinesAsMap.java    |  0
 .../{main/java => }/org/argeo/util/CsvWriter.java  |  0
 .../java => }/org/argeo/util/LocaleCallback.java   |  0
 .../java => }/org/argeo/util/LocaleUtils.java      |  0
 .../{main/java => }/org/argeo/util/Throughput.java |  0
 .../java => }/org/argeo/util/ThroughputEditor.java |  0
 .../org/argeo/util/security/DigestUtils.java       |  0
 .../java => }/org/argeo/util/security/Keyring.java |  0
 .../org/argeo/util/security/SimplePrincipal.java   |  0
 .../org/argeo/util/tabular/ArrayTabularRow.java    |  0
 .../org/argeo/util/tabular/CsvTabularWriter.java   |  0
 .../org/argeo/util/tabular/TabularColumn.java      |  0
 .../org/argeo/util/tabular/TabularContent.java     |  0
 .../org/argeo/util/tabular/TabularRow.java         |  0
 .../org/argeo/util/tabular/TabularRowIterator.java |  0
 .../org/argeo/util/tabular/TabularWriter.java      |  0
 35 files changed, 7 insertions(+), 13 deletions(-)
 create mode 100644 org.argeo.util/bnd.bnd
 delete mode 100644 org.argeo.util/build.properties
 rename org.argeo.util/{src/test/java => ext/test}/org/argeo/util/CsvParserEncodingTestCase.java (100%)
 rename org.argeo.util/{src/test/java => ext/test}/org/argeo/util/CsvParserParseFileTest.java (100%)
 rename org.argeo.util/{src/test/java => ext/test}/org/argeo/util/CsvParserTestCase.java (100%)
 rename org.argeo.util/{src/test/java => ext/test}/org/argeo/util/CsvParserWithQuotedSeparatorTest.java (100%)
 rename org.argeo.util/{src/test/java => ext/test}/org/argeo/util/CsvWriterTestCase.java (100%)
 rename org.argeo.util/{src/test/resources => ext/test}/org/argeo/util/ReferenceFile.csv (100%)
 rename org.argeo.util/{src/test/resources => ext/test}/org/argeo/util/TestParse-ISO.csv (100%)
 rename org.argeo.util/{src/test/resources => ext/test}/org/argeo/util/TestParse-UTF-8.csv (100%)
 rename org.argeo.util/{src/test/java => ext/test}/org/argeo/util/ThroughputTest.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/ArgeoException.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/ArgeoLogListener.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/ArgeoLogger.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/ArgeoMonitor.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/OperatingSystem.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/StreamUtils.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/CsvParser.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/CsvParserWithLinesAsMap.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/CsvWriter.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/LocaleCallback.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/LocaleUtils.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/Throughput.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/ThroughputEditor.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/security/DigestUtils.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/security/Keyring.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/security/SimplePrincipal.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/tabular/ArrayTabularRow.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/tabular/CsvTabularWriter.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/tabular/TabularColumn.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/tabular/TabularContent.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/tabular/TabularRow.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/tabular/TabularRowIterator.java (100%)
 rename org.argeo.util/src/{main/java => }/org/argeo/util/tabular/TabularWriter.java (100%)

diff --git a/org.argeo.util/.classpath b/org.argeo.util/.classpath
index 8499fd0fa..91d2c42e5 100644
--- a/org.argeo.util/.classpath
+++ b/org.argeo.util/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src" />
+	<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.util/bnd.bnd b/org.argeo.util/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/org.argeo.util/build.properties b/org.argeo.util/build.properties
deleted file mode 100644
index fcffb0f5e..000000000
--- a/org.argeo.util/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/main/java/,\
-           src/test/resources/,\
-           src/test/java/
-bin.includes = META-INF/,\
-               .
-additional.bundles = junit
diff --git a/org.argeo.util/src/test/java/org/argeo/util/CsvParserEncodingTestCase.java b/org.argeo.util/ext/test/org/argeo/util/CsvParserEncodingTestCase.java
similarity index 100%
rename from org.argeo.util/src/test/java/org/argeo/util/CsvParserEncodingTestCase.java
rename to org.argeo.util/ext/test/org/argeo/util/CsvParserEncodingTestCase.java
diff --git a/org.argeo.util/src/test/java/org/argeo/util/CsvParserParseFileTest.java b/org.argeo.util/ext/test/org/argeo/util/CsvParserParseFileTest.java
similarity index 100%
rename from org.argeo.util/src/test/java/org/argeo/util/CsvParserParseFileTest.java
rename to org.argeo.util/ext/test/org/argeo/util/CsvParserParseFileTest.java
diff --git a/org.argeo.util/src/test/java/org/argeo/util/CsvParserTestCase.java b/org.argeo.util/ext/test/org/argeo/util/CsvParserTestCase.java
similarity index 100%
rename from org.argeo.util/src/test/java/org/argeo/util/CsvParserTestCase.java
rename to org.argeo.util/ext/test/org/argeo/util/CsvParserTestCase.java
diff --git a/org.argeo.util/src/test/java/org/argeo/util/CsvParserWithQuotedSeparatorTest.java b/org.argeo.util/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java
similarity index 100%
rename from org.argeo.util/src/test/java/org/argeo/util/CsvParserWithQuotedSeparatorTest.java
rename to org.argeo.util/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java
diff --git a/org.argeo.util/src/test/java/org/argeo/util/CsvWriterTestCase.java b/org.argeo.util/ext/test/org/argeo/util/CsvWriterTestCase.java
similarity index 100%
rename from org.argeo.util/src/test/java/org/argeo/util/CsvWriterTestCase.java
rename to org.argeo.util/ext/test/org/argeo/util/CsvWriterTestCase.java
diff --git a/org.argeo.util/src/test/resources/org/argeo/util/ReferenceFile.csv b/org.argeo.util/ext/test/org/argeo/util/ReferenceFile.csv
similarity index 100%
rename from org.argeo.util/src/test/resources/org/argeo/util/ReferenceFile.csv
rename to org.argeo.util/ext/test/org/argeo/util/ReferenceFile.csv
diff --git a/org.argeo.util/src/test/resources/org/argeo/util/TestParse-ISO.csv b/org.argeo.util/ext/test/org/argeo/util/TestParse-ISO.csv
similarity index 100%
rename from org.argeo.util/src/test/resources/org/argeo/util/TestParse-ISO.csv
rename to org.argeo.util/ext/test/org/argeo/util/TestParse-ISO.csv
diff --git a/org.argeo.util/src/test/resources/org/argeo/util/TestParse-UTF-8.csv b/org.argeo.util/ext/test/org/argeo/util/TestParse-UTF-8.csv
similarity index 100%
rename from org.argeo.util/src/test/resources/org/argeo/util/TestParse-UTF-8.csv
rename to org.argeo.util/ext/test/org/argeo/util/TestParse-UTF-8.csv
diff --git a/org.argeo.util/src/test/java/org/argeo/util/ThroughputTest.java b/org.argeo.util/ext/test/org/argeo/util/ThroughputTest.java
similarity index 100%
rename from org.argeo.util/src/test/java/org/argeo/util/ThroughputTest.java
rename to org.argeo.util/ext/test/org/argeo/util/ThroughputTest.java
diff --git a/org.argeo.util/src/main/java/org/argeo/ArgeoException.java b/org.argeo.util/src/org/argeo/ArgeoException.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/ArgeoException.java
rename to org.argeo.util/src/org/argeo/ArgeoException.java
diff --git a/org.argeo.util/src/main/java/org/argeo/ArgeoLogListener.java b/org.argeo.util/src/org/argeo/ArgeoLogListener.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/ArgeoLogListener.java
rename to org.argeo.util/src/org/argeo/ArgeoLogListener.java
diff --git a/org.argeo.util/src/main/java/org/argeo/ArgeoLogger.java b/org.argeo.util/src/org/argeo/ArgeoLogger.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/ArgeoLogger.java
rename to org.argeo.util/src/org/argeo/ArgeoLogger.java
diff --git a/org.argeo.util/src/main/java/org/argeo/ArgeoMonitor.java b/org.argeo.util/src/org/argeo/ArgeoMonitor.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/ArgeoMonitor.java
rename to org.argeo.util/src/org/argeo/ArgeoMonitor.java
diff --git a/org.argeo.util/src/main/java/org/argeo/OperatingSystem.java b/org.argeo.util/src/org/argeo/OperatingSystem.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/OperatingSystem.java
rename to org.argeo.util/src/org/argeo/OperatingSystem.java
diff --git a/org.argeo.util/src/main/java/org/argeo/StreamUtils.java b/org.argeo.util/src/org/argeo/StreamUtils.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/StreamUtils.java
rename to org.argeo.util/src/org/argeo/StreamUtils.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/CsvParser.java b/org.argeo.util/src/org/argeo/util/CsvParser.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/CsvParser.java
rename to org.argeo.util/src/org/argeo/util/CsvParser.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/CsvParserWithLinesAsMap.java b/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/CsvParserWithLinesAsMap.java
rename to org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/CsvWriter.java b/org.argeo.util/src/org/argeo/util/CsvWriter.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/CsvWriter.java
rename to org.argeo.util/src/org/argeo/util/CsvWriter.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/LocaleCallback.java b/org.argeo.util/src/org/argeo/util/LocaleCallback.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/LocaleCallback.java
rename to org.argeo.util/src/org/argeo/util/LocaleCallback.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/LocaleUtils.java b/org.argeo.util/src/org/argeo/util/LocaleUtils.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/LocaleUtils.java
rename to org.argeo.util/src/org/argeo/util/LocaleUtils.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/Throughput.java b/org.argeo.util/src/org/argeo/util/Throughput.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/Throughput.java
rename to org.argeo.util/src/org/argeo/util/Throughput.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/ThroughputEditor.java b/org.argeo.util/src/org/argeo/util/ThroughputEditor.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/ThroughputEditor.java
rename to org.argeo.util/src/org/argeo/util/ThroughputEditor.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/security/DigestUtils.java b/org.argeo.util/src/org/argeo/util/security/DigestUtils.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/security/DigestUtils.java
rename to org.argeo.util/src/org/argeo/util/security/DigestUtils.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/security/Keyring.java b/org.argeo.util/src/org/argeo/util/security/Keyring.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/security/Keyring.java
rename to org.argeo.util/src/org/argeo/util/security/Keyring.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/security/SimplePrincipal.java b/org.argeo.util/src/org/argeo/util/security/SimplePrincipal.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/security/SimplePrincipal.java
rename to org.argeo.util/src/org/argeo/util/security/SimplePrincipal.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/tabular/ArrayTabularRow.java b/org.argeo.util/src/org/argeo/util/tabular/ArrayTabularRow.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/tabular/ArrayTabularRow.java
rename to org.argeo.util/src/org/argeo/util/tabular/ArrayTabularRow.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/tabular/CsvTabularWriter.java b/org.argeo.util/src/org/argeo/util/tabular/CsvTabularWriter.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/tabular/CsvTabularWriter.java
rename to org.argeo.util/src/org/argeo/util/tabular/CsvTabularWriter.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularColumn.java b/org.argeo.util/src/org/argeo/util/tabular/TabularColumn.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/tabular/TabularColumn.java
rename to org.argeo.util/src/org/argeo/util/tabular/TabularColumn.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularContent.java b/org.argeo.util/src/org/argeo/util/tabular/TabularContent.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/tabular/TabularContent.java
rename to org.argeo.util/src/org/argeo/util/tabular/TabularContent.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRow.java b/org.argeo.util/src/org/argeo/util/tabular/TabularRow.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRow.java
rename to org.argeo.util/src/org/argeo/util/tabular/TabularRow.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRowIterator.java b/org.argeo.util/src/org/argeo/util/tabular/TabularRowIterator.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRowIterator.java
rename to org.argeo.util/src/org/argeo/util/tabular/TabularRowIterator.java
diff --git a/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularWriter.java b/org.argeo.util/src/org/argeo/util/tabular/TabularWriter.java
similarity index 100%
rename from org.argeo.util/src/main/java/org/argeo/util/tabular/TabularWriter.java
rename to org.argeo.util/src/org/argeo/util/tabular/TabularWriter.java
-- 
2.39.2