From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Nov 2017 05:53:56 +0000 (+0100)
Subject: Improve project organisation
X-Git-Tag: argeo-suite-0.1.12~22
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=b8372c7bc652e8fb2fcc5c2047706553dae09875

Improve project organisation
---

diff --git a/dep/.gitignore b/dep/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/dep/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/dep/org.argeo.suite.platform/.gitignore b/dep/org.argeo.suite.platform/.gitignore
new file mode 100644
index 0000000..d6c033c
--- /dev/null
+++ b/dep/org.argeo.suite.platform/.gitignore
@@ -0,0 +1,2 @@
+/target
+/org.argeo.suite.platform-maven.target
diff --git a/dep/org.argeo.suite.platform/META-INF/.gitignore b/dep/org.argeo.suite.platform/META-INF/.gitignore
new file mode 100644
index 0000000..4854a41
--- /dev/null
+++ b/dep/org.argeo.suite.platform/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/dep/org.argeo.suite.platform/bnd.bnd b/dep/org.argeo.suite.platform/bnd.bnd
new file mode 100644
index 0000000..991aa1a
--- /dev/null
+++ b/dep/org.argeo.suite.platform/bnd.bnd
@@ -0,0 +1 @@
+    
\ No newline at end of file
diff --git a/dep/org.argeo.suite.platform/pom.xml b/dep/org.argeo.suite.platform/pom.xml
new file mode 100644
index 0000000..932dd33
--- /dev/null
+++ b/dep/org.argeo.suite.platform/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.suite</groupId>
+		<artifactId>dep</artifactId>
+		<version>0.1.12-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.suite.platform</artifactId>
+	<name>Argeo Suite Platform</name>
+	<packaging>jar</packaging>
+	<dependencies>
+		<!-- Default Assembly for supported minimal set of Argeo Suite Features -->		
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.apps</artifactId>
+			<version>0.1.12-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.workbench.rap</artifactId>
+			<version>0.1.12-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.web</artifactId>
+			<version>0.1.12-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Base CMS distribution -->
+		<dependency>
+			<groupId>org.argeo.connect</groupId>
+			<artifactId>org.argeo.connect.platform</artifactId>
+			<version>${version.argeo-connect}</version>
+		</dependency>
+	</dependencies>
+		<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
+									<includeGroupIds>org.argeo.suite</includeGroupIds>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-suite</name>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>true</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib-argeo</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-connect</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/dep/pom.xml b/dep/pom.xml
new file mode 100644
index 0000000..71b7593
--- /dev/null
+++ b/dep/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.suite</groupId>
+		<artifactId>argeo-suite</artifactId>
+		<version>0.1.12-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>dep</artifactId>
+	<name>Argeo Suite Dependencies</name>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.argeo.suite.platform</module>
+	</modules>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- SDK -->
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>${version.argeo-commons}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+</project>
diff --git a/pom.xml b/pom.xml
index c6f09cd..37be851 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 		<module>org.argeo.suite.workbench.rap</module>
 		<module>org.argeo.suite.apps</module>
 		<module>org.argeo.suite.apps.web</module>
-		<module>sdk</module>
+		<module>dep</module>
 	</modules>
 	<properties>
 		<version.argeo-suite>0.1.12-SNAPSHOT</version.argeo-suite>
diff --git a/sdk/.project b/sdk/.project
deleted file mode 100644
index d95f518..0000000
--- a/sdk/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>argeo-suite-sdk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/sdk/org.argeo.suite.platform/.gitignore b/sdk/org.argeo.suite.platform/.gitignore
deleted file mode 100644
index d6c033c..0000000
--- a/sdk/org.argeo.suite.platform/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/org.argeo.suite.platform-maven.target
diff --git a/sdk/org.argeo.suite.platform/META-INF/.gitignore b/sdk/org.argeo.suite.platform/META-INF/.gitignore
deleted file mode 100644
index 4854a41..0000000
--- a/sdk/org.argeo.suite.platform/META-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/sdk/org.argeo.suite.platform/bnd.bnd b/sdk/org.argeo.suite.platform/bnd.bnd
deleted file mode 100644
index 991aa1a..0000000
--- a/sdk/org.argeo.suite.platform/bnd.bnd
+++ /dev/null
@@ -1 +0,0 @@
-    
\ No newline at end of file
diff --git a/sdk/org.argeo.suite.platform/pom.xml b/sdk/org.argeo.suite.platform/pom.xml
deleted file mode 100644
index e9df68c..0000000
--- a/sdk/org.argeo.suite.platform/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.suite</groupId>
-		<artifactId>sdk</artifactId>
-		<version>0.1.12-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.suite.platform</artifactId>
-	<name>Argeo Suite Minimal SDK</name>
-	<packaging>jar</packaging>
-	<dependencies>
-		<!-- Default Assembly for supported minimal set of Argeo Suite Features -->		
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.apps</artifactId>
-			<version>0.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.workbench.rap</artifactId>
-			<version>0.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.web</artifactId>
-			<version>0.1.12-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Base CMS distribution -->
-		<dependency>
-			<groupId>org.argeo.connect</groupId>
-			<artifactId>org.argeo.connect.platform</artifactId>
-			<version>${version.argeo-connect}</version>
-		</dependency>
-		<!-- We put all third parties in the target platform -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>argeo-tp</artifactId>
-			<version>${version.argeo-distribution}</version>
-		</dependency>
-	</dependencies>
-		<profiles>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-argeo</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-									<includeGroupIds>org.argeo.suite</includeGroupIds>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>rpm-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-argeo</id>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>argeo-suite</name>
-									<mappings>
-										<mapping>
-											<directory>/usr/share/osgi</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
-											<sources>
-												<source>
-													<location>${project.build.directory}/lib-argeo</location>
-													<includes>
-														<include>**/*.jar</include>
-													</includes>
-												</source>
-											</sources>
-										</mapping>
-									</mappings>
-									<requires>
-										<require>argeo-connect</require>
-									</requires>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/sdk/pom.xml b/sdk/pom.xml
deleted file mode 100644
index a827caf..0000000
--- a/sdk/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.suite</groupId>
-		<artifactId>argeo-suite</artifactId>
-		<version>0.1.12-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>sdk</artifactId>
-	<name>Argeo Suite SDKs</name>
-	<packaging>pom</packaging>
-	<modules>
-		<module>org.argeo.suite.platform</module>
-	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>