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 a3dda5563718eddc1b64f347f97b411da40911e6..877d6df60d78f3b6a21c30daaf903a319b4733b8 100644 (file)
--- 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 d93d89984bb9c84b8073e2be4b8e4ad8092d9156..bf3afa21642151748cd651e86f8a47bf56ed6267 100755 (executable)
--- 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 d3335e24e79c822b5a9a525a7fcd9feffd5d60b6..a4cbdcc1f6501dcfab8353dfd5b598bc44c34d39 100644 (file)
--- 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 ccadd8e9afd2f5d44fbb2bc9183654c2dcd5b3eb..bcf597bccfebfe6a23a9201040f371b918441fe3 100755 (executable)
--- 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"
 }