From 3f5257ef08adbd0642634ae5c57da0b1e8a18b65 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 16 Feb 2020 07:57:18 +0100
Subject: [PATCH] Make Argeo Distribution multi-modules

---
 .gitignore                                    |  8 +-
 .project                                      | 30 +------
 org.argeo.tp.factory.core/.project            | 22 +++++
 .../META-INF}/MANIFEST.MF                     |  0
 .../META-INF}/spring/apache.commons.xml       |  0
 .../META-INF}/spring/apache.jackrabbit.xml    |  0
 .../META-INF}/spring/apache.xml               |  0
 .../META-INF}/spring/bouncycastle.xml         |  0
 .../META-INF}/spring/distribution.xml         |  0
 .../META-INF}/spring/eclipse.equinox.xml      |  0
 .../META-INF}/spring/eclipse.jetty.xml        |  0
 .../META-INF}/spring/eclipse.rap.e3.xml       |  0
 .../META-INF}/spring/eclipse.rap.e4.xml       |  0
 .../META-INF}/spring/eclipse.rcp.e4.xml       |  0
 .../META-INF}/spring/jackson.xml              |  0
 .../META-INF}/spring/javax.xml                |  0
 .../META-INF}/spring/misc.xml                 |  0
 .../META-INF}/spring/osgi.xml                 |  0
 .../META-INF}/spring/sdk.xml                  |  0
 .../META-INF}/spring/templates.xml            |  0
 bnd.bnd => org.argeo.tp.factory.core/bnd.bnd  |  0
 org.argeo.tp.factory.core/build.properties    |  1 +
 org.argeo.tp.factory.core/pom.xml             | 81 +++++++++++++++++++
 pom.xml                                       | 78 ++----------------
 24 files changed, 114 insertions(+), 106 deletions(-)
 create mode 100644 org.argeo.tp.factory.core/.project
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/MANIFEST.MF (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/apache.commons.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/apache.jackrabbit.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/apache.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/bouncycastle.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/distribution.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/eclipse.equinox.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/eclipse.jetty.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/eclipse.rap.e3.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/eclipse.rap.e4.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/eclipse.rcp.e4.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/jackson.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/javax.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/misc.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/osgi.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/sdk.xml (100%)
 rename {META-INF => org.argeo.tp.factory.core/META-INF}/spring/templates.xml (100%)
 rename bnd.bnd => org.argeo.tp.factory.core/bnd.bnd (100%)
 create mode 100644 org.argeo.tp.factory.core/build.properties
 create mode 100644 org.argeo.tp.factory.core/pom.xml

diff --git a/.gitignore b/.gitignore
index 525ff18..40b25ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /build
 /cache
 
-/target
-/*.target
-/feature.xml
-/modularDistribution.csv
+**/target
+**/*.target
+**/feature.xml
+**/modularDistribution.csv
diff --git a/.project b/.project
index bdf661a..e6aedf8 100644
--- a/.project
+++ b/.project
@@ -1,39 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.tp.factory.core</name>
+	<name>argeo-distribution</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>
-		<buildCommand>
-			<name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>1548843945419</id>
-			<name>demo/exec/slc_localrepo</name>
-			<type>6</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
 </projectDescription>
diff --git a/org.argeo.tp.factory.core/.project b/org.argeo.tp.factory.core/.project
new file mode 100644
index 0000000..78b3248
--- /dev/null
+++ b/org.argeo.tp.factory.core/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.tp.factory.core</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/META-INF/MANIFEST.MF b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
similarity index 100%
rename from META-INF/MANIFEST.MF
rename to org.argeo.tp.factory.core/META-INF/MANIFEST.MF
diff --git a/META-INF/spring/apache.commons.xml b/org.argeo.tp.factory.core/META-INF/spring/apache.commons.xml
similarity index 100%
rename from META-INF/spring/apache.commons.xml
rename to org.argeo.tp.factory.core/META-INF/spring/apache.commons.xml
diff --git a/META-INF/spring/apache.jackrabbit.xml b/org.argeo.tp.factory.core/META-INF/spring/apache.jackrabbit.xml
similarity index 100%
rename from META-INF/spring/apache.jackrabbit.xml
rename to org.argeo.tp.factory.core/META-INF/spring/apache.jackrabbit.xml
diff --git a/META-INF/spring/apache.xml b/org.argeo.tp.factory.core/META-INF/spring/apache.xml
similarity index 100%
rename from META-INF/spring/apache.xml
rename to org.argeo.tp.factory.core/META-INF/spring/apache.xml
diff --git a/META-INF/spring/bouncycastle.xml b/org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
similarity index 100%
rename from META-INF/spring/bouncycastle.xml
rename to org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
diff --git a/META-INF/spring/distribution.xml b/org.argeo.tp.factory.core/META-INF/spring/distribution.xml
similarity index 100%
rename from META-INF/spring/distribution.xml
rename to org.argeo.tp.factory.core/META-INF/spring/distribution.xml
diff --git a/META-INF/spring/eclipse.equinox.xml b/org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
similarity index 100%
rename from META-INF/spring/eclipse.equinox.xml
rename to org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
diff --git a/META-INF/spring/eclipse.jetty.xml b/org.argeo.tp.factory.core/META-INF/spring/eclipse.jetty.xml
similarity index 100%
rename from META-INF/spring/eclipse.jetty.xml
rename to org.argeo.tp.factory.core/META-INF/spring/eclipse.jetty.xml
diff --git a/META-INF/spring/eclipse.rap.e3.xml b/org.argeo.tp.factory.core/META-INF/spring/eclipse.rap.e3.xml
similarity index 100%
rename from META-INF/spring/eclipse.rap.e3.xml
rename to org.argeo.tp.factory.core/META-INF/spring/eclipse.rap.e3.xml
diff --git a/META-INF/spring/eclipse.rap.e4.xml b/org.argeo.tp.factory.core/META-INF/spring/eclipse.rap.e4.xml
similarity index 100%
rename from META-INF/spring/eclipse.rap.e4.xml
rename to org.argeo.tp.factory.core/META-INF/spring/eclipse.rap.e4.xml
diff --git a/META-INF/spring/eclipse.rcp.e4.xml b/org.argeo.tp.factory.core/META-INF/spring/eclipse.rcp.e4.xml
similarity index 100%
rename from META-INF/spring/eclipse.rcp.e4.xml
rename to org.argeo.tp.factory.core/META-INF/spring/eclipse.rcp.e4.xml
diff --git a/META-INF/spring/jackson.xml b/org.argeo.tp.factory.core/META-INF/spring/jackson.xml
similarity index 100%
rename from META-INF/spring/jackson.xml
rename to org.argeo.tp.factory.core/META-INF/spring/jackson.xml
diff --git a/META-INF/spring/javax.xml b/org.argeo.tp.factory.core/META-INF/spring/javax.xml
similarity index 100%
rename from META-INF/spring/javax.xml
rename to org.argeo.tp.factory.core/META-INF/spring/javax.xml
diff --git a/META-INF/spring/misc.xml b/org.argeo.tp.factory.core/META-INF/spring/misc.xml
similarity index 100%
rename from META-INF/spring/misc.xml
rename to org.argeo.tp.factory.core/META-INF/spring/misc.xml
diff --git a/META-INF/spring/osgi.xml b/org.argeo.tp.factory.core/META-INF/spring/osgi.xml
similarity index 100%
rename from META-INF/spring/osgi.xml
rename to org.argeo.tp.factory.core/META-INF/spring/osgi.xml
diff --git a/META-INF/spring/sdk.xml b/org.argeo.tp.factory.core/META-INF/spring/sdk.xml
similarity index 100%
rename from META-INF/spring/sdk.xml
rename to org.argeo.tp.factory.core/META-INF/spring/sdk.xml
diff --git a/META-INF/spring/templates.xml b/org.argeo.tp.factory.core/META-INF/spring/templates.xml
similarity index 100%
rename from META-INF/spring/templates.xml
rename to org.argeo.tp.factory.core/META-INF/spring/templates.xml
diff --git a/bnd.bnd b/org.argeo.tp.factory.core/bnd.bnd
similarity index 100%
rename from bnd.bnd
rename to org.argeo.tp.factory.core/bnd.bnd
diff --git a/org.argeo.tp.factory.core/build.properties b/org.argeo.tp.factory.core/build.properties
new file mode 100644
index 0000000..5f22cdd
--- /dev/null
+++ b/org.argeo.tp.factory.core/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/
diff --git a/org.argeo.tp.factory.core/pom.xml b/org.argeo.tp.factory.core/pom.xml
new file mode 100644
index 0000000..24e003c
--- /dev/null
+++ b/org.argeo.tp.factory.core/pom.xml
@@ -0,0 +1,81 @@
+<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.slc</groupId>
+		<artifactId>lib</artifactId>
+		<version>2.1.17-SNAPSHOT</version>
+	</parent>
+	<groupId>org.argeo.tp.factory</groupId>
+	<artifactId>org.argeo.tp.factory.core</artifactId>
+	<version>2.1.28-SNAPSHOT</version>
+	<name>Argeo Third Party Factory</name>
+	<description>OSGi packaging of free / open source third party libraries</description>
+	<properties>
+		<additionalImports.slc-lib>
+			javax.security.auth.callback;resolution:="optional"
+		</additionalImports.slc-lib>
+	</properties>
+	<build>
+		<resources>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>META-INF/distribution.xml</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>argeo-osgi-plugin</artifactId>
+				<version>2.1.1</version>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.repo</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<repositories>
+		<repository>
+			<id>argeo</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.1</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+		</repository>
+	</repositories>
+</project>
diff --git a/pom.xml b/pom.xml
index 24e003c..9c324a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,80 +2,12 @@
 	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.slc</groupId>
-		<artifactId>lib</artifactId>
-		<version>2.1.17-SNAPSHOT</version>
-	</parent>
 	<groupId>org.argeo.tp.factory</groupId>
-	<artifactId>org.argeo.tp.factory.core</artifactId>
+	<artifactId>argeo-distribution</artifactId>
 	<version>2.1.28-SNAPSHOT</version>
-	<name>Argeo Third Party Factory</name>
+	<name>Argeo Java OSGi Distribution</name>
 	<description>OSGi packaging of free / open source third party libraries</description>
-	<properties>
-		<additionalImports.slc-lib>
-			javax.security.auth.callback;resolution:="optional"
-		</additionalImports.slc-lib>
-	</properties>
-	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>META-INF/distribution.xml</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>argeo-osgi-plugin</artifactId>
-				<version>2.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.dep.backend</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<repositories>
-		<repository>
-			<id>argeo</id>
-			<url>http://forge.argeo.org/data/java/argeo-2.1</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-		</repository>
-	</repositories>
+	<modules>
+		<module>org.argeo.tp.factory.core</module>
+	</modules>
 </project>
-- 
2.30.2