X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Forg.argeo.slc.sdk%2Fpom.xml;h=2f3c5ac36045e803d441f61eca2acd9b53ff5e67;hb=refs%2Ftags%2Fsvn%2Ftags%2Fargeo-slc-0.13.0;hp=9caf13347d04d5ef02faa3487bfb244a31d20921;hpb=558f0c39e2a8165e92b9d06cf01b45ca58f38c94;p=gpl%2Fargeo-slc.git

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 9caf13347..2f3c5ac36 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -2,8 +2,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>dep</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<artifactId>dist</artifactId>
+		<version>0.13.0</version>
 	</parent>
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>org.argeo.slc.sdk</artifactId>
@@ -27,7 +27,7 @@
 						</goals>
 						<configuration>
 							<includeTypes>jar</includeTypes>
-							<outputDirectory>${project.build.directory}</outputDirectory>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -59,8 +59,10 @@
 								<arg>-clean</arg>
 							</argsToAppend>
 							<systemProperties>
+								<!-- Make sure that no bundle will be started -->
+								<argeo.osgi.start>XXX</argeo.osgi.start>
 								<argeo.osgi.bundles>
-									${basedir}/target;in=*.jar,
+									${project.build.directory}/lib;in=*.jar,
 								</argeo.osgi.bundles>
 							</systemProperties>
 						</configuration>
@@ -71,7 +73,8 @@
 				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<id>filter-base</id>
+						<phase>process-resources</phase>
 						<goals>
 							<goal>copy-resources</goal>
 						</goals>
@@ -93,6 +96,7 @@
 				<configuration>
 					<descriptors>
 						<descriptor>src/assembly/dist.xml</descriptor>
+						<descriptor>src/assembly/devel.xml</descriptor>
 					</descriptors>
 				</configuration>
 				<executions>
@@ -105,118 +109,330 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!--
+				<plugin> <groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId> <version>1.1</version>
+				<executions> <execution> <id>create-repository</id>
+				<phase>deploy</phase> <goals> <goal>exec</goal> </goals>
+				</execution> </executions> <configuration>
+				<executable>${argeo.p2.cmd}</executable> optional
+				<workingDirectory>/tmp</workingDirectory> <arguments>
+				<argument>-noSplash</argument> <argument>-application</argument>
+				<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
+				<argument>-metadataRepository</argument>
+				<argument>file:${argeo.p2.repository}</argument>
+				<argument>-artifactRepository</argument>
+				<argument>file:${argeo.p2.repository}</argument>
+				<argument>-bundles</argument>
+				<argument>${project.build.directory}</argument>
+				<argument>-features</argument>
+				<argument>${project.build.directory}</argument>
+				<argument>-compress</argument>
+				<argument>-publishArtifacts</argument> </arguments> </configuration>
+				</plugin>
+			-->
+			<!-- 
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.1</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>create-repository</id>
+						<id>p2-copyToRepo</id>
 						<phase>deploy</phase>
 						<goals>
-							<goal>exec</goal>
+							<goal>run</goal>
 						</goals>
+						<configuration>
+							<tasks>
+								<mkdir dir="${project.build.directory}/repobase" />
+								<copy todir="${project.build.directory}/repobase">
+									<fileset dir="${project.build.directory}/lib">
+										<include name="*.jar" />
+									</fileset>
+									<fileset dir="${project.build.directory}/libsrc">
+										<include name="*.jar" />
+									</fileset>
+								</copy>
+								<exec executable="${argeo.p2.cmd}">
+									<arg value="-noSplash" />
+									<arg value="-application" />
+									<arg value="org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
+									<arg value="-metadataRepository" />
+									<arg value="file:${argeo.p2.repository}" />
+									<arg value="-artifactRepository" />
+									<arg value="file:${argeo.p2.repository}" />
+									<arg value="-bundles" />
+									<arg value="${project.build.directory}/repobase" />
+									<arg value="-features" />
+									<arg value="${project.build.directory}/repobase" />
+									<arg value="-compress" />
+									<arg value="-publishArtifacts" />
+								</exec>
+
+							</tasks>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<executable>${argeo.p2.cmd}</executable>
-					<!-- optional -->
-					<workingDirectory>/tmp</workingDirectory>
-					<arguments>
-						<argument>-noSplash</argument>
-						<argument>-application</argument>
-						<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
-						<argument>-metadataRepository</argument>
-						<argument>file:${argeo.p2.repository}</argument>
-						<argument>-artifactRepository</argument>
-						<argument>file:${argeo.p2.repository}</argument>
-						<argument>-bundles</argument>
-						<argument>${project.build.directory}</argument>
-						<argument>-features</argument>
-						<argument>${project.build.directory}</argument>
-						<argument>-compress</argument>
-						<argument>-publishArtifacts</argument>
-					</arguments>
-				</configuration>
 			</plugin>
