From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 29 Mar 2020 07:45:08 +0000 (+0200)
Subject: Argeo CMS standalone distribution.
X-Git-Tag: argeo-commons-2.1.89~148
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=beb9503cba27396ab60a27316f2909613973bf70

Argeo CMS standalone distribution.
---

diff --git a/dist/argeo-node/assembly/cms-e4-rap.xml b/dist/argeo-node/assembly/cms-e4-rap.xml
index a3dda5563..877d6df60 100644
--- a/dist/argeo-node/assembly/cms-e4-rap.xml
+++ b/dist/argeo-node/assembly/cms-e4-rap.xml
@@ -9,15 +9,28 @@
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>base</directory>
-			<outputDirectory></outputDirectory>
+			<directory>base/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0755</fileMode>
+			<includes>
+				<include>**</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>base/etc</directory>
+			<outputDirectory>etc</outputDirectory>
+			<fileMode>0644</fileMode>
+			<includes>
+				<include>**</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>base/share</directory>
+			<outputDirectory>share</outputDirectory>
 			<fileMode>0644</fileMode>
 			<includes>
 				<include>**</include>
 			</includes>
-			<excludes>
-				<exclude>offline.bat</exclude>
-			</excludes>
 		</fileSet>
 	</fileSets>
 	<dependencySets>
diff --git a/dist/argeo-node/base/bin/argeo-cms b/dist/argeo-node/base/bin/argeo-cms
index d93d89984..bf3afa216 100755
--- a/dist/argeo-node/base/bin/argeo-cms
+++ b/dist/argeo-node/base/bin/argeo-cms
@@ -4,7 +4,8 @@ APP=argeo
 JVM=java
 
 BIN_DIR=`dirname "$0"`
-BASE_DIR=$BIN_DIR/..
+BASE_DIR="$(cd "$(dirname "$0")/.."; pwd -P)"
+#BASE_DIR=$BIN_DIR/..
 
 # Directories and files
 CONF_DIR=$BASE_DIR/etc/$APP
@@ -16,6 +17,7 @@ DATA_DIR=$EXEC_DIR/data
 CONF_RW=$EXEC_DIR/state
 CONFIG_INI=$CONF_RW/config.ini
 
+A2_SOURCES=a2://$BASE_DIR/share/osgi
 OSGI_INSTALL_AREA=$BASE_DIR/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
 
@@ -44,6 +46,7 @@ start() {
 	$JVM \
 		-Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
 		$JAVA_OPTS -jar $OSGI_FRAMEWORK \
+		-Dargeo.osgi.sources=$A2_SOURCES \
 		-configuration "$CONF_RW" \
 		-data "$DATA_DIR"
 }
diff --git a/dist/argeo-node/base/etc/argeo/argeo.ini b/dist/argeo-node/base/etc/argeo/argeo.ini
index d3335e24e..a4cbdcc1f 100644
--- a/dist/argeo-node/base/etc/argeo/argeo.ini
+++ b/dist/argeo-node/base/etc/argeo/argeo.ini
@@ -4,9 +4,6 @@ org.osgi.service.http.port=8080
 ## System management
 osgi.console=2323
 
-## Default sources
-argeo.osgi.sources=a2:///
-
 ## Standalone
 #argeo.node.useradmin.uris=dc=example,dc=com.ldif
 #argeo.node.repo.type=h2
diff --git a/dist/argeo-node/rpm/usr/sbin/argeoctl b/dist/argeo-node/rpm/usr/sbin/argeoctl
index ccadd8e9a..bcf597bcc 100755
--- a/dist/argeo-node/rpm/usr/sbin/argeoctl
+++ b/dist/argeo-node/rpm/usr/sbin/argeoctl
@@ -14,6 +14,8 @@ DATA_DIR=$EXEC_DIR/data
 CONF_RW=$EXEC_DIR/state
 CONFIG_INI=$CONF_RW/config.ini
 
+# A2 sources can be overridden in *.ini files
+A2_SOURCES=a2:///
 OSGI_INSTALL_AREA=/usr/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
 
@@ -42,6 +44,7 @@ start() {
 	$JVM \
 		-Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
 		$JAVA_OPTS -jar $OSGI_FRAMEWORK \
+		-Dargeo.osgi.sources=$A2_SOURCES \
 		-configuration "$CONF_RW" \
 		-data "$DATA_DIR"
 }