X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi%2Fdist%2Fosgi-boot%2Fpom.xml;h=973a2c2e0c96cb22cc8e11aac017283d61f7682f;hb=a707002d2ac4cb3728876187b0d80445ab33acb5;hp=82b194ee9e0617f3d5505224fa8a5dbe4cf19818;hpb=bf936223ebdebe9e79cf8c58a06ef7ff44deb15c;p=lgpl%2Fargeo-commons.git

diff --git a/osgi/dist/osgi-boot/pom.xml b/osgi/dist/osgi-boot/pom.xml
index 82b194ee9..973a2c2e0 100644
--- a/osgi/dist/osgi-boot/pom.xml
+++ b/osgi/dist/osgi-boot/pom.xml
@@ -1,9 +1,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.osgi</groupId>
-		<version>0.3.4-SNAPSHOT</version>
+		<version>0.3.4</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -36,7 +35,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.osgi</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>0.3.4</version>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -47,37 +46,44 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
-						<version>2.1-alpha-1</version>
-						<extensions>true</extensions>
-						<configuration>
-							<version>${project.version}</version>
-							<release>r${buildNumber}.argeo</release>
-							<copyright>2011 Argeo</copyright>
-							<distribution>argeo</distribution>
-							<packager>mbaudier@argeo.org</packager>
-							<group>Applications/System</group>
-							<prefix>/usr</prefix>
-						</configuration>
 						<executions>
 							<execution>
-								<id>rpm-sdk</id>
+								<id>rpm-osgi-boot</id>
 								<phase>package</phase>
 								<goals>
-									<goal>attached-rpm</goal>
+									<goal>rpm</goal>
 								</goals>
 								<configuration>
+									<name>osgi-boot</name>
+									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/etc/osgiboot</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
-											<configuration>true</configuration>
+											<configuration>noreplace</configuration>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/osgiboot</location>
+													<includes>
+														<include>*-settings.sh</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/etc/osgiboot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
 													<location>src/main/rpm/etc/osgiboot</location>
 													<includes>
-														<include>*</include>
+														<include>*-functions.sh</include>
 													</includes>
 												</source>
 											</sources>
@@ -90,14 +96,11 @@
 											<sources>
 												<source>
 													<location>src/main/rpm/usr/sbin</location>
-													<includes>
-														<include>*</include>
-													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/share/osgiboot/lib</directory>
+											<directory>/usr/share/osgi/boot</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
@@ -106,24 +109,79 @@
 												<source>
 													<location>${project.build.directory}/lib</location>
 													<includes>
-														<include>*.jar</include>
+														<include>org.argeo.osgi.boot.jar</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 									</mappings>
-									<!-- <postinstallScriptlet> <scriptFile>src/main/scripts/postinstall</scriptFile> 
-										</postinstallScriptlet> <preremoveScriptlet> <scriptFile>src/main/scripts/preremove</scriptFile> 
-										</preremoveScriptlet> <postremoveScriptlet> <scriptFile>src/main/scripts/postremove</scriptFile> 
-										</postremoveScriptlet> -->
 									<requires>
-										<require>java</require>
-										<!-- For the start/stop scripts <require>telnet</require> <require>expect</require> -->
+										<require>osgi-boot-equinox</require>
 									</requires>
 								</configuration>
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${rpm.stagingRepository}" verbose="true">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-osgi-boot-equinox</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>osgi-boot-equinox</name>
+									<projversion>${version.argeo-distribution}</projversion>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi/boot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib</location>
+													<includes>
+														<include>org.eclipse.osgi.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>