SLC Agent starting

git-svn-id: https://svn.argeo.org/slc/trunk@7913 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 14dd76306b9ea073ed4486bdcc22cfc0784da45c..11303046bed39f3090d0a9e0c253e016910e9871 100644 (file)
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -1,65 +1,40 @@
-# SLC SERVICES
-argeo.osgi.start.1.slc=\
-org.argeo.server.ads.server,\
+argeo.osgi.start.3.node=\
+org.eclipse.equinox.http.servlet,\
+org.eclipse.equinox.http.jetty,\
+org.eclipse.rap.rwt.osgi
+
+argeo.osgi.start.4.node=\
+org.argeo.cms,\
+
+argeo.osgi.start.5.node=\
+org.eclipse.gemini.blueprint.extender
+
+argeo.osgi.start.5.workbench=\
+org.eclipse.equinox.http.registry,\
 
-argeo.osgi.start.2.slc=\
+argeo.osgi.start.5.slc=\
 org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.support.maven,\
-org.argeo.slc.server.repo,\
 org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
 
-argeo.osgi.start.3.slc=\
-org.argeo.slc.server.repo.webapp,\
 
-# NODE SERVICES
-argeo.osgi.start.1.node=\
-org.springframework.osgi.extender,\
+org.osgi.service.http.port=7070
+org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 
-argeo.osgi.start.2.node=\
-org.argeo.node.repo.jackrabbit,\
-org.argeo.security.dao.ldap,\
-
-argeo.osgi.start.3.node=\
-org.argeo.jackrabbit.webapp,\
-org.argeo.server.rap.webapp,\
-org.argeo.server.catalina.start,\
-org.eclipse.equinox.http.registry,\
-org.springframework.osgi.web.extender,\
+log4j.configuration=file:../../log4j.properties
+org.eclipse.rap.workbenchAutostart=false
 
 slc.executionModules=org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
 org.argeo.slc.demo.minimal,\
 
-#org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.anonymousDistributionPerspective
 org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
-#org.argeo.security.ui.initialPerspective=org.argeo.security.ui.userHomePerspective
 
-#org.argeo.security.ui.saveAndRestore=true
-
-argeo.server.tomcat.config=conf/default-server-ssl.xml
+#argeo.server.tomcat.config=conf/default-server-ssl.xml
 
 # override ports to run the demo as a server
-argeo.server.port.http=9070
-argeo.server.port.https=9073
-argeo.server.port.ajp=9079 
-argeo.ldap.port=19389
-
-# anonymous url: http://localhost:7070/ui/public
-# authenticated url: http://localhost:7070/ui/node
-
-# LDAP (Apache DS)
-#argeo.ads.init.ldif=osgibundle:init-argeo.ldif
-
-log4j.configuration=file:../../log4j.properties
-
-
-# Postgresql
-#argeo.node.repo.configuration=osgibundle:repository-postgresql.xml
-#argeo.node.repo.dburl=jdbc:postgresql://localhost/slc
-#argeo.node.repo.dbuser=argeo
-#argeo.node.repo.dbpassword=argeo
-
+argeo.server.port.http=7070
+#argeo.server.port.https=9073
 
 # DON'T CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
 eclipse.ignoreApp=true

diff --git a/org.argeo.slc.agent.jcr/bnd.bnd b/org.argeo.slc.agent.jcr/bnd.bnd
index 0030580c49ac1bc8dc9ef51443ccd66bafee05f5..96ddb0d8d7d8fffb8865119b8c360c7fc35a876f 100644 (file)
--- a/org.argeo.slc.agent.jcr/bnd.bnd
+++ b/org.argeo.slc.agent.jcr/bnd.bnd
@@ -1,2 +1,19 @@
 Import-Package: org.argeo.slc.jcr,\
+org.apache.commons.vfs2.provider.bzip2,\
+org.apache.commons.vfs2.provider.compressed,\
+org.apache.commons.vfs2.provider.ftp,\
+org.apache.commons.vfs2.provider.ftps,\
+org.apache.commons.vfs2.provider.gzip,\
+org.apache.commons.vfs2.provider.http,\
+org.apache.commons.vfs2.provider.https,\
+org.apache.commons.vfs2.provider.jar,\
+org.apache.commons.vfs2.provider.local,\
+org.apache.commons.vfs2.provider.ram,\
+org.apache.commons.vfs2.provider.res,\
+org.apache.commons.vfs2.provider.sftp,\
+org.apache.commons.vfs2.provider.tar,\
+org.apache.commons.vfs2.provider.url,\
+org.apache.commons.vfs2.provider.temp,\
+org.apache.commons.vfs2.provider.webdav,\
+org.apache.commons.vfs2.provider.zip,\
 *

diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
index 68fcead713e53873713a7c87f2466e0dbeabf523..5718f2df025524dcd868713f7886e05548a54f40 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
@@ -225,8 +225,8 @@ public class OsgiExecutionModulesManager extends
                                + flowName + "))"
                                : "(&(Bundle-SymbolicName=" + moduleName + ")(Bundle-Version="
                                                + moduleVersion
-                                               + ")(org.eclipse.gemini.blueprint.bean.name=" + flowName
-                                               + "))";
+                                               + ")(org.eclipse.gemini.blueprint.bean.name="
+                                               + flowName + "))";
                return bundlesManager.getSingleServiceStrict(ExecutionFlow.class,
                                filter, true);
        }
@@ -457,6 +457,9 @@ public class OsgiExecutionModulesManager extends
        /** Unregisters an execution context. */
        public synchronized void unregister(ExecutionContext executionContext,
                        Map<String, String> properties) {
+               // FIXME why are properties null?
+               if (properties == null)
+                       return;
                OsgiBundle osgiBundle = asOsgiBundle(properties);
                if (executionContexts.containsKey(osgiBundle)) {
                        executionContexts.remove(osgiBundle);
@@ -493,6 +496,9 @@ public class OsgiExecutionModulesManager extends
        /** Unregisters an execution flow. */
        public synchronized void unregister(ExecutionFlow executionFlow,
                        Map<String, String> properties) {
+               // FIXME why are properties null?
+               if(properties==null)
+                       return;
                OsgiBundle osgiBundle = asOsgiBundle(properties);
                if (executionFlows.containsKey(osgiBundle)) {
                        Set<ExecutionFlow> flows = executionFlows.get(osgiBundle);