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

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 5fbb2caa9..f5fd4783b 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -1,113 +1,130 @@
-<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.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>2.1.7</version>
 	</parent>
-	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
-	<name>SLC Node (zip, 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>
-					<execution>
-						<id>filter-base</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
+	<name>SLC Distribution</name>
+	<profiles>
+		<profile>
+			<id>dist</id>
+			<build>
+				<plugins>
+					<!-- <plugin> -->
+					<!-- <groupId>org.apache.maven.plugins</groupId> -->
+					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
+					<!-- <executions> -->
+					<!-- <execution> -->
+					<!-- <id>copy-dependencies-dist</id> -->
+					<!-- <phase>package</phase> -->
+					<!-- <goals> -->
+					<!-- <goal>copy-dependencies</goal> -->
+					<!-- </goals> -->
+					<!-- <configuration> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+					<!-- <outputDirectory>${project.build.directory}/modulest</outputDirectory> -->
+					<!-- </configuration> -->
+					<!-- </execution> -->
+					<!-- </executions> -->
+					<!-- </plugin> -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
 						<configuration>
-							<outputDirectory>${basedir}/target/base</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/base</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
+							<finalName>argeo-slc-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/assembly/dist.xml</descriptor>
+							</descriptors>
 						</configuration>
-					</execution>
-				</executions>
-			</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>
+						<executions>
+							<execution>
+								<id>assembly-base</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- Backend -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.dep.backend</artifactId>
+					<version>2.1.7</version>
+					<type>pom</type>
+				</dependency>
+
+				<!-- SLC Libs -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.jcr</artifactId>
+					<version>2.1.1-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.repo</artifactId>
+					<version>2.1.1-SNAPSHOT</version>
+				</dependency>
+
+				<!-- Launcher -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.launcher</artifactId>
+					<version>2.1.1-SNAPSHOT</version>
+					<!-- <type>tar.gz</type> -->
+					<!-- <classifier>base</classifier> -->
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
 				<plugins>
+<!-- 					<plugin> -->
+<!-- 						<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 						<artifactId>maven-dependency-plugin</artifactId> -->
+<!-- 						<executions> -->
+<!-- 							<execution> -->
+<!-- 								<id>copy-dependencies-rpm</id> -->
+<!-- 								<phase>package</phase> -->
+<!-- 								<goals> -->
+<!-- 									<goal>copy</goal> -->
+<!-- 								</goals> -->
+<!-- 								<configuration> -->
+<!-- 									<includeTypes>jar</includeTypes> -->
+<!-- 									<stripVersion>true</stripVersion> -->
+<!-- 									<outputDirectory>${project.build.directory}/boot</outputDirectory> -->
+<!-- 									<artifactItems> -->
+<!-- 										<artifactItem> -->
+<!-- 											<groupId>org.argeo.slc</groupId> -->
+<!-- 											<artifactId>org.argeo.slc.launcher</artifactId> -->
+<!-- 											<version>${project.version}</version> -->
+<!-- 										</artifactItem> -->
+<!-- 									</artifactItems> -->
+<!-- 								</configuration> -->
+<!-- 							</execution> -->
+<!-- 						</executions> -->
+<!-- 					</plugin> -->
 					<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>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -118,9 +135,6 @@
 											<sources>
 												<source>
 													<location>src/main/rpm/usr/bin</location>
-													<includes>
-														<include>*</include>
-													</includes>
 												</source>
 											</sources>
 										</mapping>
@@ -133,40 +147,59 @@
 											<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>
+<!-- 										<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}/boot</location> -->
+<!-- 													<includes> -->
+<!-- 														<include>org.argeo.slc.launcher.jar</include> -->
+<!-- 													</includes> -->
+<!-- 												</source> -->
+<!-- 											</sources> -->
+<!-- 										</mapping> -->
+										<!-- Maven (even if not installed) -->
+										<mapping>
+											<directory>/var/lib/slc/.m2</directory>
+											<username>slc</username>
+											<groupname>slc</groupname>
+											<filemode>600</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/var/lib/slc/.m2</location>
 												</source>
 											</sources>
 										</mapping>
@@ -181,7 +214,10 @@
 										<scriptFile>src/main/scripts/preremove</scriptFile>
 									</preremoveScriptlet>
 									<requires>
+										<require>slc-platform</require>
 										<require>osgi-boot</require>
+										<!-- do not require java so that it can be installed on Ubuntu -->
+										<!-- <require>java-1.6.0-openjdk</require> -->
 									</requires>
 								</configuration>
 							</execution>