From b38e375ea95041712aa34fc5bdbaa00c8c7e15e0 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 16 Dec 2015 17:37:15 +0000
Subject: [PATCH] Improve packaging

git-svn-id: https://svn.argeo.org/commons/trunk@8717 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.dep.cms.client-maven.target     |  10 +-
 dep/org.argeo.dep.cms.client/pom.xml          |  21 ++--
 dep/org.argeo.dep.cms.node/pom.xml            |  10 +-
 dep/org.argeo.dep.cms.platform/pom.xml        |  24 +++-
 dep/org.argeo.dep.cms.sdk/bnd.bnd             |   0
 dep/org.argeo.dep.cms.sdk/p2.inf              |   2 +
 dep/org.argeo.dep.cms.sdk/pom.xml             | 106 ++++++++++++++++++
 dep/pom.xml                                   |  10 +-
 8 files changed, 151 insertions(+), 32 deletions(-)
 create mode 100644 dep/org.argeo.dep.cms.sdk/bnd.bnd
 create mode 100644 dep/org.argeo.dep.cms.sdk/p2.inf
 create mode 100644 dep/org.argeo.dep.cms.sdk/pom.xml

diff --git a/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target b/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target
index 3e2209cf2..7dd85a4ac 100644
--- a/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target
+++ b/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.6"?>
-<target name="org.argeo.dep.cms.client - Local Maven repository (v2.1.31-SNAPSHOT)">
+<target name="org.argeo.dep.cms.client - Local Maven repository (v2.1.32-SNAPSHOT)">
 <locations>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.util/2.1.31-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.server.jcr/2.1.31-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.osgi.boot/2.1.31-SNAPSHOT" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.util/2.1.32-SNAPSHOT" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.server.jcr/2.1.32-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/tp/javax/javax.jcr/2.0.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/tp/javax/javax.jcr.source/2.0.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/tp/javax/javax.transaction/1.1.0" type="Directory"/>
@@ -87,11 +86,11 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/tp/apache/jackrabbit/org.apache.jackrabbit.jcr2dav.source/2.10.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/tp/apache/jackrabbit/org.apache.jackrabbit.jcr2spi/2.10.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/tp/apache/jackrabbit/org.apache.jackrabbit.jcr2spi.source/2.10.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.osgi.boot/2.1.32-SNAPSHOT" type="Directory"/>
 </locations>
 <includeBundles>
 <plugin id="org.argeo.util"/>
 <plugin id="org.argeo.server.jcr"/>
-<plugin id="org.argeo.osgi.boot"/>
 <plugin id="javax.jcr"/>
 <plugin id="javax.jcr.source"/>
 <plugin id="javax.transaction"/>
@@ -174,5 +173,6 @@
 <plugin id="org.apache.jackrabbit.jcr2dav.source"/>
 <plugin id="org.apache.jackrabbit.jcr2spi"/>
 <plugin id="org.apache.jackrabbit.jcr2spi.source"/>
+<plugin id="org.argeo.osgi.boot"/>
 </includeBundles>
 </target>
diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index bcaa1ebaa..e802ff294 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,5 +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">
+<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>
@@ -22,17 +23,6 @@
 			<artifactId>org.argeo.server.jcr</artifactId>
 			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.commons</groupId> -->
-		<!-- <artifactId>org.argeo.security.jackrabbit</artifactId> -->
-		<!-- <version>2.1.31-SNAPSHOT</version> -->
-		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>2.1.32-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
 
 		<!-- Third Parties -->
 		<dependency>
@@ -200,6 +190,13 @@
 			<artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
 		</dependency>
 
+		<!-- Test only -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>2.1.32-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<profiles>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index ec47cdb8a..6978cc448 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -15,29 +15,29 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.client</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons UI -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 
 		<!-- CMS Dependencies -->
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 6ba88d849..c73ec7671 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.node</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
@@ -25,27 +25,27 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.ui</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui.workbench.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.32-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Misc Third Parties -->
@@ -77,6 +77,18 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.quartz-scheduler.quartz.jobs</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>biz.aQute.bnd</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.mail</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.junit</artifactId>
+		</dependency>
 
 
 		<!-- RAP Workbench -->
diff --git a/dep/org.argeo.dep.cms.sdk/bnd.bnd b/dep/org.argeo.dep.cms.sdk/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/dep/org.argeo.dep.cms.sdk/p2.inf b/dep/org.argeo.dep.cms.sdk/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/dep/org.argeo.dep.cms.sdk/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
new file mode 100644
index 000000000..027e976bc
--- /dev/null
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -0,0 +1,106 @@
+<?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>
+		<version>2.1.32-SNAPSHOT</version>
+		<artifactId>dep</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.dep.cms.sdk</artifactId>
+	<name>CMS SDK</name>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.platform</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		
+		<!-- ALM Third Parties -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.ant</groupId>
+			<artifactId>org.apache.ant</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.ant</groupId>
+			<artifactId>org.apache.ant.launch</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>biz.aQute.bnd</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.junit</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-cms-sdk-tp</name>
+									<projversion>${version.argeo-distribution}</projversion>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib-tp</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-cms-platform-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file
diff --git a/dep/pom.xml b/dep/pom.xml
index c64b1e579..de8114ed0 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
@@ -14,10 +15,11 @@
 		<module>org.argeo.dep.cms.client</module>
 		<module>org.argeo.dep.cms.node</module>
 		<module>org.argeo.dep.cms.platform</module>
+		<module>org.argeo.dep.cms.sdk</module>
 		<!-- legacy -->
-		<module>org.argeo.security.dep.node</module>
-		<module>org.argeo.dep.cms</module>
-		<module>org.argeo.security.dep.node.rap</module>
+		<!-- <module>org.argeo.security.dep.node</module> -->
+		<!-- <module>org.argeo.dep.cms</module> -->
+		<!-- <module>org.argeo.security.dep.node.rap</module> -->
 	</modules>
 	<build>
 		<plugins>
-- 
2.30.2