From: Mathieu Baudier Date: Mon, 17 Nov 2008 20:21:50 +0000 (+0000) Subject: Use Equinox and Spring OSGi for SLC Detached X-Git-Tag: argeo-slc-2.1.7~2422 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f198cdf84f9c6b5312825672450f92bc8451ede3;p=gpl%2Fargeo-slc.git Use Equinox and Spring OSGi for SLC Detached git-svn-id: https://svn.argeo.org/slc/trunk@1831 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.agent/pom.xml b/org.argeo.slc.agent/pom.xml index 2c0a7f6bd..396598180 100644 --- a/org.argeo.slc.agent/pom.xml +++ b/org.argeo.slc.agent/pom.xml @@ -102,21 +102,6 @@ org.argeo.dep.osgi.ant - - org.apache.commons com.springsource.org.apache.commons.net diff --git a/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF index 4bc6b27e1..d445f26aa 100644 --- a/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF +++ b/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF @@ -71,51 +71,53 @@ Bundle-Version: 0.11.2.SNAPSHOT Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Distribution -Import-Package: javax.xml.namespace,javax.xml.transform,javax.xml.tran - sform.dom,junit.framework;version="3.8",org.apache.commons.cli;resolu - tion:=optional;version="1.1",org.apache.commons.io;version="1.4",org. - apache.commons.logging;version="1.1",org.apache.log4j;version="1.2",o - rg.apache.log4j.spi;version="1.2",org.apache.tools.ant;version="1.7", - org.apache.tools.ant.helper;version="1.7",org.apache.tools.ant.types; - version="1.7",org.apache.tools.ant.util;version="1.7",org.argeo.slc.a - nt;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.deploy;version="0.11.2 - .SNAPSHOT",org.argeo.slc.ant.detached;version="0.11.2.SNAPSHOT",org.a - rgeo.slc.ant.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.struc - ture;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.test;version="0.11.2 - .SNAPSHOT",org.argeo.slc.ant.unit;version="0.11.2.SNAPSHOT",org.argeo - .slc.cli;version="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2 - .SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.arg - eo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proce - ss;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0. - 11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAP - SHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc - .core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test. - spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;version - ="0.11.2.SNAPSHOT",org.argeo.slc.detached,org.argeo.slc.detached.ui,o - rg.argeo.slc.lib.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.log - ging;version="0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SN - APSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo - .slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT - ",org.argeo.slc.support.deploy.ant;version="0.11.2.SNAPSHOT",org.arge - o.slc.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;version= - "0.11.2.SNAPSHOT",org.argeo.slc.ws.client.spring;version="0.11.2.SNAP - SHOT",org.argeo.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.sl - c.ws.test.tree;version="0.11.2.SNAPSHOT",org.springframework.beans;ve - rsion="2.5.6.A",org.springframework.beans.factory;version="2.5.6.A",o - rg.springframework.beans.factory.config;version="2.5.6.A",org.springf - ramework.beans.factory.support;version="2.5.6.A",org.springframework. - beans.factory.xml;version="2.5.6.A",org.springframework.context;versi - on="2.5.6.A",org.springframework.context.support;version="2.5.6.A",or - g.springframework.core.io;version="2.5.6.A",org.springframework.oxm;v - ersion="1.5.5.A",org.springframework.util;version="2.5.6.A",org.sprin - gframework.ws;version="1.5.5.A",org.springframework.ws.client;version - ="1.5.5.A",org.springframework.ws.client.core;version="1.5.5.A",org.s - pringframework.ws.client.support.interceptor;version="1.5.5.A",org.sp - ringframework.ws.context;version="1.5.5.A",org.springframework.ws.soa - p;version="1.5.5.A",org.springframework.ws.soap.client;version="1.5.5 - .A",org.springframework.xml.transform;version="1.5.5.A",org.springfra - mework.xml.validation;version="1.5.5.A",org.w3c.dom,org.xml.sax +Import-Package: javax.xml.namespace;version="1.3",javax.xml.transform; + version="1.3",javax.xml.transform.dom;version="1.3",junit.framework;v + ersion="3.8",org.apache.commons.cli;resolution:=optional;version="1.1 + ",org.apache.commons.io;version="1.4",org.apache.commons.logging;vers + ion="1.1",org.apache.log4j;version="1.2",org.apache.log4j.spi;version + ="1.2",org.apache.tools.ant;version="1.7",org.apache.tools.ant.helper + ;version="1.7",org.apache.tools.ant.types;version="1.7",org.apache.to + ols.ant.util;version="1.7",org.argeo.slc.ant;version="0.11.2.SNAPSHOT + ",org.argeo.slc.ant.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.an + t.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.spring;version + ="0.11.2.SNAPSHOT",org.argeo.slc.ant.structure;version="0.11.2.SNAPSH + OT",org.argeo.slc.ant.test;version="0.11.2.SNAPSHOT",org.argeo.slc.an + t.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.cli;version="0.11.2.SN + APSHOT",org.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.co + re.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version= + "0.11.2.SNAPSHOT",org.argeo.slc.core.process;version="0.11.2.SNAPSHOT + ",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.argeo.sl + c.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.te + st;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;version= + "0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.SNAP + SHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.arge + o.slc.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.lib.detached;version="0.11.2.SN + APSHOT",org.argeo.slc.logging;version="0.11.2.SNAPSHOT",org.argeo.slc + .maven;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.process;version="0 + .11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT" + ,org.argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.argeo.slc.spring + ;version="0.11.2.SNAPSHOT",org.argeo.slc.support.deploy.ant;version=" + 0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.arg + eo.slc.ws.client;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client.sp + ring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version="0.11 + .2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT",org + .springframework.beans;version="2.5.6.A",org.springframework.beans.fa + ctory;version="2.5.6.A",org.springframework.beans.factory.config;vers + ion="2.5.6.A",org.springframework.beans.factory.support;version="2.5. + 6.A",org.springframework.beans.factory.xml;version="2.5.6.A",org.spri + ngframework.context;version="2.5.6.A",org.springframework.context.sup + port;version="2.5.6.A",org.springframework.core.io;version="2.5.6.A", + org.springframework.oxm;version="1.5.5.A",org.springframework.util;ve + rsion="2.5.6.A",org.springframework.ws;version="1.5.5.A",org.springfr + amework.ws.client;version="1.5.5.A",org.springframework.ws.client.cor + e;version="1.5.5.A",org.springframework.ws.client.support.interceptor + ;version="1.5.5.A",org.springframework.ws.context;version="1.5.5.A",o + rg.springframework.ws.soap;version="1.5.5.A",org.springframework.ws.s + oap.client;version="1.5.5.A",org.springframework.xml.transform;versio + n="1.5.5.A",org.springframework.xml.validation;version="1.5.5.A",org. + w3c.dom;version="1.3",org.xml.sax;version="1.3" Bundle-SymbolicName: org.argeo.slc.agent Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml index 576a3333f..973f69a0e 100644 --- a/org.argeo.slc.core/pom.xml +++ b/org.argeo.slc.core/pom.xml @@ -85,14 +85,17 @@ org.codehaus.castor com.springsource.org.castor + org.apache.xerces com.springsource.org.apache.xerces + edu.emory.mathcs.backport diff --git a/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF index fe1d575da..2c064a187 100644 --- a/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF +++ b/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF @@ -76,47 +76,49 @@ Bundle-Version: 0.11.2.SNAPSHOT Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Core -Import-Package: javax.sql,javax.xml.parsers,javax.xml.transform,javax. - xml.transform.dom,javax.xml.transform.stream,junit.framework;version= - "3.8",org.apache.commons.io;version="1.4",org.apache.commons.logging; - version="1.1",org.apache.log4j;version="1.2",org.argeo.slc.castor;ver - sion="0.11.2.SNAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPS - HOT",org.argeo.slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo - .slc.castor.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.str - ucture;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree; - version="0.11.2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.S - NAPSHOT",org.argeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",org - .argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNA - PSHOT",org.argeo.slc.core.process;version="0.11.2.SNAPSHOT",org.argeo - .slc.core.process.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core - .structure;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tre - e;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.S - NAPSHOT",org.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",or - g.argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc. - core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree - .htmlreport;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;versi - on="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHOT" - ,org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc. - diff;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11.2. - SNAPSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.arg - eo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime; - version="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSH - OT",org.argeo.slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo. - slc.support.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.unit.process;version="0.11.2.SN - APSHOT",org.argeo.slc.unit.test.tree;version="0.11.2.SNAPSHOT",org.ar - geo.slc.xml;version="0.11.2.SNAPSHOT",org.argeo.slc.xml.spring;versio - n="0.11.2.SNAPSHOT",org.dbunit;version="2.2",org.dbunit.database;vers - ion="2.2",org.dbunit.dataset;version="2.2",org.dbunit.dataset.xml;ver - sion="2.2",org.dbunit.operation;version="2.2",org.exolab.castor.mappi - ng;version="1.2",org.springframework.beans.factory;version="2.5.6.A", - org.springframework.context;version="2.5.6.A",org.springframework.con - text.support;version="2.5.6.A",org.springframework.core.io;version="2 - .5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframework - .util;version="2.5.6.A",org.springframework.xml.transform;version="1. - 5.5.A",org.springframework.xml.validation;version="1.5.5.A",org.sprin - gframework.xml.xsd;version="1.5.5.A",org.w3c.dom,org.xml.sax +Import-Package: javax.sql,javax.xml.parsers;version="1.3",javax.xml.tr + ansform;version="1.3",javax.xml.transform.dom;version="1.3",javax.xml + .transform.stream;version="1.3",junit.framework;version="3.8",org.apa + che.commons.io;version="1.4",org.apache.commons.logging;version="1.1" + ,org.apache.log4j;version="1.2",org.argeo.slc.castor;version="0.11.2. + SNAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org.arge + o.slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.s + pring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure;versio + n="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree;version="0.11 + .2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.SNAPSHOT",org. + argeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.co + re;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;version="0.11.2 + .SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.ar + geo.slc.core.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.pro + cess.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0. + 11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org. + argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.c + ore.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tre + e;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree.htmlreport;v + ersion="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;version="0.11.2.SN + APSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHOT",org.argeo.sl + c.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.diff;version= + "0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11.2.SNAPSHOT",org + .argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.te + st.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;version="0.11 + .2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT",org.argeo + .slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.support.d + eploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2 + .SNAPSHOT",org.argeo.slc.unit.process;version="0.11.2.SNAPSHOT",org.a + rgeo.slc.unit.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.xml;v + ersion="0.11.2.SNAPSHOT",org.argeo.slc.xml.spring;version="0.11.2.SNA + PSHOT",org.dbunit;version="2.2",org.dbunit.database;version="2.2",org + .dbunit.dataset;version="2.2",org.dbunit.dataset.xml;version="2.2",or + g.dbunit.operation;version="2.2",org.exolab.castor.mapping;version="1 + .2",org.springframework.beans.factory;version="2.5.6.A",org.springfra + mework.context;version="2.5.6.A",org.springframework.context.support; + version="2.5.6.A",org.springframework.core.io;version="2.5.6.A",org.s + pringframework.oxm;version="1.5.5.A",org.springframework.util;version + ="2.5.6.A",org.springframework.xml.transform;version="1.5.5.A",org.sp + ringframework.xml.validation;version="1.5.5.A",org.springframework.xm + l.xsd;version="1.5.5.A",org.w3c.dom;version="1.3",org.xml.sax;version + ="1.3" Bundle-SymbolicName: org.argeo.slc.core Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) diff --git a/org.argeo.slc.detached.ext.log4j/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.detached.ext.log4j/src/main/resources/META-INF/MANIFEST.MF index 6fb441945..240b2ccb8 100644 --- a/org.argeo.slc.detached.ext.log4j/src/main/resources/META-INF/MANIFEST.MF +++ b/org.argeo.slc.detached.ext.log4j/src/main/resources/META-INF/MANIFEST.MF @@ -13,5 +13,6 @@ Bundle-Description: SLC Distribution Bundle-SymbolicName: org.argeo.slc.detached.ext.log4j Bundle-DocURL: http://www.argeo.org Include-Resource: log4j.properties=src/main/resources/log4j.properties + ,META-INF/MANIFEST.MF=src/main/resources/META-INF/MANIFEST.MF Originally-Created-By: Apache Maven Bundle Plugin diff --git a/org.argeo.slc.detached.launcher/.classpath b/org.argeo.slc.detached.launcher/.classpath index 2c7953e07..b606f1820 100644 --- a/org.argeo.slc.detached.launcher/.classpath +++ b/org.argeo.slc.detached.launcher/.classpath @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/org.argeo.slc.detached.launcher/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.detached.launcher/.settings/org.eclipse.jdt.core.prefs index 166aca32c..3bd18ea49 100644 --- a/org.argeo.slc.detached.launcher/.settings/org.eclipse.jdt.core.prefs +++ b/org.argeo.slc.detached.launcher/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml index 9e1f8dc90..e9b7ddaac 100644 --- a/org.argeo.slc.detached.launcher/pom.xml +++ b/org.argeo.slc.detached.launcher/pom.xml @@ -69,11 +69,21 @@ + + + org.eclipse.osgi + org.eclipse.osgi + + - org.apache.felix - org.apache.felix.main + org.springframework.osgi + org.springframework.osgi.extender + + org.springframework org.springframework.context - + org.apache.commons diff --git a/org.argeo.slc.detached.launcher/src/assembly/dist.xml b/org.argeo.slc.detached.launcher/src/assembly/dist.xml index 12ac142a6..e7d97af79 100644 --- a/org.argeo.slc.detached.launcher/src/assembly/dist.xml +++ b/org.argeo.slc.detached.launcher/src/assembly/dist.xml @@ -13,13 +13,4 @@ 0755 - - - false - lib/detached - - *:jar - - - \ No newline at end of file diff --git a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java index ba181b588..6ccdcdff4 100644 --- a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java +++ b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java @@ -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 - + diff --git a/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs index 9f198318c..134aca25f 100644 --- a/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs +++ b/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/org.argeo.slc.detached/pom.xml b/org.argeo.slc.detached/pom.xml index ed3f0ba63..1ecdbe0af 100644 --- a/org.argeo.slc.detached/pom.xml +++ b/org.argeo.slc.detached/pom.xml @@ -1,5 +1,4 @@ - 4.0.0 @@ -10,7 +9,7 @@ org.argeo.slc.detached Argeo SLC Detached - bundle + jar @@ -21,9 +20,6 @@ maven-bundle-plugin - - org.argeo.slc.detached.Activator - org.argeo.slc.detached.* @@ -57,26 +53,40 @@ org.eclipse.osgi org.eclipse.osgi - 3.4.2.R34x_v20080826-1230 + - org.springframework - org.springframework.context + org.springframework.osgi + org.springframework.osgi.extender + - org.apache.xerces - com.springsource.org.apache.xerces + edu.emory.mathcs.backport + com.springsource.edu.emory.mathcs.backport + + + + org.apache.xmlcommons + com.springsource.org.apache.xmlcommons + provided + + + org.apache.commons 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 index 0db6f9343..000000000 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/AbstractDetachedActivator.java +++ /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 index b9ef442d2..000000000 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/Activator.java +++ /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); - } - -} diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java index 4d9abc598..35b9d63d5 100644 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java +++ b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java @@ -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 index 8df5bbc4a..000000000 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SimpleDetachedActivator.java +++ /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 index b58601e67..000000000 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/SpringStaticRefProvider.java +++ /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 index 5e6d92de4..000000000 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/StaticRefProvider.java +++ /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); -} diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/AbstractDriver.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/AbstractDriver.java index 846e0cc03..6d8e5ac8f 100644 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/AbstractDriver.java +++ b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/AbstractDriver.java @@ -35,7 +35,7 @@ public abstract class AbstractDriver implements DetachedDriver { } } - }, "driverThread"); + }, "driverThread ("+getClass()+")"); driverThread.start(); } diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java index 478154cc2..ce88f5b12 100644 --- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java +++ b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java @@ -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); } } diff --git a/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF index bcc026dc1..b379bcba6 100644 --- a/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF +++ b/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF @@ -1,45 +1,37 @@ Manifest-Version: 1.0 Export-Package: org.argeo.slc.detached.admin;uses:="org.apache.commons - .logging,org.osgi.framework,org.argeo.slc.detached",org.argeo.slc.det - ached.ui;uses:="org.argeo.slc.detached,org.springframework.beans.fact - ory",org.argeo.slc.detached;uses:="org.apache.commons.logging,org.spr - ingframework.context.support,org.springframework.core.io,org.springfr - amework.context,org.springframework.beans.factory.xml,javax.xml.trans - form.dom,org.argeo.slc.detached.drivers,org.w3c.dom,org.springframewo - rk.beans.factory.support,org.argeo.slc.detached.admin,javax.xml.trans - form,javax.xml.transform.stream,org.osgi.framework,org.apache.commons - .io,org.springframework.beans.factory",org.argeo.slc.detached.drivers - ;uses:="org.apache.commons.logging,org.apache.commons.io.filefilter,j - avax.xml.transform,javax.xml.transform.stream,org.apache.commons.io,o - rg.argeo.slc.detached,org.springframework.beans.factory" -Built-By: mbaudier + .logging,org.osgi.framework,org.argeo.slc.detached";version="0.11.2.S + NAPSHOT",org.argeo.slc.detached.ui;uses:="org.argeo.slc.detached,org. + springframework.beans.factory";version="0.11.2.SNAPSHOT",org.argeo.sl + c.detached;uses:="org.springframework.osgi.context,org.apache.commons + .logging,org.springframework.context,javax.xml.transform.dom,org.w3c. + dom,org.argeo.slc.detached.admin,javax.xml.transform,javax.xml.transf + orm.stream,org.osgi.framework,org.apache.commons.io";version="0.11.2. + SNAPSHOT",org.argeo.slc.detached.drivers;uses:="org.apache.commons.lo + gging,org.apache.commons.io.filefilter,javax.xml.transform,javax.xml. + transform.stream,org.apache.commons.io,org.argeo.slc.detached,org.spr + ingframework.beans.factory";version="0.11.2.SNAPSHOT" Tool: Bnd-0.0.255 Bundle-Name: Argeo SLC Detached -Created-By: Apache Maven Bundle Plugin +Created-By: 1.6.0 (Sun Microsystems Inc.) Bundle-Vendor: Argeo -Build-Jdk: 1.6.0 Bundle-Version: 0.11.2.SNAPSHOT Bundle-ManifestVersion: 2 -Bundle-Activator: org.argeo.slc.detached.Activator Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Distribution Import-Package: javax.xml.transform,javax.xml.transform.dom,javax.xml. transform.stream,org.apache.commons.io;version="1.4",org.apache.commo ns.io.filefilter;version="1.4",org.apache.commons.logging;version="1. - 1",org.argeo.slc.detached,org.argeo.slc.detached.admin,org.argeo.slc. - detached.drivers,org.argeo.slc.detached.ui,org.osgi.framework;version - ="1.4",org.springframework.beans.factory;version="2.0",org.springfram - ework.beans.factory.support;version="2.0",org.springframework.beans.f - actory.xml;version="2.0",org.springframework.context;version="2.0",or - g.springframework.context.support;version="2.0",org.springframework.c - ore.io;version="2.0",org.w3c.dom + 1",org.argeo.slc.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.det + ached.admin;version="0.11.2.SNAPSHOT",org.argeo.slc.detached.drivers; + version="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.S + NAPSHOT",org.osgi.framework;version="1.4",org.springframework.beans.f + actory;version="2.0",org.springframework.beans.factory.support;versio + n="2.0",org.springframework.beans.factory.xml;version="2.0",org.sprin + gframework.context;version="2.0",org.springframework.context.support; + version="2.0",org.springframework.core.io;version="2.0",org.springfra + mework.osgi.context;version="1.1.2.B",org.w3c.dom Bundle-SymbolicName: org.argeo.slc.detached Bundle-DocURL: http://www.argeo.org -Include-Resource: org/argeo/slc/detached/spring.xml=src/main/resources - /org/argeo/slc/detached/spring.xml,org/argeo/slc/detached/slc-detache - d.xsd=src/main/resources/org/argeo/slc/detached/slc-detached.xsd,META - -INF/MANIFEST.MF=src/main/resources/META-INF/MANIFEST.MF,META-INF/spr - ing/slc-detached.xml=src/main/resources/META-INF/spring/slc-detached. - xml -Originally-Created-By: Apache Maven Bundle Plugin +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) 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 index 000000000..009726d27 --- /dev/null +++ b/org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached-osgi.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached.xml b/org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached.xml index 1fab5f382..13f485c88 100644 --- a/org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached.xml +++ b/org.argeo.slc.detached/src/main/resources/META-INF/spring/slc-detached.xml @@ -1,12 +1,17 @@ + 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"> - + - - + + - \ No newline at end of file + + diff --git a/org.argeo.slc.detached/src/main/resources/org/argeo/slc/detached/spring.xml b/org.argeo.slc.detached/src/main/resources/org/argeo/slc/detached/spring.xml index 720240881..9aa9aec30 100644 --- a/org.argeo.slc.detached/src/main/resources/org/argeo/slc/detached/spring.xml +++ b/org.argeo.slc.detached/src/main/resources/org/argeo/slc/detached/spring.xml @@ -1,17 +1,20 @@ + 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"> - - + + - - + + + + + + + + - - \ No newline at end of file diff --git a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java index 2eb5a87d9..90589db95 100644 --- a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java +++ b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java @@ -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"; diff --git a/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF index cea55c92a..929d52fd6 100644 --- a/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF +++ b/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF @@ -44,36 +44,37 @@ Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Server Import-Package: com.lowagie.text;version="2.0",com.lowagie.text.pdf;ve - rsion="2.0",javax.servlet.http,javax.xml.namespace,javax.xml.parsers, - javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.strea - m,jxl.write;version="2.6",org.apache.commons.logging;version="1.1",or - g.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process - ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11 - .2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSH - OT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.c - ore.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;ver - sion="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHO - T",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.sl - c.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;v - ersion="0.11.2.SNAPSHOT",org.argeo.slc.server.spring;version="0.11.2. - SNAPSHOT",org.argeo.slc.services.test;version="0.11.2.SNAPSHOT",org.a - rgeo.slc.services.test.impl;version="0.11.2.SNAPSHOT",org.argeo.slc.w - eb.mvc;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.admin;version= - "0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;version="0.11.2.SNAPS - HOT",org.argeo.slc.web.mvc.result;version="0.11.2.SNAPSHOT",org.argeo - .slc.ws;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version="0 - .11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT", - org.springframework.context;version="2.5.6.A",org.springframework.cor - e.io;version="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org. - springframework.web.servlet;version="2.5.6.A",org.springframework.web - .servlet.handler;version="2.5.6.A",org.springframework.web.servlet.mv - c;version="2.5.6.A",org.springframework.web.servlet.view;version="2.5 - .6.A",org.springframework.web.servlet.view.document;version="2.5.6.A" - ,org.springframework.web.servlet.view.xslt;version="2.5.6.A",org.spri - ngframework.ws.context;version="1.5.5.A",org.springframework.ws.serve - r.endpoint;version="1.5.5.A",org.springframework.ws.soap;version="1.5 - .5.A",org.springframework.ws.soap.server.endpoint;version="1.5.5.A",o - rg.w3c.dom + rsion="2.0",javax.servlet.http,javax.xml.namespace;version="1.3",java + x.xml.parsers;version="1.3",javax.xml.transform;version="1.3",javax.x + ml.transform.dom;version="1.3",javax.xml.transform.stream;version="1. + 3",jxl.write;version="2.6",org.apache.commons.logging;version="1.1",o + rg.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proces + s;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.1 + 1.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPS + HOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc. + core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSH + OT",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.s + lc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree; + version="0.11.2.SNAPSHOT",org.argeo.slc.server.spring;version="0.11.2 + .SNAPSHOT",org.argeo.slc.services.test;version="0.11.2.SNAPSHOT",org. + argeo.slc.services.test.impl;version="0.11.2.SNAPSHOT",org.argeo.slc. + web.mvc;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.admin;version + ="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;version="0.11.2.SNAP + SHOT",org.argeo.slc.web.mvc.result;version="0.11.2.SNAPSHOT",org.arge + o.slc.ws;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version=" + 0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT" + ,org.springframework.context;version="2.5.6.A",org.springframework.co + re.io;version="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org + .springframework.web.servlet;version="2.5.6.A",org.springframework.we + b.servlet.handler;version="2.5.6.A",org.springframework.web.servlet.m + vc;version="2.5.6.A",org.springframework.web.servlet.view;version="2. + 5.6.A",org.springframework.web.servlet.view.document;version="2.5.6.A + ",org.springframework.web.servlet.view.xslt;version="2.5.6.A",org.spr + ingframework.ws.context;version="1.5.5.A",org.springframework.ws.serv + er.endpoint;version="1.5.5.A",org.springframework.ws.soap;version="1. + 5.5.A",org.springframework.ws.soap.server.endpoint;version="1.5.5.A", + org.w3c.dom;version="1.3" Bundle-SymbolicName: org.argeo.slc.server Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index a669559e6..334483877 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -334,45 +334,18 @@ ${version.spring-ws} + + org.springframework.osgi + org.springframework.osgi.extender + 1.1.2.B + + org.argeo.dep.osgi org.argeo.dep.osgi.ant 1.7.1 - @@ -433,12 +406,6 @@ com.springsource.org.apache.xerces 2.8.1 - - - org.apache.xmlcommons - com.springsource.org.apache.xmlcommons - - org.apache.xalan @@ -524,6 +491,7 @@ + + + org.eclipse.osgi + org.eclipse.osgi + 3.4.2.R34x_v20080826-1230 + diff --git a/sandbox/argeo.slc.jemmytest/.classpath b/sandbox/argeo.slc.jemmytest/.classpath index 95c777d80..9d89d21e0 100644 --- a/sandbox/argeo.slc.jemmytest/.classpath +++ b/sandbox/argeo.slc.jemmytest/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml index 5422ea9c9..5d1ae71c0 100644 --- a/sandbox/argeo.slc.jemmytest/pom.xml +++ b/sandbox/argeo.slc.jemmytest/pom.xml @@ -1,107 +1,99 @@ - - 4.0.0 - - org.argeo.slc - argeo-slc - 0.11.2-SNAPSHOT - ../org.argeo.slc - - org.argeo.slc.sandbox - org.argeo.slc.sandbox.jemmytest - SLC Sandbox JemmyTest - bundle - - - - - org.apache.felix - maven-bundle-plugin - 1.4.3 - true - - - src/main/resources/META-INF - - - - ${pom.artifactId} - - - org.argeo.slc.jemmytest.JemmyTestActivator - - - org.argeo.slc.jemmytest.* + + 4.0.0 + + org.argeo.slc + argeo-slc + 0.11.2-SNAPSHOT + ../../org.argeo.slc + + org.argeo.slc.sandbox + org.argeo.slc.sandbox.jemmytest + SLC Sandbox JemmyTest + jar + + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + org.argeo.slc.jemmytest.* - - *,org.springframework.beans.factory.xml;version=2.0.8 + + *,org.springframework.beans.factory.config - - org.argeo.slc.detached + + org.argeo.slc.detached - <_removeheaders>Bnd-LastModified - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.2 - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - package - - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - - org.argeo.slc - org.argeo.slc.detached - ${project.version} - + - - org.argeo.slc - org.argeo.slc.agent - ${project.version} - test - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + + org.argeo.slc + org.argeo.slc.detached + ${project.version} + + + org.argeo.dep.jemmy + org.argeo.dep.jemmy.nb61 + - - org.springframework - org.springframework.context - + + org.argeo.slc + org.argeo.slc.detached.launcher + ${project.version} + - - org.apache.felix - org.osgi.core - + + org.argeo.slc + org.argeo.slc.agent + ${project.version} + - - org.argeo.dep.jemmy - org.argeo.dep.jemmy.nb61 - - + + org.apache.geronimo.specs + com.springsource.javax.management.j2ee + 1.0.1 + + + \ 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 index 6a3ad6004..000000000 --- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.argeo.slc.jemmytest; - -import org.argeo.slc.detached.SimpleDetachedActivator; - -public class JemmyTestActivator extends SimpleDetachedActivator { -} diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF index dbdc9e237..0e25c273d 100644 --- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF +++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF @@ -1,31 +1,28 @@ Manifest-Version: 1.0 Export-Package: org.argeo.slc.jemmytest.uiparts;uses:="javax.swing.tex t,org.argeo.slc.detached.ui,javax.swing,org.netbeans.jemmy,org.netbea - ns.jemmy.operators,org.argeo.slc.detached",org.argeo.slc.jemmytest;us - es:="org.argeo.slc.detached",org.argeo.slc.jemmytest.steps;uses:="org - .argeo.slc.jemmytest.uiparts,org.argeo.slc.detached.ui,org.argeo.slc. - detached" -Built-By: mbaudier + ns.jemmy.operators,org.argeo.slc.detached";version="0.11.2.SNAPSHOT", + org.argeo.slc.jemmytest;uses:="org.argeo.slc.detached";version="0.11. + 2.SNAPSHOT",org.argeo.slc.jemmytest.steps;uses:="org.argeo.slc.jemmyt + est.uiparts,org.argeo.slc.detached.ui,org.argeo.slc.detached";version + ="0.11.2.SNAPSHOT" Tool: Bnd-0.0.255 Bundle-Name: SLC Sandbox JemmyTest -Created-By: Apache Maven Bundle Plugin +Created-By: 1.6.0 (Sun Microsystems Inc.) Require-Bundle: org.argeo.slc.detached Bundle-Vendor: Argeo -Build-Jdk: 1.6.0 Bundle-Version: 0.11.2.SNAPSHOT -Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Distribution -Import-Package: javax.swing,javax.swing.text,org.argeo.slc.detached,or - g.argeo.slc.detached.ui,org.argeo.slc.jemmytest,org.argeo.slc.jemmyte - st.steps,org.argeo.slc.jemmytest.uiparts,org.netbeans.jemmy,org.netbe - ans.jemmy.operators,org.springframework.beans.factory.xml;version="2. - 0.8" +Import-Package: javax.swing,javax.swing.text,org.argeo.slc.detached;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.SNA + PSHOT",org.argeo.slc.jemmytest;version="0.11.2.SNAPSHOT",org.argeo.sl + c.jemmytest.steps;version="0.11.2.SNAPSHOT",org.argeo.slc.jemmytest.u + iparts;version="0.11.2.SNAPSHOT",org.netbeans.jemmy,org.netbeans.jemm + y.operators,org.springframework.beans.factory.config;version="2.5.6.A + " Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest Bundle-DocURL: http://www.argeo.org -Include-Resource: META-INF/MANIFEST.MF=src/main/resources/META-INF/MAN - IFEST.MF,META-INF/spring/slc-detached.xml=src/main/resources/META-INF - /spring/slc-detached.xml -Originally-Created-By: Apache Maven Bundle Plugin +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) 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 index 000000000..cffe1c3d7 --- /dev/null +++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached-osgi.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml index ffa3c3a1e..622d959c4 100644 --- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml +++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml @@ -1,51 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 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"> + + + + + + SYSTEM_PROPERTIES_MODE_OVERRIDE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml index 50a516282..ee8de76f6 100644 --- a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml +++ b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml @@ -14,7 +14,7 @@ + class="org.argeo.slc.detached.drivers.FileDriver" init-method="cleanPreviousRuns"> diff --git a/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java b/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java index e96d3dc8e..880d0d93c 100644 --- a/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java +++ b/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java @@ -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);*/ } }