X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fpom.xml;h=c066a64817056df9d6e62326e0428a07960e2fec;hb=7f49915d38159caf931293d06d08c761742cde1e;hp=4b0f4a8107b8c5bc23f9b04249a7b84d7bd35271;hpb=1091271b89f2d12e9898e01f6639c48831b1bc4b;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 4b0f4a810..c066a6481 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -1,10 +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</groupId>
-		<version>2.1.74-SNAPSHOT</version>
+		<version>2.3-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -15,16 +13,26 @@
 		<profile>
 			<id>dist</id>
 			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.client</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.node</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-					<version>2.1.74-SNAPSHOT</version>
+					<version>2.3-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>osgi-boot</artifactId>
 					<type>zip</type>
-					<version>2.1.74-SNAPSHOT</version>
+					<version>2.3-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
 			<build>
@@ -33,7 +41,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-assembly-plugin</artifactId>
 						<configuration>
-							<finalName>argeo-node-${project.version}</finalName>
+							<finalName>argeo-node-${version.released}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>
 								<descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -67,31 +75,44 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-node</name>
+									<name>argeo-node${argeo.rpm.suffix}</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/argeo.d</directory>
+											<username>root</username>
+											<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/node/conf.d</directory>
+											<directory>/etc/argeo/conf.d</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/conf.d</location>
+													<location>base/etc/argeo/conf.d</location>
 													<includes>
 														<include>*.ini</include>
 														<include>*.txt</include>
@@ -100,47 +121,46 @@
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/lib/systemd/system</directory>
+											<directory>/usr/share/argeo</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/usr/lib/systemd/system</location>
+													<location>base/share/argeo</location>
 													<includes>
-														<include>*.service</include>
+														<include>**</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/share/node</directory>
+											<directory>/usr/lib/systemd/system</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/system</location>
 													<includes>
-														<include>config.ini</include>
-														<include>all.policy</include>
+														<include>*.service</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/share/node/jjs</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/jjs</location>
+													<location>rpm/usr/lib/systemd/user</location>
 													<includes>
-														<include>*.js</include>
+														<include>*.service</include>
 													</includes>
 												</source>
 											</sources>
@@ -155,18 +175,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-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-osgi-boot${argeo.rpm.suffix}</require>
 										<!-- do not explicitely require java -->
 									</requires>
 								</configuration>