]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Use Equinox and Spring OSGi for SLC Detached
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 17 Nov 2008 20:21:50 +0000 (20:21 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 17 Nov 2008 20:21:50 +0000 (20:21 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@1831 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

39 files changed:
org.argeo.slc.agent/pom.xml
org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF
org.argeo.slc.core/pom.xml
org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF
org.argeo.slc.detached.ext.log4j/src/main/resources/META-INF/MANIFEST.MF
org.argeo.slc.detached.launcher/.classpath
org.argeo.slc.detached.launcher/.settings/org.eclipse.jdt.core.prefs
org.argeo.slc.detached.launcher/pom.xml
org.argeo.slc.detached.launcher/src/assembly/dist.xml
org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF
org.argeo.slc.detached.launcher/src/main/resources/log4j.properties
org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties [deleted file]
org.argeo.slc.detached/.classpath
org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs
org.argeo.slc.detached/pom.xml
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/AbstractDetachedActivator.java [deleted file]
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/Activator.java [deleted file]
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SimpleDetachedActivator.java [deleted file]
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SpringStaticRefProvider.java [deleted file]
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/StaticRefProvider.java [deleted file]
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/AbstractDriver.java
org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java
org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF
org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached-osgi.xml [new file with mode: 0644]
org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached.xml
org.argeo.slc.detached/src/main/resources/org/argeo/slc/detached/spring.xml
org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java
org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF
org.argeo.slc/pom.xml
sandbox/argeo.slc.jemmytest/.classpath
sandbox/argeo.slc.jemmytest/pom.xml
sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java [deleted file]
sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached-osgi.xml [new file with mode: 0644]
sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java

index 2c0a7f6bd59f2474186fa9e2bfd9ea780d275c18..396598180818deb58d81928eedbc3fb8b6d93176 100644 (file)
                        <artifactId>org.argeo.dep.osgi.ant</artifactId>
                </dependency>
 
-               <!--
-                       <dependency> <groupId>org.apache.ant</groupId>
-                       <artifactId>com.springsource.org.apache.tools.ant</artifactId>
-                       </dependency> <dependency> <groupId>org.apache.ant</groupId>
-                       <artifactId>ant</artifactId> </dependency> <dependency>
-                       <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-commons-logging</artifactId> </dependency>
-                       <dependency> <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-commons-net</artifactId> </dependency> <dependency>
-                       <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-apache-oro</artifactId> </dependency> <dependency>
-                       <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-apache-bsf</artifactId> </dependency>
-               -->
-
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>com.springsource.org.apache.commons.net</artifactId>
index 4bc6b27e117fe59b0fd63399b783fcfe5945e531..d445f26aa8bb530d16758196e65ea24ee0131dec 100644 (file)
@@ -71,51 +71,53 @@ Bundle-Version: 0.11.2.SNAPSHOT
 Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Distribution\r
-Import-Package: javax.xml.namespace,javax.xml.transform,javax.xml.tran\r
- sform.dom,junit.framework;version="3.8",org.apache.commons.cli;resolu\r
- tion:=optional;version="1.1",org.apache.commons.io;version="1.4",org.\r
- apache.commons.logging;version="1.1",org.apache.log4j;version="1.2",o\r
- rg.apache.log4j.spi;version="1.2",org.apache.tools.ant;version="1.7",\r
- org.apache.tools.ant.helper;version="1.7",org.apache.tools.ant.types;\r
- version="1.7",org.apache.tools.ant.util;version="1.7",org.argeo.slc.a\r
- nt;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.deploy;version="0.11.2\r
- .SNAPSHOT",org.argeo.slc.ant.detached;version="0.11.2.SNAPSHOT",org.a\r
- rgeo.slc.ant.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.struc\r
- ture;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.test;version="0.11.2\r
- .SNAPSHOT",org.argeo.slc.ant.unit;version="0.11.2.SNAPSHOT",org.argeo\r
- .slc.cli;version="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2\r
- .SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.arg\r
- eo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proce\r
- ss;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.\r
- 11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAP\r
- SHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc\r
- .core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.\r
- spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;version\r
- ="0.11.2.SNAPSHOT",org.argeo.slc.detached,org.argeo.slc.detached.ui,o\r
- rg.argeo.slc.lib.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.log\r
- ging;version="0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SN\r
- APSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo\r
- .slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;ve\r
- rsion="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT\r
- ",org.argeo.slc.support.deploy.ant;version="0.11.2.SNAPSHOT",org.arge\r
- o.slc.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;version=\r
- "0.11.2.SNAPSHOT",org.argeo.slc.ws.client.spring;version="0.11.2.SNAP\r
- SHOT",org.argeo.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.sl\r
- c.ws.test.tree;version="0.11.2.SNAPSHOT",org.springframework.beans;ve\r
- rsion="2.5.6.A",org.springframework.beans.factory;version="2.5.6.A",o\r
- rg.springframework.beans.factory.config;version="2.5.6.A",org.springf\r
- ramework.beans.factory.support;version="2.5.6.A",org.springframework.\r
- beans.factory.xml;version="2.5.6.A",org.springframework.context;versi\r
- on="2.5.6.A",org.springframework.context.support;version="2.5.6.A",or\r
- g.springframework.core.io;version="2.5.6.A",org.springframework.oxm;v\r
- ersion="1.5.5.A",org.springframework.util;version="2.5.6.A",org.sprin\r
- gframework.ws;version="1.5.5.A",org.springframework.ws.client;version\r
- ="1.5.5.A",org.springframework.ws.client.core;version="1.5.5.A",org.s\r
- pringframework.ws.client.support.interceptor;version="1.5.5.A",org.sp\r
- ringframework.ws.context;version="1.5.5.A",org.springframework.ws.soa\r
- p;version="1.5.5.A",org.springframework.ws.soap.client;version="1.5.5\r
- .A",org.springframework.xml.transform;version="1.5.5.A",org.springfra\r
- mework.xml.validation;version="1.5.5.A",org.w3c.dom,org.xml.sax\r
+Import-Package: javax.xml.namespace;version="1.3",javax.xml.transform;\r
+ version="1.3",javax.xml.transform.dom;version="1.3",junit.framework;v\r
+ ersion="3.8",org.apache.commons.cli;resolution:=optional;version="1.1\r
+ ",org.apache.commons.io;version="1.4",org.apache.commons.logging;vers\r
+ ion="1.1",org.apache.log4j;version="1.2",org.apache.log4j.spi;version\r
+ ="1.2",org.apache.tools.ant;version="1.7",org.apache.tools.ant.helper\r
+ ;version="1.7",org.apache.tools.ant.types;version="1.7",org.apache.to\r
+ ols.ant.util;version="1.7",org.argeo.slc.ant;version="0.11.2.SNAPSHOT\r
+ ",org.argeo.slc.ant.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.an\r
+ t.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.spring;version\r
+ ="0.11.2.SNAPSHOT",org.argeo.slc.ant.structure;version="0.11.2.SNAPSH\r
+ OT",org.argeo.slc.ant.test;version="0.11.2.SNAPSHOT",org.argeo.slc.an\r
+ t.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.cli;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.co\r
+ re.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version=\r
+ "0.11.2.SNAPSHOT",org.argeo.slc.core.process;version="0.11.2.SNAPSHOT\r
+ ",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.argeo.sl\r
+ c.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.te\r
+ st;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;version=\r
+ "0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.SNAP\r
+ SHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.arge\r
+ o.slc.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.lib.detached;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.logging;version="0.11.2.SNAPSHOT",org.argeo.slc\r
+ .maven;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.process;version="0\r
+ .11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT"\r
+ ,org.argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.argeo.slc.spring\r
+ ;version="0.11.2.SNAPSHOT",org.argeo.slc.support.deploy.ant;version="\r
+ 0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.arg\r
+ eo.slc.ws.client;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client.sp\r
+ ring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version="0.11\r
+ .2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT",org\r
+ .springframework.beans;version="2.5.6.A",org.springframework.beans.fa\r
+ ctory;version="2.5.6.A",org.springframework.beans.factory.config;vers\r
+ ion="2.5.6.A",org.springframework.beans.factory.support;version="2.5.\r
+ 6.A",org.springframework.beans.factory.xml;version="2.5.6.A",org.spri\r
+ ngframework.context;version="2.5.6.A",org.springframework.context.sup\r
+ port;version="2.5.6.A",org.springframework.core.io;version="2.5.6.A",\r
+ org.springframework.oxm;version="1.5.5.A",org.springframework.util;ve\r
+ rsion="2.5.6.A",org.springframework.ws;version="1.5.5.A",org.springfr\r
+ amework.ws.client;version="1.5.5.A",org.springframework.ws.client.cor\r
+ e;version="1.5.5.A",org.springframework.ws.client.support.interceptor\r
+ ;version="1.5.5.A",org.springframework.ws.context;version="1.5.5.A",o\r
+ rg.springframework.ws.soap;version="1.5.5.A",org.springframework.ws.s\r
+ oap.client;version="1.5.5.A",org.springframework.xml.transform;versio\r
+ n="1.5.5.A",org.springframework.xml.validation;version="1.5.5.A",org.\r
+ w3c.dom;version="1.3",org.xml.sax;version="1.3"\r
 Bundle-SymbolicName: org.argeo.slc.agent\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
index 576a3333f6cdc55dc7ee0e223bedbc2265506c20..973f69a0e78e536e476ed2a836b4f9d5b2d17764 100644 (file)
                        <groupId>org.codehaus.castor</groupId>
                        <artifactId>com.springsource.org.castor</artifactId>
                </dependency>
+               
                <dependency>
                        <groupId>org.apache.xerces</groupId>
                        <artifactId>com.springsource.org.apache.xerces</artifactId>
                </dependency>
+               <!-- 
                <dependency>
                        <groupId>org.apache.xalan</groupId>
                        <artifactId>com.springsource.org.apache.xalan</artifactId>
                </dependency>
+                -->
                <dependency>
                        <groupId>edu.emory.mathcs.backport</groupId>
                        <artifactId>
index fe1d575dad3ba114ba39b6b5be19fec3cb30bc67..2c064a187a23ce14b0051dade2c6ee242f2ed898 100644 (file)
@@ -76,47 +76,49 @@ Bundle-Version: 0.11.2.SNAPSHOT
 Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Core\r
-Import-Package: javax.sql,javax.xml.parsers,javax.xml.transform,javax.\r
- xml.transform.dom,javax.xml.transform.stream,junit.framework;version=\r
- "3.8",org.apache.commons.io;version="1.4",org.apache.commons.logging;\r
- version="1.1",org.apache.log4j;version="1.2",org.argeo.slc.castor;ver\r
- sion="0.11.2.SNAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPS\r
- HOT",org.argeo.slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo\r
- .slc.castor.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.str\r
- ucture;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree;\r
- version="0.11.2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.S\r
- NAPSHOT",org.argeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",org\r
- .argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;ve\r
- rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNA\r
- PSHOT",org.argeo.slc.core.process;version="0.11.2.SNAPSHOT",org.argeo\r
- .slc.core.process.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core\r
- .structure;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tre\r
- e;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.S\r
- NAPSHOT",org.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",or\r
- g.argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.\r
- core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree\r
- .htmlreport;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;versi\r
- on="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHOT"\r
- ,org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.\r
- diff;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11.2.\r
- SNAPSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.arg\r
- eo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;\r
- version="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSH\r
- OT",org.argeo.slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo.\r
- slc.support.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;ve\r
- rsion="0.11.2.SNAPSHOT",org.argeo.slc.unit.process;version="0.11.2.SN\r
- APSHOT",org.argeo.slc.unit.test.tree;version="0.11.2.SNAPSHOT",org.ar\r
- geo.slc.xml;version="0.11.2.SNAPSHOT",org.argeo.slc.xml.spring;versio\r
- n="0.11.2.SNAPSHOT",org.dbunit;version="2.2",org.dbunit.database;vers\r
- ion="2.2",org.dbunit.dataset;version="2.2",org.dbunit.dataset.xml;ver\r
- sion="2.2",org.dbunit.operation;version="2.2",org.exolab.castor.mappi\r
- ng;version="1.2",org.springframework.beans.factory;version="2.5.6.A",\r
- org.springframework.context;version="2.5.6.A",org.springframework.con\r
- text.support;version="2.5.6.A",org.springframework.core.io;version="2\r
- .5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframework\r
- .util;version="2.5.6.A",org.springframework.xml.transform;version="1.\r
- 5.5.A",org.springframework.xml.validation;version="1.5.5.A",org.sprin\r
- gframework.xml.xsd;version="1.5.5.A",org.w3c.dom,org.xml.sax\r
+Import-Package: javax.sql,javax.xml.parsers;version="1.3",javax.xml.tr\r
+ ansform;version="1.3",javax.xml.transform.dom;version="1.3",javax.xml\r
+ .transform.stream;version="1.3",junit.framework;version="3.8",org.apa\r
+ che.commons.io;version="1.4",org.apache.commons.logging;version="1.1"\r
+ ,org.apache.log4j;version="1.2",org.argeo.slc.castor;version="0.11.2.\r
+ SNAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org.arge\r
+ o.slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.s\r
+ pring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure;versio\r
+ n="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree;version="0.11\r
+ .2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.SNAPSHOT",org.\r
+ argeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.co\r
+ re;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.ar\r
+ geo.slc.core.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.pro\r
+ cess.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.\r
+ 11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.\r
+ argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.c\r
+ ore.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tre\r
+ e;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree.htmlreport;v\r
+ ersion="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHOT",org.argeo.sl\r
+ c.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.diff;version=\r
+ "0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11.2.SNAPSHOT",org\r
+ .argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.te\r
+ st.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;version="0.11\r
+ .2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT",org.argeo\r
+ .slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.support.d\r
+ eploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.unit.process;version="0.11.2.SNAPSHOT",org.a\r
+ rgeo.slc.unit.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.xml;v\r
+ ersion="0.11.2.SNAPSHOT",org.argeo.slc.xml.spring;version="0.11.2.SNA\r
+ PSHOT",org.dbunit;version="2.2",org.dbunit.database;version="2.2",org\r
+ .dbunit.dataset;version="2.2",org.dbunit.dataset.xml;version="2.2",or\r
+ g.dbunit.operation;version="2.2",org.exolab.castor.mapping;version="1\r
+ .2",org.springframework.beans.factory;version="2.5.6.A",org.springfra\r
+ mework.context;version="2.5.6.A",org.springframework.context.support;\r
+ version="2.5.6.A",org.springframework.core.io;version="2.5.6.A",org.s\r
+ pringframework.oxm;version="1.5.5.A",org.springframework.util;version\r
+ ="2.5.6.A",org.springframework.xml.transform;version="1.5.5.A",org.sp\r
+ ringframework.xml.validation;version="1.5.5.A",org.springframework.xm\r
+ l.xsd;version="1.5.5.A",org.w3c.dom;version="1.3",org.xml.sax;version\r
+ ="1.3"\r
 Bundle-SymbolicName: org.argeo.slc.core\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
index 6fb44194559c475d0191067570521f293259d5e3..240b2ccb841dbca8098755c089b25df5c0ec3a1d 100644 (file)
@@ -13,5 +13,6 @@ Bundle-Description: SLC Distribution
 Bundle-SymbolicName: org.argeo.slc.detached.ext.log4j\r
 Bundle-DocURL: http://www.argeo.org\r
 Include-Resource: log4j.properties=src/main/resources/log4j.properties\r
+ ,META-INF/MANIFEST.MF=src/main/resources/META-INF/MANIFEST.MF\r
 Originally-Created-By: Apache Maven Bundle Plugin\r
 \r
index 2c7953e072daa00761004570cd5c660c81f00238..b606f1820e907cbf70956b7b84a8f05e10ba7e9b 100644 (file)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>
index 166aca32cc47db0a25481f081505bc30b2501ae5..3bd18ea498af0d54dc6aeeec39a13d042102770b 100644 (file)
@@ -1,9 +1,9 @@
-#Sun Oct 12 08:32:18 CEST 2008
+#Mon Nov 17 14:48:56 CET 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
index 9e1f8dc908da038c123c6bbe48a3eec533b28531..e9b7ddaac2f18b496245372fa22a038383256873 100644 (file)
                </plugins>
        </build>
        <dependencies>
+               <!--
+                       <dependency> <groupId>org.apache.felix</groupId>
+                       <artifactId>org.apache.felix.main</artifactId> </dependency>
+               -->
+               <dependency>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
                <dependency>
-                       <groupId>org.apache.felix</groupId>
-                       <artifactId>org.apache.felix.main</artifactId>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
 
+
                <!--
                        Old <dependency> <groupId>org.springframework</groupId>
                        <artifactId>spring-context</artifactId> <version>2.0.8</version>
                        <artifactId>commons-io</artifactId> </dependency>
                -->
 
+<!--
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.detached.ext.log4j</artifactId>
                        <version>0.11.2</version>
                </dependency>
-
+  -->
                <!-- Spring -->
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.context</artifactId>
                </dependency>
 
-
+<!-- 
                <dependency>
                        <groupId>org.apache.xerces</groupId>
                        <artifactId>com.springsource.org.apache.xerces</artifactId>
                        <artifactId>
                                com.springsource.edu.emory.mathcs.backport
                        </artifactId>
-               </dependency>
+               </dependency> -->
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>
index 12ac142a6b8ac250e5b1b46ba002ac1a843e2cea..e7d97af79554230a88281f3f54c07cb8ce8e911c 100644 (file)
                        <fileMode>0755</fileMode>\r
                </fileSet>\r
        </fileSets>\r
-       <dependencySets>\r
-               <dependencySet>\r
-                       <unpack>false</unpack>\r
-                       <outputDirectory>lib/detached</outputDirectory>\r
-                       <includes>\r
-                               <include>*:jar</include>\r
-                       </includes>\r
-               </dependencySet>\r
-       </dependencySets>\r
 </assembly>
\ No newline at end of file
index ba181b5885f5bf8f9d4ab18b0b1413a944f4cae1..6ccdcdff40fec7a211d7c6ef6ad0070fa171996c 100644 (file)
@@ -2,49 +2,37 @@ package org.argeo.slc.detached.launcher;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
+import java.util.StringTokenizer;
 import java.util.Vector;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.felix.framework.Felix;
-import org.apache.felix.framework.cache.BundleCache;
-import org.apache.felix.main.AutoActivator;
+import org.eclipse.core.runtime.adaptor.EclipseStarter;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 
 public class Main {
-       private final static Log log = LogFactory.getLog(Main.class);
+       private final static String DEV_BUNDLE_PREFIX = "slc.osgi.devbundle.";
 
        public static void main(String[] args) {
-               log.info("Argeo SLC Detached launcher starting...");
+               info("Argeo SLC Detached launcher starting...");
                try {
                        // Load properties
                        String propertyPath = "slc-detached.properties";
                        Properties config = prepareConfig(propertyPath);
 
-                       // Create cache dir
-                       if (!config.containsKey(BundleCache.CACHE_PROFILE_DIR_PROP)) {
-                               final File cachedir = createTemporaryCacheDir();
-                               config.put(BundleCache.CACHE_PROFILE_DIR_PROP, cachedir
-                                               .getAbsolutePath());
-                       }
-
                        // Start app (in main class loader)
                        startApp(config);
-                       // Thread.sleep(10000);
-
-                       // Start OSGi system
-                       Felix felix = startSystem(config);
 
-                       log.info("Argeo SLC Detached system started (Felix " + felix + ")");
-
-                       // felix.stop();
+                       // Start OSGi framework
+                       startEquinox(config);
+                       info("Argeo SLC Detached launcher started.");
                } catch (Exception e) {
                        e.printStackTrace();
                        System.exit(-1);
@@ -63,15 +51,6 @@ public class Main {
                // Load config
                Properties config = new Properties();
                InputStream in = null;
-
-               try {
-                       in = Main.class
-                                       .getResourceAsStream("/org/argeo/slc/detached/launcher/felix.properties");
-                       config.load(in);
-               } finally {
-                       IOUtils.closeQuietly(in);
-               }
-
                try {
                        File file = new File(propertyFilePath);
                        if (file.exists()) {
@@ -79,50 +58,120 @@ public class Main {
                                config.load(in);
                        }
                } finally {
-                       IOUtils.closeQuietly(in);
+                       if (in != null)
+                               in.close();
                }
 
                // System properties have priority.
                config.putAll(System.getProperties());
+               return config;
+       }
 
-               // Perform variable substitution for system properties.
-               for (Enumeration e = config.propertyNames(); e.hasMoreElements();) {
-                       String name = (String) e.nextElement();
-                       config.setProperty(name, org.apache.felix.main.Main.substVars(
-                                       config.getProperty(name), name, null, config));
-                       if (log.isTraceEnabled())
-                               log.trace(name + "=" + config.getProperty(name));
+       public static void startEquinox(Properties config) throws Exception {
+               System.out.println("java.class.path="
+                               + System.getProperty("java.class.path"));
+
+               File baseDir = new File(System.getProperty("user.dir"))
+                               .getCanonicalFile();
+               String equinoxConfigurationPath = baseDir.getPath() + File.separator
+                               + "slc-detached" + File.separator + "equinoxConfiguration";
+               String[] equinoxArgs = { "-console", "-noExit", "-clean",
+                               "-configuration", equinoxConfigurationPath };
+
+               BundleContext context = EclipseStarter.startup(equinoxArgs, null);
+
+               // Load from class path (dev environment, maven)
+               StringTokenizer st = new StringTokenizer(System
+                               .getProperty("java.class.path"), File.pathSeparator);
+               while (st.hasMoreTokens()) {
+                       try {
+                               String path = st.nextToken();
+                               String url = "reference:file:"
+                                               + new File(path).getCanonicalPath();
+                               context.installBundle(url);
+                               info("Installed from classpath " + url);
+                       } catch (Exception e) {
+                               bundleInstallWarn(e.getMessage());
+                       }
                }
 
-               return config;
-       }
+               // Load from dev bundles
+               Map devBundleUrls = getDevBundleUrls(config);
+               Iterator devBundles = devBundleUrls.keySet().iterator();
+               while (devBundles.hasNext()) {
+                       try {
+                               String bundleName = (String) devBundles.next();
+                               String url = (String) devBundleUrls.get(bundleName);
+                               context.installBundle(url);
+                               info("Installed as dev bundle " + url);
+                       } catch (Exception e) {
+                               bundleInstallWarn(e.getMessage());
+                       }
+               }
+
+               // Load from distribution
+               String slcHome = config.getProperty("slc.home");
+               if (slcHome != null) {
+                       File libDir = new File(slcHome + File.separator + "lib");
+                       File[] bundleFiles = libDir.listFiles();
+                       for (int i = 0; i < bundleFiles.length; i++) {
+                               try {
+                                       String url = "reference:file:"
+                                                       + bundleFiles[i].getCanonicalPath();
+                                       context.installBundle(url);
+                                       info("INFO: Installed from SLC home " + url);
+                               } catch (Exception e) {
+                                       bundleInstallWarn(e.getMessage());
+                               }
 
-       protected static File createTemporaryCacheDir() throws IOException {
-               // Create a temporary bundle cache directory and
-               // make sure to clean it up on exit.
-               final File cachedir = File.createTempFile("argeo.slc.autoui", null);
-               cachedir.delete();
-               Runtime.getRuntime().addShutdownHook(new Thread() {
-                       public void run() {
-                               deleteFileOrDir(cachedir);
                        }
-               });
-               return cachedir;
+               }
+
+               // Start bundles
+               String bundleStart = config.getProperty("slc.osgi.start",
+                               "org.springframework.osgi.extender,org.argeo.slc.detached");
+               StringTokenizer stBundleStart = new StringTokenizer(bundleStart, ",");
+               while (stBundleStart.hasMoreTokens()) {
+                       String bundleSymbolicName = stBundleStart.nextToken();
+                       startBundle(context, bundleSymbolicName);
+               }
        }
 
-       public static Felix startSystem(Properties config) throws Exception {
-               // Create list to hold custom framework activators.
-               List list = new ArrayList();
-               // Add activator to process auto-start/install properties.
-               list.add(new AutoActivator(config));
-               // Add our own activator.
-               // list.add(new AutoUiActivator());
+       private static Map getDevBundleUrls(Properties config) {
+               Map bundles = new Hashtable();
+               Iterator keys = config.keySet().iterator();
+               while (keys.hasNext()) {
+                       String key = (String) keys.next();
+                       if (key.startsWith(DEV_BUNDLE_PREFIX)) {
+                               String bundle = key.substring(DEV_BUNDLE_PREFIX.length());
+                               String path = config.getProperty(key);
+                               bundles.put(bundle, path);
+                       }
+               }
+               return bundles;
+       }
 
-               // Now create an instance of the framework.
-               Felix felix = new Felix(config, list);
-               felix.start();
+       private static void startBundle(BundleContext bundleContext,
+                       String symbolicName) throws BundleException {
+               Bundle bundle = findBundleBySymbolicName(bundleContext, symbolicName);
+               if (bundle != null)
+                       bundle.start();
+               else
+                       throw new RuntimeException("Bundle " + symbolicName + " not found");
+               info("Started " + symbolicName);
+       }
 
-               return felix;
+       /** WARNING: return the first one found! */
+       private static Bundle findBundleBySymbolicName(BundleContext bundleContext,
+                       String symbolicName) {
+               Bundle[] bundles = bundleContext.getBundles();
+               for (int i = 0; i < bundles.length; i++) {
+                       Bundle bundle = bundles[i];
+                       if (bundle.getSymbolicName().equals(symbolicName)) {
+                               return bundle;
+                       }
+               }
+               return null;
        }
 
        public static void startApp(Properties config) throws Exception {
@@ -139,28 +188,9 @@ public class Main {
                Class[] mainArgsClasses = new Class[] { uiArgs.getClass() };
                Object[] mainArgs = { uiArgs };
                Method mainMethod = clss.getMethod("main", mainArgsClasses);
-               String[] passedArgs = (String[])mainArgs[0];
-               System.out.println("PASSED ARGS:");
-               for(int i=0;i<passedArgs.length;i++){
-                       System.out.println(passedArgs[i]);
-               }
                mainMethod.invoke(null, mainArgs);
        }
 
-       // protected static void automateUi(BundleContext bundleContext)
-       // throws Exception {
-       // // Retrieve service and execute it
-       // ServiceReference ref = bundleContext
-       // .getServiceReference(DetachedExecutionServer.class.getName());
-       // Object service = bundleContext.getService(ref);
-       //
-       // log.debug("service.class=" + service.getClass());
-       // DetachedExecutionServer app = (DetachedExecutionServer) service;
-       // DetachedStepRequest request = new DetachedStepRequest();
-       // request.setStepRef("jemmyTest");
-       // app.executeStep(request);
-       // }
-
        /* UTILITIES */
 
        /**
@@ -209,14 +239,11 @@ public class Main {
                return res;
        }
 
-       private static void deleteFileOrDir(File file) {
-               if (file.isDirectory()) {
-                       File[] childs = file.listFiles();
-                       for (int i = 0; i < childs.length; i++) {
-                               deleteFileOrDir(childs[i]);
-                       }
-               }
-               file.delete();
+       private static void info(Object obj) {
+               System.out.println("[INFO] " + obj);
        }
 
+       private static void bundleInstallWarn(Object obj) {
+               System.err.println("[WARN] " + obj);
+       }
 }
index 3f6f2008c3c461929291996372c09344a932b67b..c684f3fe0f33c3c4a9515cf8ac4837e3eeb1414a 100644 (file)
@@ -1,7 +1,6 @@
 Manifest-Version: 1.0\r
-Export-Package: org.argeo.slc.detached.launcher;uses:="org.apache.comm\r
- ons.logging,org.apache.felix.framework,org.apache.commons.io,org.apac\r
- he.felix.main";version="0.11.2.SNAPSHOT"\r
+Export-Package: org.argeo.slc.detached.launcher;uses:="org.osgi.framew\r
+ ork,org.eclipse.core.runtime.adaptor";version="0.11.2.SNAPSHOT"\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: Argeo SLC Detached Launcher\r
 Created-By: 1.6.0 (Sun Microsystems Inc.)\r
@@ -10,9 +9,8 @@ Bundle-Version: 0.11.2.SNAPSHOT
 Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Distribution\r
-Import-Package: org.apache.commons.io;version="1.4",org.apache.commons\r
- .logging;version="1.1",org.apache.felix.framework,org.apache.felix.ma\r
- in,org.argeo.slc.detached.launcher;version="0.11.2.SNAPSHOT"\r
+Import-Package: org.argeo.slc.detached.launcher;version="0.11.2.SNAPSH\r
+ OT",org.eclipse.core.runtime.adaptor,org.osgi.framework;version="1.4"\r
 Bundle-SymbolicName: org.argeo.slc.detached.launcher\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
index 48539ac94c5a2fb37263a698d2783d4bd609f85d..9572fad6ca1240684f4c9221f837ecccba029415 100644 (file)
@@ -4,6 +4,7 @@ log4j.rootLogger=WARN, console
 ## Levels\r
 # Slc\r
 log4j.logger.org.argeo.slc=DEBUG\r
+log4j.logger.org.springframework=WARN\r
 \r
 ## Appenders\r
 # A1 is set to be a ConsoleAppender.\r
diff --git a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
deleted file mode 100644 (file)
index 966f4a7..0000000
+++ /dev/null
@@ -1,488 +0,0 @@
-# Argeo Specific Context Properties
-argeo.slc.mavenBase=file:${user.home}/.m2/repository
-
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.3.3, \
- org.w3c.dom, \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.stream \
- ${jre-${java.specification.version}} 
-
-#org.osgi.framework.bootdelegation=sun.*,com.sun.*
-#felix.cache.profile=foo
-
-felix.auto.start.1= \
- file:${slc.detached.jar} \
- file:${slc.home}/lib/detached/org.apache.felix.shell-1.0.2.jar \
- file:${slc.home}/lib/detached/org.apache.felix.shell.tui-1.0.2.jar \
- file:${slc.home}/lib/detached/com.springsource.org.apache.commons.logging-1.1.1.jar \
- file:${slc.home}/lib/detached/com.springsource.org.apache.log4j-1.2.15.jar \
- file:${slc.home}/lib/detached/org.springframework.aop-2.5.6.A.jar \
- file:${slc.home}/lib/detached/org.springframework.beans-2.5.6.A.jar \
- file:${slc.home}/lib/detached/org.springframework.context-2.5.6.A.jar \
- file:${slc.home}/lib/detached/org.springframework.core-2.5.6.A.jar \
- file:${slc.home}/lib/detached/com.springsource.org.apache.commons.io-1.4.0.jar \
- file:${slc.home}/lib/org.argeo.dep.jemmy.nb61-0.2.2.jar \
- ${slc.detached.userBundles}
-# file:${slc.home}/lib/detached/org.argeo.slc.detached.ext.log4j-0.11.2.jar \
-
-#felix.auto.start.1= \
-# reference:file:${user.dir}/../sandbox/argeo.slc.jemmytest/bin/ \
-# reference:file:${user.dir}/../org.argeo.slc.detached/bin/ \
-# ${argeo.slc.mavenBase}/org/apache/felix/org.apache.felix.shell/1.0.2/org.apache.felix.shell-1.0.2.jar \
-# ${argeo.slc.mavenBase}/org/apache/felix/org.apache.felix.shell.tui/1.0.2/org.apache.felix.shell.tui-1.0.2.jar \
-# ${argeo.slc.mavenBase}/org/argeo/dep/jemmy/org.argeo.dep.jemmy.nb61/0.2.2/org.argeo.dep.jemmy.nb61-0.2.2.jar
-# ${argeo.slc.mavenBase}org/argeo/slc/sandbox/org.argeo.slc.sandbox.jemmytest/0.1.2-SNAPSHOT/org.argeo.slc.sandbox.jemmytest-0.1.2-SNAPSHOT.jar"
-
-
-felix.log.level=1
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-#felix.service.urlhandlers=false
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-osgi.shell.telnet=on
-obr.repository.url=http://felix.apache.org/obr/releases.xml
-
-
-#
-# Java platform package export properties.
-#
-jre-1.3=, \
- javax.accessibility; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- version="1.3.0"
-
-jre-1.4=, \
- javax.accessibility; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.w3c.dom; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.4.0"
-
-jre-1.5=, \
- javax.accessibility; \
- javax.activity; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.5.0"
-
-jre-1.6=, \
- javax.accessibility; \
- javax.activation; \
- javax.activity; \
- javax.annotation; \
- javax.annotation.processing; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.jws; \
- javax.jws.soap; \
- javax.lang.model; \
- javax.lang.model.element; \
- javax.lang.model.type; \
- javax.lang.model.util; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.script; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.cert; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.tools; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.bind; \
- javax.xml.bind.annotation; \
- javax.xml.bind.annotation.adapters; \
- javax.xml.bind.attachment; \
- javax.xml.bind.helpers; \
- javax.xml.bind.util; \
- javax.xml.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version=\"1.6.0\"
index c8b783048125d841548c4a32285cc1e0c8aab6ba..b606f1820e907cbf70956b7b84a8f05e10ba7e9b 100644 (file)
@@ -3,6 +3,6 @@
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>
index 9f198318ca86cb7090d9d556cd9f4972e4fdd007..134aca25fef6fd3a1d15235d4ac69cdf2dfd62ad 100644 (file)
@@ -1,9 +1,9 @@
-#Mon Oct 13 12:37:24 CEST 2008
+#Mon Nov 17 12:10:39 CET 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
index ed3f0ba63174dfa5c399258f5714d4cbcc2984e0..1ecdbe0af3d7d828dc3d6416575633ef1d10fded 100644 (file)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -10,7 +9,7 @@
        </parent>
        <artifactId>org.argeo.slc.detached</artifactId>
        <name>Argeo SLC Detached</name>
-       <packaging>bundle</packaging>
+       <packaging>jar</packaging>
        <build>
                <plugins>
                        <plugin>
@@ -21,9 +20,6 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                                <configuration>
                                        <instructions>
-                                               <Bundle-Activator>
-                                                       org.argeo.slc.detached.Activator
-                                               </Bundle-Activator>
                                                <Export-Package>
                                                        org.argeo.slc.detached.*
                                                </Export-Package>
                <dependency>
                        <groupId>org.eclipse.osgi</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
-                       <version>3.4.2.R34x_v20080826-1230</version>
                </dependency>
+
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.context</artifactId>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
 
+               <!-- Required under JDK 1.4 -->
                <dependency>
-                       <groupId>org.apache.xerces</groupId>
-                       <artifactId>com.springsource.org.apache.xerces</artifactId>
+                       <groupId>edu.emory.mathcs.backport</groupId>
+                       <artifactId>com.springsource.edu.emory.mathcs.backport</artifactId>
                </dependency>
 
 
+               <!--
+                       <dependency> <groupId>org.apache.xerces</groupId>
+                       <artifactId>com.springsource.org.apache.xerces</artifactId>
+                       </dependency>
+               -->
+
+               <dependency>
+                       <groupId>org.apache.xmlcommons</groupId>
+                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <!-- 
                <dependency>
                        <groupId>xml-apis</groupId>
                        <artifactId>xml-apis</artifactId>
                        <version>1.3.04</version>
                        <scope>provided</scope>
                </dependency>
-
+                -->
+                
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>
diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/AbstractDetachedActivator.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/AbstractDetachedActivator.java
deleted file mode 100644 (file)
index 0db6f93..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.argeo.slc.detached;
-
-import java.net.URL;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.io.UrlResource;
-
-public class AbstractDetachedActivator implements BundleActivator {
-       private final Log log = LogFactory.getLog(getClass());
-
-       private SpringStaticRefProvider staticRefProvider;
-
-       public final void start(BundleContext context) throws Exception {
-
-               Bundle bundle = context.getBundle();
-
-               // Creates application context with this class class loader
-               ClassLoader classLoader = getClass().getClassLoader();
-               Thread cur = Thread.currentThread();
-               ClassLoader save = cur.getContextClassLoader();
-               cur.setContextClassLoader(classLoader);
-
-               try {
-                       AbstractApplicationContext applicationContext = new GenericApplicationContext();
-                       XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(
-                                       (BeanDefinitionRegistry) applicationContext);
-
-                       URL url = bundle.getResource("META-INF/spring/slc-detached.xml");
-                       if (url != null) {
-                               System.out.println("Loads application context from bundle "
-                                               + bundle.getSymbolicName() + " (url=" + url + ")");
-                               xmlReader.loadBeanDefinitions(new UrlResource(url));
-
-                               // Register static ref provider
-                               staticRefProvider = new SpringStaticRefProvider(
-                                               applicationContext);
-                               Properties properties = new Properties();
-                               properties.setProperty("slc.detached.bundle", bundle
-                                               .getSymbolicName());
-                               context.registerService(StaticRefProvider.class.getName(),
-                                               staticRefProvider, properties);
-
-                       }
-
-               } catch (Exception e) {
-                       e.printStackTrace();
-                       throw new Exception("Could not initialize application context");
-               } finally {
-                       cur.setContextClassLoader(save);
-               }
-
-               startAutoBundle(context);
-
-               log.info("SLC Detached bundle " + bundle.getSymbolicName() + " ("
-                               + bundle.getBundleId() + ") started");
-       }
-
-       /** Does nothing by default. */
-       protected void startAutoBundle(BundleContext context) throws Exception {
-
-       }
-
-       public final void stop(BundleContext context) throws Exception {
-               stopAutoBundle(context);
-
-               if (staticRefProvider != null) {
-                       staticRefProvider.close();
-               }
-
-       }
-
-       /** Does nothing by default. */
-       protected void stopAutoBundle(BundleContext context) throws Exception {
-
-       }
-
-       protected StaticRefProvider getStaticRefProvider() {
-               return staticRefProvider;
-       }
-}
diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/Activator.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/Activator.java
deleted file mode 100644 (file)
index b9ef442..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.argeo.slc.detached;
-
-import java.util.Properties;
-
-import org.osgi.framework.BundleContext;
-
-public class Activator extends AbstractDetachedActivator {
-       private DetachedExecutionServerImpl executionServer;
-
-       protected void startAutoBundle(BundleContext context) throws Exception {
-               Object obj = getStaticRefProvider().getStaticRef("executionServer");
-               if (obj != null)
-                       executionServer = (DetachedExecutionServerImpl) obj;
-               else
-                       throw new DetachedException("Could not find execution server.");
-
-               executionServer.init(context);
-
-               context.registerService(DetachedExecutionServer.class.getName(),
-                               executionServer, new Properties());
-       }
-
-       protected void stopAutoBundle(BundleContext context) throws Exception {
-               // TODO Auto-generated method stub
-               super.stopAutoBundle(context);
-       }
-
-}
index 4d9abc59827a52e774873c5b68b0511d536d4663..35b9d63d537ffb6d5ce15e792b04907a9588fa78 100644 (file)
@@ -9,8 +9,11 @@ import org.argeo.slc.detached.admin.CloseSession;
 import org.argeo.slc.detached.admin.OpenSession;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
+import org.springframework.context.ApplicationContext;
+import org.springframework.osgi.context.BundleContextAware;
 
-public class DetachedExecutionServerImpl implements DetachedExecutionServer {
+public class DetachedExecutionServerImpl implements DetachedExecutionServer,
+               BundleContextAware {
        private final static Log log = LogFactory
                        .getLog(DetachedExecutionServerImpl.class);
 
@@ -18,7 +21,7 @@ public class DetachedExecutionServerImpl implements DetachedExecutionServer {
        private final List sessions;
 
        private int skipCount = 1;// start skipCount at 1 since the first step is
-                                                               // always an open session
+       // always an open session
 
        private BundleContext bundleContext;
 
@@ -32,12 +35,18 @@ public class DetachedExecutionServerImpl implements DetachedExecutionServer {
                try {
                        // Find action
                        ServiceReference[] refs = bundleContext.getAllServiceReferences(
-                                       StaticRefProvider.class.getName(), null);
+                                       ApplicationContext.class.getName(), null);
                        Object obj = null;
                        for (int i = 0; i < refs.length; i++) {
-                               StaticRefProvider provider = (StaticRefProvider) bundleContext
+                               ApplicationContext appContext = (ApplicationContext) bundleContext
                                                .getService(refs[i]);
-                               obj = provider.getStaticRef(request.getRef());
+                               try {
+                                       obj = appContext.getBean(request.getRef());
+                               } catch (Exception e) {
+                                       // silent
+                                       if (log.isTraceEnabled())
+                                               log.trace("Could not find ref " + request.getRef(), e);
+                               }
                                if (obj != null) {
                                        break;
                                }
@@ -114,7 +123,8 @@ public class DetachedExecutionServerImpl implements DetachedExecutionServer {
                                                                .info("Path "
                                                                                + request.getPath()
                                                                                + " was previously in error, executing it again."
-                                                                               + " (skipCount=" + skipCount + "). Reset skip count to 1");
+                                                                               + " (skipCount=" + skipCount
+                                                                               + "). Reset skip count to 1");
                                                skipCount = 1;
                                        }
                                } else {
@@ -182,7 +192,7 @@ public class DetachedExecutionServerImpl implements DetachedExecutionServer {
                        return (DetachedSession) sessions.get(sessions.size() - 2);
        }
 
-       public void init(BundleContext bundleContext) {
+       public void setBundleContext(BundleContext bundleContext) {
                this.bundleContext = bundleContext;
        }
 
diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SimpleDetachedActivator.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SimpleDetachedActivator.java
deleted file mode 100644 (file)
index 8df5bbc..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.argeo.slc.detached;
-
-import java.util.Properties;
-
-import org.argeo.slc.detached.drivers.AbstractDriver;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-public class SimpleDetachedActivator extends AbstractDetachedActivator {
-       private AbstractDriver driver;
-
-       protected void startAutoBundle(BundleContext context) throws Exception {
-               Object obj = getStaticRefProvider().getStaticRef("slcDetached.driver");
-               if (obj != null)
-                       driver = (AbstractDriver) obj;
-               else
-                       throw new DetachedException("Could not find driver.");
-
-               DetachedExecutionServer executionServer = null;
-               ServiceReference ref = context
-                               .getServiceReference(DetachedExecutionServer.class.getName());
-               if (ref != null)
-                       executionServer = (DetachedExecutionServer) context.getService(ref);
-               else
-                       throw new DetachedException("Could not find execution server.");
-               driver.setExecutionServer(executionServer);
-               driver.start();
-
-               context.registerService(DetachedDriver.class.getName(), driver,
-                               new Properties());
-       }
-
-       protected void stopAutoBundle(BundleContext context) throws Exception {
-               if (driver != null)
-                       driver.stop();
-       }
-
-}
diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SpringStaticRefProvider.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SpringStaticRefProvider.java
deleted file mode 100644 (file)
index b58601e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.argeo.slc.detached;
-
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.context.ConfigurableApplicationContext;
-
-public class SpringStaticRefProvider implements StaticRefProvider {
-       private final ConfigurableApplicationContext applicationContext;
-
-       public SpringStaticRefProvider(
-                       ConfigurableApplicationContext applicationContext) {
-               this.applicationContext = applicationContext;
-       }
-
-       public Object getStaticRef(String id) {
-               try {
-                       return applicationContext.getBean(id);
-               } catch (NoSuchBeanDefinitionException e) {
-                       // silent
-                       return null;
-               }
-       }
-
-       public void close(){
-               applicationContext.close();
-       }
-}
diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/StaticRefProvider.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/StaticRefProvider.java
deleted file mode 100644 (file)
index 5e6d92d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.argeo.slc.detached;
-
-public interface StaticRefProvider {
-       /** Returns null if no such ref. */
-       public Object getStaticRef(String id);
-}
index 846e0cc033a868604e9a6200c32a1922789a2af9..6d8e5ac8f8368ba33133fb78873cdd9c3937c521 100644 (file)
@@ -35,7 +35,7 @@ public abstract class AbstractDriver implements DetachedDriver {
                                }
 
                        }
-               }, "driverThread");
+               }, "driverThread ("+getClass()+")");
                driverThread.start();
 
        }
index 478154cc2cf20dcfbb1f473b05f1a5faea156e10..ce88f5b12f4184e29b49524b7c3fde05259bc92d 100644 (file)
@@ -219,6 +219,10 @@ public class FileDriver extends AbstractDriver implements DetachedClient,
                createIfNotExist(processedAnswersDir);
                createIfNotExist(cleanedRequestsDir);
                createIfNotExist(cleanedAnswersDir);
+               log.info("Detached File Driver initialized on " + baseDir);
+       }
+
+       public void cleanPreviousRuns() throws Exception {
 
                // Clean requests and answers from previous builds
                File[] remainingRequests = requestsDir.listFiles();
@@ -232,8 +236,8 @@ public class FileDriver extends AbstractDriver implements DetachedClient,
                        FileUtils.moveFileToDirectory(remainingAnswers[i],
                                        cleanedAnswersDir, false);
                }
+               log.info("Clean previous runs of File Driver on " + baseDir);
 
-               log.info("Detached File Driver initialized on " + baseDir);
        }
 
 }
index bcc026dc12218e6f626e777a5b76815a9ecd9ec0..b379bcba6b72c7b013948f1d2363628549af0943 100644 (file)
@@ -1,45 +1,37 @@
 Manifest-Version: 1.0\r
 Export-Package: org.argeo.slc.detached.admin;uses:="org.apache.commons\r
- .logging,org.osgi.framework,org.argeo.slc.detached",org.argeo.slc.det\r
- ached.ui;uses:="org.argeo.slc.detached,org.springframework.beans.fact\r
- ory",org.argeo.slc.detached;uses:="org.apache.commons.logging,org.spr\r
- ingframework.context.support,org.springframework.core.io,org.springfr\r
- amework.context,org.springframework.beans.factory.xml,javax.xml.trans\r
- form.dom,org.argeo.slc.detached.drivers,org.w3c.dom,org.springframewo\r
- rk.beans.factory.support,org.argeo.slc.detached.admin,javax.xml.trans\r
- form,javax.xml.transform.stream,org.osgi.framework,org.apache.commons\r
- .io,org.springframework.beans.factory",org.argeo.slc.detached.drivers\r
- ;uses:="org.apache.commons.logging,org.apache.commons.io.filefilter,j\r
- avax.xml.transform,javax.xml.transform.stream,org.apache.commons.io,o\r
- rg.argeo.slc.detached,org.springframework.beans.factory"\r
-Built-By: mbaudier\r
+ .logging,org.osgi.framework,org.argeo.slc.detached";version="0.11.2.S\r
+ NAPSHOT",org.argeo.slc.detached.ui;uses:="org.argeo.slc.detached,org.\r
+ springframework.beans.factory";version="0.11.2.SNAPSHOT",org.argeo.sl\r
+ c.detached;uses:="org.springframework.osgi.context,org.apache.commons\r
+ .logging,org.springframework.context,javax.xml.transform.dom,org.w3c.\r
+ dom,org.argeo.slc.detached.admin,javax.xml.transform,javax.xml.transf\r
+ orm.stream,org.osgi.framework,org.apache.commons.io";version="0.11.2.\r
+ SNAPSHOT",org.argeo.slc.detached.drivers;uses:="org.apache.commons.lo\r
+ gging,org.apache.commons.io.filefilter,javax.xml.transform,javax.xml.\r
+ transform.stream,org.apache.commons.io,org.argeo.slc.detached,org.spr\r
+ ingframework.beans.factory";version="0.11.2.SNAPSHOT"\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: Argeo SLC Detached\r
-Created-By: Apache Maven Bundle Plugin\r
+Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 Bundle-Vendor: Argeo\r
-Build-Jdk: 1.6.0\r
 Bundle-Version: 0.11.2.SNAPSHOT\r
 Bundle-ManifestVersion: 2\r
-Bundle-Activator: org.argeo.slc.detached.Activator\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Distribution\r
 Import-Package: javax.xml.transform,javax.xml.transform.dom,javax.xml.\r
  transform.stream,org.apache.commons.io;version="1.4",org.apache.commo\r
  ns.io.filefilter;version="1.4",org.apache.commons.logging;version="1.\r
- 1",org.argeo.slc.detached,org.argeo.slc.detached.admin,org.argeo.slc.\r
- detached.drivers,org.argeo.slc.detached.ui,org.osgi.framework;version\r
- ="1.4",org.springframework.beans.factory;version="2.0",org.springfram\r
- ework.beans.factory.support;version="2.0",org.springframework.beans.f\r
- actory.xml;version="2.0",org.springframework.context;version="2.0",or\r
- g.springframework.context.support;version="2.0",org.springframework.c\r
- ore.io;version="2.0",org.w3c.dom\r
+ 1",org.argeo.slc.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.det\r
+ ached.admin;version="0.11.2.SNAPSHOT",org.argeo.slc.detached.drivers;\r
+ version="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.S\r
+ NAPSHOT",org.osgi.framework;version="1.4",org.springframework.beans.f\r
+ actory;version="2.0",org.springframework.beans.factory.support;versio\r
+ n="2.0",org.springframework.beans.factory.xml;version="2.0",org.sprin\r
+ gframework.context;version="2.0",org.springframework.context.support;\r
+ version="2.0",org.springframework.core.io;version="2.0",org.springfra\r
+ mework.osgi.context;version="1.1.2.B",org.w3c.dom\r
 Bundle-SymbolicName: org.argeo.slc.detached\r
 Bundle-DocURL: http://www.argeo.org\r
-Include-Resource: org/argeo/slc/detached/spring.xml=src/main/resources\r
- /org/argeo/slc/detached/spring.xml,org/argeo/slc/detached/slc-detache\r
- d.xsd=src/main/resources/org/argeo/slc/detached/slc-detached.xsd,META\r
- -INF/MANIFEST.MF=src/main/resources/META-INF/MANIFEST.MF,META-INF/spr\r
- ing/slc-detached.xml=src/main/resources/META-INF/spring/slc-detached.\r
- xml\r
-Originally-Created-By: Apache Maven Bundle Plugin\r
+Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 \r
diff --git a/org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached-osgi.xml b/org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached-osgi.xml
new file mode 100644 (file)
index 0000000..009726d
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+<!-- 
+       <service id="slcDetached.service.driver.fileXmlCompat" ref="slcDetached.driver.fileXmlCompat"
+               interface="org.argeo.slc.detached.DetachedDriver" />
+ -->
+       <service id="executionServer.service" ref="executionServer"
+               interface="org.argeo.slc.detached.DetachedExecutionServer" />
+</beans:beans>
\ No newline at end of file
index 1fab5f382ecac2bcd6bceb4292f0984d459f886f..13f485c88d18cabefc32cefda0a0585f3d596f45 100644 (file)
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-    <import resource="classpath:/org/argeo/slc/detached/spring.xml" />
+       <import resource="classpath:/org/argeo/slc/detached/spring.xml" />
 
-    <bean id="executionServer"
-        class="org.argeo.slc.detached.DetachedExecutionServerImpl">
-    </bean>
+       <bean id="executionServer" class="org.argeo.slc.detached.DetachedExecutionServerImpl">
+       </bean>
 
-</beans>
\ No newline at end of file
+       <!--
+               <bean id="slcDetached.driver.fileXmlCompat"
+               parent="slcTemplate.detached.fileDriver"> <property name="baseDir"
+               value="${slc.workDir}/detached" /> <property name="xmlConverter"
+               ref="slcDefault.detached.xmlConverterCompat" /> </bean>
+       -->
+</beans>
index 72024088174726655aea5e15a41e7a4294969822..9aa9aec30f2fb657e00ab5b0d517a34d16ada52a 100644 (file)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+       default-lazy-init="true">
 
-    <bean id="slcDefault.detached.admin.openSession"
-        class="org.argeo.slc.detached.admin.OpenSession">
-    </bean>
+       <bean id="slcDefault.detached.admin.openSession" class="org.argeo.slc.detached.admin.OpenSession">
+       </bean>
 
-    <bean id="slcDefault.detached.admin.closeSession"
-        class="org.argeo.slc.detached.admin.CloseSession">
-    </bean>
+       <bean id="slcDefault.detached.admin.closeSession" class="org.argeo.slc.detached.admin.CloseSession">
+       </bean>
+
+       <bean id="slcDefault.detached.xmlConverterCompat" class="org.argeo.slc.detached.DetachedXmlConverterCompat">
+       </bean>
+
+       <bean id="slcTemplate.detached.fileDriver" class="org.argeo.slc.detached.drivers.FileDriver"
+               abstract="true">
+       </bean>
 
-    <bean id="slcDefault.detached.xmlConverterCompat"
-        class="org.argeo.slc.detached.DetachedXmlConverterCompat">
-    </bean>
 </beans>
\ No newline at end of file
index 2eb5a87d971b5563d250933e102084d3ba883766..90589db9516ea0dcb1de0417ef400e8f53c07364 100644 (file)
@@ -1,20 +1,12 @@
 package org.argeo.slc.example;
 
-import java.net.URL;
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.cli.DefaultSlcRuntime;
-import org.argeo.slc.detached.SpringStaticRefProvider;
-import org.argeo.slc.detached.StaticRefProvider;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.io.UrlResource;
 
 public class Activator implements BundleActivator {
        //private final static String BOOTSTRAP_LOG4J_CONFIG = "org/argeo/slc/example/log4j.properties";
index cea55c92a8c4779df28292b1cb4bb295edece5f0..929d52fd63227044093629c132181bc86663ad57 100644 (file)
@@ -44,36 +44,37 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Server\r
 Import-Package: com.lowagie.text;version="2.0",com.lowagie.text.pdf;ve\r
- rsion="2.0",javax.servlet.http,javax.xml.namespace,javax.xml.parsers,\r
- javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.strea\r
- m,jxl.write;version="2.6",org.apache.commons.logging;version="1.1",or\r
- g.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process\r
- ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11\r
- .2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSH\r
- OT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.c\r
- ore.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;ver\r
- sion="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHO\r
- T",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.sl\r
- c.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;v\r
- ersion="0.11.2.SNAPSHOT",org.argeo.slc.server.spring;version="0.11.2.\r
- SNAPSHOT",org.argeo.slc.services.test;version="0.11.2.SNAPSHOT",org.a\r
- rgeo.slc.services.test.impl;version="0.11.2.SNAPSHOT",org.argeo.slc.w\r
- eb.mvc;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.admin;version=\r
- "0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;version="0.11.2.SNAPS\r
- HOT",org.argeo.slc.web.mvc.result;version="0.11.2.SNAPSHOT",org.argeo\r
- .slc.ws;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version="0\r
- .11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT",\r
- org.springframework.context;version="2.5.6.A",org.springframework.cor\r
- e.io;version="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org.\r
- springframework.web.servlet;version="2.5.6.A",org.springframework.web\r
- .servlet.handler;version="2.5.6.A",org.springframework.web.servlet.mv\r
- c;version="2.5.6.A",org.springframework.web.servlet.view;version="2.5\r
- .6.A",org.springframework.web.servlet.view.document;version="2.5.6.A"\r
- ,org.springframework.web.servlet.view.xslt;version="2.5.6.A",org.spri\r
- ngframework.ws.context;version="1.5.5.A",org.springframework.ws.serve\r
- r.endpoint;version="1.5.5.A",org.springframework.ws.soap;version="1.5\r
- .5.A",org.springframework.ws.soap.server.endpoint;version="1.5.5.A",o\r
- rg.w3c.dom\r
+ rsion="2.0",javax.servlet.http,javax.xml.namespace;version="1.3",java\r
+ x.xml.parsers;version="1.3",javax.xml.transform;version="1.3",javax.x\r
+ ml.transform.dom;version="1.3",javax.xml.transform.stream;version="1.\r
+ 3",jxl.write;version="2.6",org.apache.commons.logging;version="1.1",o\r
+ rg.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proces\r
+ s;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.1\r
+ 1.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPS\r
+ HOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.\r
+ core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSH\r
+ OT",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.s\r
+ lc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;\r
+ version="0.11.2.SNAPSHOT",org.argeo.slc.server.spring;version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.services.test;version="0.11.2.SNAPSHOT",org.\r
+ argeo.slc.services.test.impl;version="0.11.2.SNAPSHOT",org.argeo.slc.\r
+ web.mvc;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.admin;version\r
+ ="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;version="0.11.2.SNAP\r
+ SHOT",org.argeo.slc.web.mvc.result;version="0.11.2.SNAPSHOT",org.arge\r
+ o.slc.ws;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version="\r
+ 0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT"\r
+ ,org.springframework.context;version="2.5.6.A",org.springframework.co\r
+ re.io;version="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org\r
+ .springframework.web.servlet;version="2.5.6.A",org.springframework.we\r
+ b.servlet.handler;version="2.5.6.A",org.springframework.web.servlet.m\r
+ vc;version="2.5.6.A",org.springframework.web.servlet.view;version="2.\r
+ 5.6.A",org.springframework.web.servlet.view.document;version="2.5.6.A\r
+ ",org.springframework.web.servlet.view.xslt;version="2.5.6.A",org.spr\r
+ ingframework.ws.context;version="1.5.5.A",org.springframework.ws.serv\r
+ er.endpoint;version="1.5.5.A",org.springframework.ws.soap;version="1.\r
+ 5.5.A",org.springframework.ws.soap.server.endpoint;version="1.5.5.A",\r
+ org.w3c.dom;version="1.3"\r
 Bundle-SymbolicName: org.argeo.slc.server\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
index a669559e6328b5723d81c012772a00270776b7b1..334483877857709472c2748107a352397dd4608a 100644 (file)
                                <version>${version.spring-ws}</version>
                        </dependency>
 
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.extender</artifactId>
+                               <version>1.1.2.B</version>
+                       </dependency>
+
                        <!-- Ant -->
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.ant</artifactId>
                                <version>1.7.1</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.apache.ant</groupId> <artifactId>
-                               com.springsource.org.apache.tools.ant </artifactId>
-                               <version>1.7.0</version> </dependency> <dependency>
-                               <groupId>org.apache.ant</groupId>
-                               <artifactId>ant-commons-logging</artifactId>
-                               <version>${version.ant}</version> <exclusions> <exclusion>
-                               <groupId>commons-logging</groupId>
-                               <artifactId>commons-logging</artifactId> </exclusion> <exclusion>
-                               <groupId>commons-logging</groupId>
-                               <artifactId>commons-logging-api</artifactId> </exclusion>
-                               <exclusion> <groupId>org.apache.ant</groupId>
-                               <artifactId>ant</artifactId> </exclusion> </exclusions>
-                               </dependency> <dependency> <groupId>org.apache.ant</groupId>
-                               <artifactId>ant-commons-net</artifactId>
-                               <version>${version.ant}</version> <exclusions> <exclusion>
-                               <groupId>commons-net</groupId> <artifactId>commons-net</artifactId>
-                               </exclusion> <exclusion> <groupId>org.apache.ant</groupId>
-                               <artifactId>ant</artifactId> </exclusion> </exclusions>
-                               </dependency> <dependency> <groupId>org.apache.ant</groupId>
-                               <artifactId>ant-apache-oro</artifactId>
-                               <version>${version.ant}</version> <exclusions> <exclusion>
-                               <groupId>oro</groupId> <artifactId>oro</artifactId> </exclusion>
-                               <exclusion> <groupId>org.apache.ant</groupId>
-                               <artifactId>ant</artifactId> </exclusion> </exclusions>
-                               </dependency> <dependency> <groupId>org.apache.ant</groupId>
-                               <artifactId>ant-apache-bsf</artifactId>
-                               <version>${version.ant}</version> <exclusions> <exclusion>
-                               <groupId>bsf</groupId> <artifactId>bsf</artifactId> </exclusion>
-                               <exclusion> <groupId>org.apache.ant</groupId>
-                               <artifactId>ant</artifactId> </exclusion> </exclusions>
-                               </dependency>
-                       -->
 
                        <!-- Required by specific Ant tasks -->
                        <dependency>
                                        com.springsource.org.apache.xerces
                                </artifactId>
                                <version>2.8.1</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.apache.xmlcommons</groupId>
-                                               <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-                                       </exclusion>
-                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.apache.xalan</groupId>
                        </dependency>
 
                        <!-- OSGi -->
+                       <!-- 
                        <dependency>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>org.apache.felix.main</artifactId>
                                <version>1.2.0</version>
                                <scope>provided</scope>
                        </dependency>
+                        -->
+                       <dependency>
+                               <groupId>org.eclipse.osgi</groupId>
+                               <artifactId>org.eclipse.osgi</artifactId>
+                               <version>3.4.2.R34x_v20080826-1230</version>
+                       </dependency>
 
                        <!-- Auto UI -->
                        <dependency>
index 95c777d80876e5b025729a13e262a05cb17abb53..9d89d21e0dc51b17e984a9baa8cac018aa269648 100644 (file)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>
index 5422ea9c96a50f45e15ce4a08b86a68473028282..5d1ae71c0b27c6a108523bd1a45f86a6978bc5fe 100644 (file)
-<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.slc</groupId>
-        <artifactId>argeo-slc</artifactId>
-        <version>0.11.2-SNAPSHOT</version>
-        <relativePath>../org.argeo.slc</relativePath>
-    </parent>
-    <groupId>org.argeo.slc.sandbox</groupId>
-    <artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
-    <name>SLC Sandbox JemmyTest</name>
-    <packaging>bundle</packaging>
-    <properties></properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <manifestLocation>
-                        src/main/resources/META-INF
-                    </manifestLocation>
-                    <instructions>
-                        <Bundle-SymbolicName>
-                            ${pom.artifactId}
-                        </Bundle-SymbolicName>
-                        <Bundle-Activator>
-                            org.argeo.slc.jemmytest.JemmyTestActivator
-                        </Bundle-Activator>
-                        <Export-Package>
-                            org.argeo.slc.jemmytest.*
+<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.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
+               <version>0.11.2-SNAPSHOT</version>
+               <relativePath>../../org.argeo.slc</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.sandbox</groupId>
+       <artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
+       <name>SLC Sandbox JemmyTest</name>
+       <packaging>jar</packaging>
+       <properties></properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <instructions>
+                                               <Export-Package>
+                                                       org.argeo.slc.jemmytest.*
                         </Export-Package>
-                        <Import-Package>
-                            *,org.springframework.beans.factory.xml;version=2.0.8
+                                               <Import-Package>
+                                                       *,org.springframework.beans.factory.config
                         </Import-Package>
-                        <Require-Bundle>
-                            org.argeo.slc.detached
+                                               <Require-Bundle>
+                                                       org.argeo.slc.detached
                         </Require-Bundle>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                    
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.4</source>
-                    <target>1.2</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration></configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles></profiles>
-    <dependencies>
-        <dependency>
-            <groupId>org.argeo.slc</groupId>
-            <artifactId>org.argeo.slc.detached</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+                                       </instructions>
 
-        <dependency>
-            <groupId>org.argeo.slc</groupId>
-            <artifactId>org.argeo.slc.agent</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <configuration>
+                                       <source>1.4</source>
+                                       <target>1.4</target>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-source-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>attach-sources</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>jar</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration></configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <profiles></profiles>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.detached</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
 
+               <dependency>
+                       <groupId>org.argeo.dep.jemmy</groupId>
+                       <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+               </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.context</artifactId>
-        </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.detached.launcher</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
 
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.agent</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
 
-        <dependency>
-            <groupId>org.argeo.dep.jemmy</groupId>
-            <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
-        </dependency>
-    </dependencies>
+               <dependency>
+                       <groupId>org.apache.geronimo.specs</groupId>
+                       <artifactId>com.springsource.javax.management.j2ee</artifactId>
+                       <version>1.0.1</version>
+               </dependency>
+
+       </dependencies>
 </project>
\ No newline at end of file
diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
deleted file mode 100644 (file)
index 6a3ad60..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.argeo.slc.jemmytest;
-
-import org.argeo.slc.detached.SimpleDetachedActivator;
-
-public class JemmyTestActivator extends SimpleDetachedActivator {
-}
index dbdc9e237a532d4bf4f61af0989ba6bd1cec65eb..0e25c273d2e08e74369110f7682c1652c4d646f4 100644 (file)
@@ -1,31 +1,28 @@
 Manifest-Version: 1.0\r
 Export-Package: org.argeo.slc.jemmytest.uiparts;uses:="javax.swing.tex\r
  t,org.argeo.slc.detached.ui,javax.swing,org.netbeans.jemmy,org.netbea\r
- ns.jemmy.operators,org.argeo.slc.detached",org.argeo.slc.jemmytest;us\r
- es:="org.argeo.slc.detached",org.argeo.slc.jemmytest.steps;uses:="org\r
- .argeo.slc.jemmytest.uiparts,org.argeo.slc.detached.ui,org.argeo.slc.\r
- detached"\r
-Built-By: mbaudier\r
+ ns.jemmy.operators,org.argeo.slc.detached";version="0.11.2.SNAPSHOT",\r
+ org.argeo.slc.jemmytest;uses:="org.argeo.slc.detached";version="0.11.\r
+ 2.SNAPSHOT",org.argeo.slc.jemmytest.steps;uses:="org.argeo.slc.jemmyt\r
+ est.uiparts,org.argeo.slc.detached.ui,org.argeo.slc.detached";version\r
+ ="0.11.2.SNAPSHOT"\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: SLC Sandbox JemmyTest\r
-Created-By: Apache Maven Bundle Plugin\r
+Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 Require-Bundle: org.argeo.slc.detached\r
 Bundle-Vendor: Argeo\r
-Build-Jdk: 1.6.0\r
 Bundle-Version: 0.11.2.SNAPSHOT\r
-Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator\r
 Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Distribution\r
-Import-Package: javax.swing,javax.swing.text,org.argeo.slc.detached,or\r
- g.argeo.slc.detached.ui,org.argeo.slc.jemmytest,org.argeo.slc.jemmyte\r
- st.steps,org.argeo.slc.jemmytest.uiparts,org.netbeans.jemmy,org.netbe\r
- ans.jemmy.operators,org.springframework.beans.factory.xml;version="2.\r
- 0.8"\r
+Import-Package: javax.swing,javax.swing.text,org.argeo.slc.detached;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.SNA\r
+ PSHOT",org.argeo.slc.jemmytest;version="0.11.2.SNAPSHOT",org.argeo.sl\r
+ c.jemmytest.steps;version="0.11.2.SNAPSHOT",org.argeo.slc.jemmytest.u\r
+ iparts;version="0.11.2.SNAPSHOT",org.netbeans.jemmy,org.netbeans.jemm\r
+ y.operators,org.springframework.beans.factory.config;version="2.5.6.A\r
+ "\r
 Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest\r
 Bundle-DocURL: http://www.argeo.org\r
-Include-Resource: META-INF/MANIFEST.MF=src/main/resources/META-INF/MAN\r
- IFEST.MF,META-INF/spring/slc-detached.xml=src/main/resources/META-INF\r
- /spring/slc-detached.xml\r
-Originally-Created-By: Apache Maven Bundle Plugin\r
+Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 \r
diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached-osgi.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached-osgi.xml
new file mode 100644 (file)
index 0000000..cffe1c3
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+<!-- 
+       <reference id="slcDetached.driver" interface="org.argeo.slc.detached.DetachedDriver" />
+-->
+       <reference id="executionServer.serviceref" interface="org.argeo.slc.detached.DetachedExecutionServer" />
+
+</beans:beans>
\ No newline at end of file
index ffa3c3a1eaa9d42e22459f97e4dc23d68d64c126..622d959c4ed1bd848f04bfd8a42a1e0632c28e09 100644 (file)
@@ -1,51 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-    <import resource="classpath:/org/argeo/slc/detached/spring.xml" />
-
-    <!-- UI Parts -->
-    <bean id="uipart.MainFrame"
-        class="org.argeo.slc.jemmytest.uiparts.MainFrame">
-        <property name="complexPanel" ref="uipart.ComplexPanel" />
-    </bean>
-
-    <bean id="uipart.TestDialog"
-        class="org.argeo.slc.jemmytest.uiparts.TestDialog">
-    </bean>
-
-    <bean id="uipart.ComplexPanel"
-        class="org.argeo.slc.jemmytest.uiparts.ComplexPanel">
-    </bean>
-
-    <!-- Steps -->
-    <bean id="step.MainFrameLabel"
-        class="org.argeo.slc.jemmytest.steps.MainFrameLabel">
-        <property name="mainFrame" ref="uipart.MainFrame" />
-    </bean>
-
-    <bean id="step.TestDialogOpen"
-        class="org.argeo.slc.jemmytest.steps.TestDialogOpen">
-        <property name="mainFrame" ref="uipart.MainFrame" />
-        <property name="testDialog" ref="uipart.TestDialog" />
-    </bean>
-
-    <bean id="step.TestDialogLabel"
-        class="org.argeo.slc.jemmytest.steps.TestDialogLabel">
-        <property name="testDialog" ref="uipart.TestDialog" />
-    </bean>
-
-    <bean id="step.ComplexPanelValues"
-        class="org.argeo.slc.jemmytest.steps.ComplexPanelValues">
-        <property name="complexPanel" ref="uipart.ComplexPanel" />
-    </bean>
-
-    <!-- Runtime -->
-    <bean id="slcDetached.driver"
-        class="org.argeo.slc.detached.drivers.FileDriver">
-        <property name="baseDir" value="file:${slc.workDir}/detached" />
-        <property name="xmlConverter"
-            ref="slcDefault.detached.xmlConverterCompat" />
-    </bean>
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+       <import resource="classpath:/org/argeo/slc/detached/spring.xml" />
+
+       <bean id="propertyConfigurer"
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+               <property name="systemPropertiesModeName">
+                       <value>SYSTEM_PROPERTIES_MODE_OVERRIDE</value>
+               </property>
+       </bean>
+
+       <!-- UI Parts -->
+       <bean id="uipart.MainFrame" class="org.argeo.slc.jemmytest.uiparts.MainFrame">
+               <property name="complexPanel" ref="uipart.ComplexPanel" />
+       </bean>
+
+       <bean id="uipart.TestDialog" class="org.argeo.slc.jemmytest.uiparts.TestDialog">
+       </bean>
+
+       <bean id="uipart.ComplexPanel" class="org.argeo.slc.jemmytest.uiparts.ComplexPanel">
+       </bean>
+
+       <!-- Steps -->
+       <bean id="step.MainFrameLabel" class="org.argeo.slc.jemmytest.steps.MainFrameLabel">
+               <property name="mainFrame" ref="uipart.MainFrame" />
+       </bean>
+
+       <bean id="step.TestDialogOpen" class="org.argeo.slc.jemmytest.steps.TestDialogOpen">
+               <property name="mainFrame" ref="uipart.MainFrame" />
+               <property name="testDialog" ref="uipart.TestDialog" />
+       </bean>
+
+       <bean id="step.TestDialogLabel" class="org.argeo.slc.jemmytest.steps.TestDialogLabel">
+               <property name="testDialog" ref="uipart.TestDialog" />
+       </bean>
+
+       <bean id="step.ComplexPanelValues" class="org.argeo.slc.jemmytest.steps.ComplexPanelValues">
+               <property name="complexPanel" ref="uipart.ComplexPanel" />
+       </bean>
+
+       <!-- Runtime -->
+       <bean id="slcDetached.driver" parent="slcTemplate.detached.fileDriver"
+               init-method="start" destroy-method="stop">
+               <property name="baseDir" value="${slc.workDir}/detached" />
+               <property name="xmlConverter" ref="slcDefault.detached.xmlConverterCompat" />
+               <property name="executionServer" ref="executionServer.serviceref" />
+       </bean>
+
 </beans>
\ No newline at end of file
index 50a51628220f0f4b59cee699ec670de18d4a35fc..ee8de76f69649ea184df7eff5849da96c79f2b54 100644 (file)
@@ -14,7 +14,7 @@
     </bean>
 
     <bean id="slcDetached.driver"
-        class="org.argeo.slc.detached.drivers.FileDriver">
+        class="org.argeo.slc.detached.drivers.FileDriver" init-method="cleanPreviousRuns">
         <property name="baseDir" value="file:${slc.workDir}/detached" />
         <property name="xmlConverter"
             ref="slcDefault.detached.xmlConverterCastor" />
index e96d3dc8ed19dcb94803f6fc8b153ffee99ea87d..880d0d93c7fb5d86d3de4be2b4d26d2abc4aaf52 100644 (file)
@@ -1,16 +1,10 @@
 package org.argeo.slc.jemmytest;
 
-import java.io.File;
-import java.util.UUID;
-
 import junit.framework.TestCase;
 
-import org.argeo.slc.detached.DetachedRequest;
-import org.argeo.slc.detached.drivers.FileDriver;
-
 public class DetachedTest extends TestCase {
        public void testSendRequest() throws Exception {
-               FileDriver client = new FileDriver();
+/*             FileDriver client = new FileDriver();
                File baseDir = new File("local/detached");
                baseDir.mkdirs();
                client.setBaseDir(baseDir);
@@ -19,6 +13,6 @@ public class DetachedTest extends TestCase {
                request.setUuid(UUID.randomUUID().toString());
                request.setRef("jemmyTest");
 
-               client.sendRequest(request);
+               client.sendRequest(request);*/
        }
 }