Make argeo-node zip an artifact

diff --git a/dist/argeo-node/assembly/cms-e4-rap.xml b/dist/argeo-node/assembly/cms-e4-rap.xml
index 20383ce2a3ae2a76fbf3e62a9c65c882c3829617..c474f3cc11d626d45a2bab9b3b4639a018068fa5 100644 (file)
--- a/dist/argeo-node/assembly/cms-e4-rap.xml
+++ b/dist/argeo-node/assembly/cms-e4-rap.xml
@@ -3,9 +3,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
        <id>dist</id>
-       <baseDirectory>argeo-node</baseDirectory>
+       <baseDirectory></baseDirectory>
        <formats>
-               <format>dir</format>
+               <format>zip</format>
        </formats>
        <fileSets>
                <fileSet>
@@ -20,19 +20,19 @@
                        </excludes>
                </fileSet>
        </fileSets>
-       <dependencySets>
-               <dependencySet>
-                       <unpack>false</unpack>
-                       <outputFileNameMapping>${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
-                       <outputDirectory>share/osgi</outputDirectory>
-               </dependencySet>
-               <dependencySet>
-                       <useStrictFiltering>true</useStrictFiltering>
-                       <unpack>true</unpack>
-                       <outputDirectory></outputDirectory>
-                       <includes>
-                               <include>org.argeo.commons:osgi-boot:zip:*:*</include>
-                       </includes>
-               </dependencySet>
-       </dependencySets>
+<!--   <dependencySets> -->
+<!--           <dependencySet> -->
+<!--                   <unpack>false</unpack> -->
+<!--                   <outputFileNameMapping>${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> -->
+<!--                   <outputDirectory>share/osgi</outputDirectory> -->
+<!--           </dependencySet> -->
+<!--           <dependencySet> -->
+<!--                   <useStrictFiltering>true</useStrictFiltering> -->
+<!--                   <unpack>true</unpack> -->
+<!--                   <outputDirectory></outputDirectory> -->
+<!--                   <includes> -->
+<!--                           <include>org.argeo.commons:osgi-boot:zip:*:*</include> -->
+<!--                   </includes> -->
+<!--           </dependencySet> -->
+<!--   </dependencySets> -->
 </assembly>
\ No newline at end of file

diff --git a/dist/argeo-node/base/etc/argeo/conf.d/app-template.txt b/dist/argeo-node/base/etc/argeo/conf.d/app-template.txt
new file mode 100644 (file)
index 0000000..02aac6a
--- /dev/null
+++ b/dist/argeo-node/base/etc/argeo/conf.d/app-template.txt
@@ -0,0 +1,7 @@
+# Rename to <my app>.ini
+
+# Backend
+#argeo.osgi.start.5.apps=org.argeo.suite.apps
+
+# UI
+#argeo.osgi.start.6.apps=org.argeo.suite.apps.web,org.argeo.suite.workbench.rap

diff --git a/dist/argeo-node/base/share/argeo/config.ini b/dist/argeo-node/base/share/argeo/config.ini
index 88ae8ee3c451224c47a839c44798cd5dd6f0ab2c..269fcf6ee72f23d91df3a87979f284e86dfb74f2 100644 (file)
--- a/dist/argeo-node/base/share/argeo/config.ini
+++ b/dist/argeo-node/base/share/argeo/config.ini
@@ -7,6 +7,7 @@ org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.http.jetty,\
 org.eclipse.equinox.metatype,\
 org.eclipse.equinox.cm,\
+org.eclipse.equinox.ds,\
 org.eclipse.rap.rwt.osgi
 
 # Required CMS bundles to start