X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=bf7ea8ce054371d5574bc92f37181137e872400e;hb=720f7c1d69e578dc19a2032f14f9324c58cae5c4;hp=5fbb2caa9775c10c06e5d86936b380d0db6f41ea;hpb=dc8a8533c1dc7e44b8d1aa3892e420e05ce6d139;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 5fbb2caa9..bf7ea8ce0 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -9,26 +9,9 @@
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
-	<name>SLC Node (zip, rpm)</name>
+	<name>SLC Node (RPM)</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeTypes>jar</includeTypes>
-							<outputDirectory>${project.build.directory}/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
@@ -52,35 +35,6 @@
 			</plugin>
 		</plugins>
 	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk.rap</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-			<exclusions>
-				<!-- Included in osgi-boot -->
-				<exclusion>
-					<groupId>org.eclipse.osgi</groupId>
-					<artifactId>org.eclipse.osgi</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.commons.osgi</groupId>
-					<artifactId>org.argeo.osgi.boot</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<type>pom</type>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-	</dependencies>
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
@@ -89,25 +43,16 @@
 					<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-slc</id>
 								<phase>package</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
+									<name>slc</name>
+									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -118,9 +63,6 @@
 											<sources>
 												<source>
 													<location>src/main/rpm/usr/bin</location>
-													<includes>
-														<include>*</include>
-													</includes>
 												</source>
 											</sources>
 										</mapping>
@@ -133,60 +75,73 @@
 											<sources>
 												<source>
 													<location>src/main/rpm/etc/init.d</location>
-													<includes>
-														<include>*</include>
-													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/etc/${project.artifactId}</directory>
+											<directory>/etc/slc</directory>
 											<username>root</username>
-											<groupname>${project.artifactId}</groupname>
+											<groupname>slc</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/${project.artifactId}</location>
-													<includes>
-														<include>*</include>
-													</includes>
+													<location>src/main/rpm/etc/slc</location>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/share/${project.artifactId}/lib</directory>
+											<directory>/etc/slc-cl</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>target/lib</location>
-													<includes>
-														<include>*.jar</include>
-													</includes>
+													<location>src/main/rpm/etc/slc-cl</location>
 												</source>
 											</sources>
 										</mapping>
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall</scriptFile>
+										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
 									</preinstallScriptlet>
 									<postinstallScriptlet>
 										<scriptFile>src/main/scripts/postinstall</scriptFile>
 									</postinstallScriptlet>
 									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove</scriptFile>
+										<scriptFile>src/main/scripts/preremove-${rpm.release}</scriptFile>
 									</preremoveScriptlet>
 									<requires>
+										<require>slc-libs</require>
 										<require>osgi-boot</require>
+										<require>java-1.6.0-openjdk</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>