X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fpom.xml;h=f28373f99a302fc6e734f98728d0f0b5ca8f0b03;hb=291c21e0e1759d4dad147694f2f6585b6a718d02;hp=ecb37395ebf8cf09f64182499f5318ff8658f888;hpb=bf345b84989cc9a2984bba4390ebdb349701ed8e;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index ecb37395e..f28373f99 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.70-SNAPSHOT</version>
+		<version>2.1.100</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -10,6 +10,61 @@
 	<packaging>pom</packaging>
 	<name>Argeo Node</name>
 	<profiles>
+		<profile>
+			<id>dist</id>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.client</artifactId>
+					<version>2.1.100</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.node</artifactId>
+					<version>2.1.100</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
+					<version>2.1.100</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.sdk</artifactId>
+					<version>2.1.100</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>osgi-boot</artifactId>
+					<type>zip</type>
+					<version>2.1.100</version>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<configuration>
+							<finalName>argeo-node-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>assembly/cms-e4-rap.xml</descriptor>
+							</descriptors>
+						</configuration>
+						<executions>
+							<execution>
+								<id>assembly-base</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
@@ -28,28 +83,41 @@
 									<name>argeo-node</name>
 									<mappings>
 										<mapping>
-											<directory>/etc/node</directory>
+											<directory>/etc/argeo</directory>
 											<username>root</username>
-											<groupname>node</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/etc/node</location>
+													<location>base/etc/argeo</location>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/etc/node/conf.d</directory>
+											<directory>/etc/argeo.d</directory>
 											<username>root</username>
-											<groupname>node</groupname>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>noreplace</configuration>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>base/etc/argeo.d</location>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/etc/argeo/conf.d</directory>
+											<username>root</username>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/etc/node/conf.d</location>
+													<location>base/etc/argeo/conf.d</location>
 													<includes>
 														<include>*.ini</include>
 														<include>*.txt</include>
@@ -57,6 +125,21 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/share/argeo</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>base/share/argeo</location>
+													<includes>
+														<include>**</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/usr/lib/systemd/system</directory>
 											<username>root</username>
@@ -73,17 +156,16 @@
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/share/node</directory>
+											<directory>/usr/lib/systemd/user</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/usr/share/node</location>
+													<location>rpm/usr/lib/systemd/user</location>
 													<includes>
-														<include>config.ini</include>
-														<include>all.policy</include>
+														<include>*.service</include>
 													</includes>
 												</source>
 											</sources>
@@ -98,18 +180,15 @@
 												<source>
 													<location>rpm/usr/sbin</location>
 													<includes>
-														<include>nodectl</include>
+														<include>argeoctl</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 									</mappings>
-									<preinstallScriptlet>
-										<scriptFile>rpm/scripts/preinstall</scriptFile>
-									</preinstallScriptlet>
 									<requires>
 										<require>argeo-cms-node</require>
-										<require>osgi-boot</require>
+										<require>argeo-osgi-boot</require>
 										<!-- do not explicitely require java -->
 									</requires>
 								</configuration>