+			 -->
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<artifactId>org.argeo.slc.dep.sdk</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.detached</artifactId>
+			<artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>org.argeo.slc.ria</artifactId>
-		</dependency>
-
-		<!-- Modules -->
-
-		<!-- Launcher -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${project.version}</version>
-			<type>tar.gz</type>
-			<classifier>base</classifier>
-		</dependency>
-
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>sdkWithModules</id>
+			<id>rpmbuild</id>
+
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<os>
+					<name>Linux</name>
+				</os>
+				<file>
+					<exists>/usr/bin/rpmbuild</exists>
+				</file>
 			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.modules</groupId>
-					<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-					<version>${project.version}</version>
-					<type>pom</type>
-				</dependency>
-				<dependency>
-					<groupId>org.argeo.slc.modules</groupId>
-					<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-					<version>${project.version}</version>
-					<type>pom</type>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>sdkWithoutModules</id>
-		</profile>
-		<profile>
-			<id>release</id>
+
 			<properties>
-				<argeo.p2.repository>/var/argeo/projects/SLC/www/sdk</argeo.p2.repository>
+				<package.version>${project.version}</package.version>
+				<distribution.label>argeo</distribution.label>
+				<distribution.root>/var/argeo/linux/argeo-el/5/argeo-testing</distribution.root>
 			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.modules</groupId>
-					<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-					<version>${project.version}</version>
-					<type>pom</type>
-				</dependency>
-				<dependency>
-					<groupId>org.argeo.slc.modules</groupId>
-					<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-					<version>${project.version}</version>
-					<type>pom</type>
-				</dependency>
-			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<extensions>true</extensions>
+						<configuration>
+							<version>${package.version}</version>
+							<release>r${buildNumber}.${distribution.label}</release>
+							<copyright>2010 Argeo</copyright>
+							<distribution>${distribution.label}</distribution>
+							<packager>mbaudier@argeo.org</packager>
+							<group>Applications/System</group>
+							<prefix>/usr</prefix>
+						</configuration>
+						<executions>
+							<execution>
+								<id>rpm-sdk</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<mappings>
+										<mapping>
+											<directory>/usr/bin</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>755</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/usr/bin</location>
+													<includes>
+														<include>*</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/etc/init.d</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>755</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/init.d</location>
+													<includes>
+														<include>*</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/etc/slc-agent</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>true</configuration>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/slc-agent</location>
+													<includes>
+														<include>*</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/etc/slc-server</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>true</configuration>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/slc-server</location>
+													<includes>
+														<include>*</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>target/lib</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<postinstallScriptlet>
+										<scriptFile>src/main/scripts/postinstall</scriptFile>
+									</postinstallScriptlet>
+									<preremoveScriptlet>
+										<scriptFile>src/main/scripts/preremove</scriptFile>
+									</preremoveScriptlet>
+									<requires>
+										<require>java</require>
+										<!-- For the start/stop scripts -->
+										<require>expect</require>
+									</requires>
+								</configuration>
+							</execution>
+							<execution>
+								<id>rpm-devel</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>${project.artifactId}-pdesources</name>
+									<mappings>
+										<mapping>
+											<directory>/usr/src/osgi/pde</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>target/libsrc</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>org.argeo.slc.sdk</require>
+									</requires>
+								</configuration>
+							</execution>
+							<execution>
+								<id>rpm-demo</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>${project.artifactId}-demo</name>
+									<mappings>
+										<mapping>
+											<directory>/var/lib/slc-agent/modules</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>../../demo/site</location>
+													<includes>
+														<include>org.argeo.*/**</include>
+													</includes>
+													<excludes>
+														<exclude>pom.xml</exclude>
+														<exclude>target</exclude>
+														<exclude>.svn</exclude>
+														<exclude>**/.svn/**</exclude>
+													</excludes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>org.argeo.slc.sdk</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+<!-- 
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-copyToRepo</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<tasks>
+										<mkdir dir="${distribution.root}/i386" />
+										<mkdir dir="${distribution.root}/x86_64" />
+										<delete verbose="true">
+											<fileset dir="${distribution.root}" includes="*/org.argeo.slc.sdk-*.rpm" />
+										</delete>
+										<copy todir="${distribution.root}/x86_64" verbose="true">
+											<fileset dir="target">
+												<include name="rpm/*/RPMS/*/*.rpm" />
+											</fileset>
+											<flattenmapper />
+										</copy>
+										<exec executable="/usr/bin/createrepo">
+											<arg value="${distribution.root}/x86_64" />
+										</exec>
+										<copy todir="${distribution.root}/i386" verbose="true">
+											<fileset dir="target">
+												<include name="rpm/*/RPMS/*/*.rpm" />
+											</fileset>
+											<flattenmapper />
+										</copy>
+										<exec executable="/usr/bin/createrepo">
+											<arg value="${distribution.root}/i386" />
+										</exec>
+									</tasks>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+ -->
+				</plugins>
+			</build>
+
 		</profile>
 	</profiles>
 </project>
\ No newline at end of file