]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Start preparing OSGi runtime
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 23 Nov 2008 16:17:30 +0000 (16:17 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 23 Nov 2008 16:17:30 +0000 (16:17 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@1870 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

19 files changed:
examples/org.argeo.slc.example01/pom.xml
examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF
examples/org.argeo.slc.example01/src/main/resources/META-INF/spring/slc.xml [new file with mode: 0644]
examples/org.argeo.slc.example01/src/main/slc/conf/runtime/default.xml
org.argeo.slc/pom.xml
runtime/org.argeo.slc.launcher/pom.xml
runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/OsgiLauncher.java [new file with mode: 0644]
runtime/org.argeo.slc.launcher/src/main/resources/META-INF/MANIFEST.MF
runtime/org.argeo.slc.support.ant/pom.xml
runtime/org.argeo.slc.support.castor/pom.xml
runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/process/FileSlcExecutionNotifier.java [deleted file]
runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/test/tree/XsltReportGenerator.java [deleted file]
runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java [new file with mode: 0644]
runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java [new file with mode: 0644]
runtime/org.argeo.slc.support.castor/src/main/resources/META-INF/MANIFEST.MF
runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml
runtime/org.argeo.slc.support.simple/pom.xml
runtime/org.argeo.slc.support.simple/src/main/resources/META-INF/MANIFEST.MF
runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/process/spring/applicationContext.xml [deleted file]

index 94254bf0487a9203492b511b82c68808bd41f0dc..0557c384df8253187184d6aa4bd3f4c8965fd7de 100644 (file)
                                                <Export-Package>
                                                        org.argeo.slc.example.*
                                                </Export-Package>
-                                               <Import-Package>*,org.argeo.slc.core.test.spring,org.springframework.oxm.castor,org.argeo.slc.msg.test.tree,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.apache.tools.ant.types</Import-Package>
-                                               <Bundle-Activator>org.argeo.slc.example.Activator</Bundle-Activator>
-                                               <Require-Bundle>org.argeo.slc.core,org.argeo.slc.agent</Require-Bundle>
+                                               <Import-Package>*,
+                                                       org.argeo.slc.core.test.spring,
+                                                       org.argeo.slc.xml.test.tree,
+                                                       org.argeo.slc.castor.spring,
+                                                       org.argeo.slc.castor.msg,
+                                                       org.argeo.slc.castor.process,
+                                                       org.argeo.slc.castor.structure,
+                                                       org.argeo.slc.castor.test,
+                                                       org.springframework.oxm.castor,
+                                                       org.argeo.slc.core.test.tree,
+                                                       org.argeo.slc.msg.test.tree,
+                                                       org.apache.tools.ant,
+                                                       org.apache.tools.ant.taskdefs,
+                                                       org.apache.tools.ant.types
+                                               </Import-Package>
+                                               <!--
+                                                       <Import-Package>*,org.argeo.slc.core.test.spring,org.springframework.oxm.castor,org.argeo.slc.msg.test.tree,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.apache.tools.ant.types</Import-Package>
+                                                       <Bundle-Activator>org.argeo.slc.example.Activator</Bundle-Activator>
+                                                       <Require-Bundle>org.argeo.slc.core,org.argeo.slc.agent</Require-Bundle>
+                                               -->
                                        </instructions>
                                </configuration>
                        </plugin>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
                        <version>${project.version}</version>
-                       <scope>test</scope>
+                       <scope>provided</scope>
                </dependency>
+
+               <!-- OSGi -->
+               <dependency>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.apache.xmlcommons</groupId>
+                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file
index 7afbb097480729451ce460de0089545863793926..06803c1ce561b16b6d86e9fb98e3f19408cb8347 100644 (file)
@@ -1,36 +1,40 @@
 Manifest-Version: 1.0\r
-Bundle-Activator: org.argeo.slc.example.Activator\r
-Created-By: 1.5.0_16 (Sun Microsystems Inc.)\r
+Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT",\r
+ org.argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT",org.\r
+ argeo.slc.example;uses:="org.apache.commons.logging,org.argeo.slc.tes\r
+ t,org.argeo.slc.core.test,org.argeo.slc.core.structure,org.argeo.slc.\r
+ build,org.argeo.slc.example.appli,org.argeo.slc.test.context,org.arge\r
+ o.slc.core.test.context,org.argeo.slc.deploy,org.argeo.slc.structure,\r
+ org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT"\r
+Tool: Bnd-0.0.255\r
+Bundle-Name: Argeo SLC Example 01\r
+Created-By: 1.6.0 (Sun Microsystems Inc.)\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.11.2.SNAPSHOT\r
+Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: An Example SLC application\r
 Import-Package: org.apache.commons.logging;version="1.1",org.apache.to\r
  ols.ant;version="1.7",org.apache.tools.ant.taskdefs;version="1.7",org\r
  .apache.tools.ant.types;version="1.7",org.argeo.slc.build;version="0.\r
- 11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT"\r
- ,org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.arge\r
- o.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.con\r
- text;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version\r
- ="0.11.2.SNAPSHOT",org.argeo.slc.deploy;version="0.11.2.SNAPSHOT",org\r
- .argeo.slc.example;version="0.11.2.SNAPSHOT",org.argeo.slc.example.ap\r
- pli;version="0.11.2.SNAPSHOT",org.argeo.slc.example.ws.client.spring;\r
- version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.2\r
- .SNAPSHOT",org.argeo.slc.structure;version="0.11.2.SNAPSHOT",org.arge\r
- o.slc.test;version="0.11.2.SNAPSHOT",org.argeo.slc.test.context;versi\r
- on="0.11.2.SNAPSHOT",org.springframework.oxm.castor;version="1.5.5.A"\r
-Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT",\r
- org.argeo.slc.example;uses:="org.argeo.slc.test.context,org.argeo.slc\r
- .test,org.argeo.slc.core.test,org.argeo.slc.core.test.context,org.arg\r
- eo.slc.build,org.apache.commons.logging,org.argeo.slc.structure,org.a\r
- rgeo.slc.example.appli,org.argeo.slc.core.structure.tree,org.argeo.sl\r
- c.deploy,org.argeo.slc.core.structure";version="0.11.2.SNAPSHOT",org.\r
- argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT"\r
-Bundle-Version: 0.11.2.SNAPSHOT\r
-Bundle-Name: Argeo SLC Example 01\r
-Bundle-Description: An Example SLC application\r
+ 11.2.SNAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org\r
+ .argeo.slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo.slc.cas\r
+ tor.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure;v\r
+ ersion="0.11.2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.ar\r
+ geo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.c\r
+ ore.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.\r
+ 2.SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",or\r
+ g.argeo.slc.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.example;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.example.appli;version="0.11.2.S\r
+ NAPSHOT",org.argeo.slc.example.ws.client.spring;version="0.11.2.SNAPS\r
+ HOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.\r
+ slc.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version="0\r
+ .11.2.SNAPSHOT",org.argeo.slc.test.context;version="0.11.2.SNAPSHOT",\r
+ org.argeo.slc.xml.test.tree;version="0.11.2.SNAPSHOT",org.springframe\r
+ work.oxm.castor;version="1.5.5.A"\r
+Bundle-SymbolicName: org.argeo.slc.example01\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
-Bundle-Vendor: Argeo\r
-Bundle-ManifestVersion: 2\r
-Bundle-SymbolicName: org.argeo.slc.example01\r
-Tool: Bnd-0.0.255\r
-Require-Bundle: org.argeo.slc.core,org.argeo.slc.agent\r
 \r
diff --git a/examples/org.argeo.slc.example01/src/main/resources/META-INF/spring/slc.xml b/examples/org.argeo.slc.example01/src/main/resources/META-INF/spring/slc.xml
new file mode 100644 (file)
index 0000000..db133e6
--- /dev/null
@@ -0,0 +1,13 @@
+<?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.5.xsd">
+
+       <!-- Under development!! -->
+       <import
+               resource="file:/home/mbaudier/dev/src/slc/examples/org.argeo.slc.example01/src/main/slc/conf/applicationContext.xml" />
+       <import
+               resource="file:/home/mbaudier/dev/src/slc/examples/org.argeo.slc.example01/src/main/slc/conf/runtime/default.xml" />
+
+
+</beans>
\ No newline at end of file
index 94c2aa9080eeb7c92faaf3b7bf085ac128894c1f..eb7204a9dc7da2b9fa608dad969c8e6b34a4b141 100644 (file)
@@ -6,7 +6,7 @@
        <import
                resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
        <import
-               resource="classpath:/org/argeo/slc/core/process/spring/applicationContext.xml" />
+               resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
 
        <bean id="testResult"
                parent="slcDefault.test.basicTreeTestResult">
@@ -36,7 +36,7 @@
                <property name="logLevel" value="INFO" />
                <property name="notifiers">
                        <list>
-                               <ref bean="slcDefault.process.fileSlcExecutionNotifier" />
+                               <ref bean="slcDefault.castor.fileSlcExecutionNotifier" />
                        </list>
                </property>
        </bean>
index 10a123f4ebbddab70166d58cfe1e23d19260852d..e767a74409f6d57dfb286be51cc1218c2ccead30 100644 (file)
                                <version>1.8.0.9</version>
                        </dependency>
 
+                       <!-- XML -->
                        <dependency>
                                <groupId>org.codehaus.castor</groupId>
                                <artifactId>com.springsource.org.castor</artifactId>
index 4abb9d7407efd428b73aeb46432383a5ea45c57a..e52b0805776e4018cfaadef7b75d05b88f00eaf6 100644 (file)
@@ -55,7 +55,6 @@
                                                <Export-Package>
                                                        org.argeo.slc.*
                                                </Export-Package>
-                                               <Import-Package>*,org.argeo.slc.test.spring,org.apache.commons.cli;resolution:=optional</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
                        <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
                </dependency>
 
+               <dependency>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/OsgiLauncher.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/OsgiLauncher.java
new file mode 100644 (file)
index 0000000..d30ea68
--- /dev/null
@@ -0,0 +1,274 @@
+package org.argeo.slc.cli;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+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.eclipse.core.runtime.adaptor.EclipseStarter;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+public class OsgiLauncher {
+       public final static String PROP_SLC_HOME = "slc.home";
+       public final static String PROP_SLC_OSGI_START = "slc.osgi.start";
+       public final static String PROP_SLC_OSGI_SCAN_CLASSPATH = "slc.osgi.scanClasspath";
+       public final static String PROP_SLC_OSGI_EQUINOX_ARGS = "slc.osgi.equinox.args";
+
+       private final static String DEV_BUNDLE_PREFIX = "slc.osgi.devbundle.";
+
+       public static void main(String[] args) {
+               info("Argeo SLC Detached launcher starting...");
+               try {
+                       // Load properties
+                       String propertyPath = "slc-detached.properties";
+                       Properties config = prepareConfig(propertyPath);
+
+                       // Start app (in main class loader)
+                       startApp(config);
+
+                       // Start OSGi framework
+                       try {
+                               startEquinox(config);
+                       } catch (Exception e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       }
+                       info("Argeo SLC Detached launcher started.");
+               } catch (Exception e) {
+                       e.printStackTrace();
+                       System.exit(-1);
+               }
+       }
+
+       protected static Properties prepareConfig(String propertyFilePath)
+                       throws Exception {
+               // Format slc.home
+               String slcHome = System.getProperty(PROP_SLC_HOME);
+               if (slcHome != null) {
+                       slcHome = new File(slcHome).getCanonicalPath();
+                       System.setProperty(PROP_SLC_HOME, slcHome);
+               }
+
+               // Load config
+               Properties config = new Properties();
+               InputStream in = null;
+               try {
+                       File file = new File(propertyFilePath);
+                       if (file.exists()) {
+                               in = new FileInputStream(propertyFilePath);
+                               config.load(in);
+                       }
+               } finally {
+                       if (in != null)
+                               in.close();
+               }
+
+               // System properties have priority.
+               config.putAll(System.getProperties());
+               return config;
+       }
+
+       public static void startEquinox(Properties config) throws Exception {
+               info("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 equinoxArgsLineDefault = "-console -noExit -clean -debug -configuration "
+                               + equinoxConfigurationPath;
+               String equinoxArgsLine = System.getProperty(PROP_SLC_OSGI_EQUINOX_ARGS,
+                               equinoxArgsLineDefault);
+               // String[] equinoxArgs = { "-console", "-noExit", "-clean", "-debug",
+               // "-configuration", equinoxConfigurationPath };
+               String[] equinoxArgs = equinoxArgsLine.split(" ");
+
+               BundleContext context = EclipseStarter.startup(equinoxArgs, null);
+
+               // Load from class path (dev environment, maven)
+               if (config.getProperty(PROP_SLC_OSGI_SCAN_CLASSPATH, "false").equals(
+                               "true")) {
+                       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());
+                               }
+                       }
+               }
+
+               // 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(PROP_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());
+                               }
+
+                       }
+               }
+
+               // Start bundles
+               String bundleStart = config.getProperty(PROP_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);
+               }
+       }
+
+       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;
+       }
+
+       private static void startBundle(BundleContext bundleContext,
+                       String symbolicName) throws BundleException {
+               info("Starting bundle " + symbolicName + "...");
+               Bundle bundle = findBundleBySymbolicName(bundleContext, symbolicName);
+               if (bundle != null)
+                       bundle.start();
+               else
+                       throw new RuntimeException("Bundle " + symbolicName + " not found");
+               info("Started " + symbolicName);
+       }
+
+       /** 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];
+                       String bundleSymbolicName = bundle.getSymbolicName();
+                       if (bundleSymbolicName == null)
+                               throw new RuntimeException("Bundle " + bundle.getBundleId()
+                                               + " (" + bundle.getLocation()
+                                               + ") has no symbolic name.");
+
+                       if (bundleSymbolicName.equals(symbolicName)) {
+                               return bundle;
+                       }
+               }
+               return null;
+       }
+
+       public static void startApp(Properties config) throws Exception {
+               String className = config.getProperty("slc.detached.appclass");
+               String[] uiArgs = readArgumentsFromLine(config.getProperty(
+                               "slc.detached.appargs", ""));
+
+               if (className == null) {
+                       info("No slc.detached.appclass property define: does not try to launch an app from the standard classpath.");
+               } else {
+                       // Launch main method using reflection
+                       Class clss = Class.forName(className);
+                       Class[] mainArgsClasses = new Class[] { uiArgs.getClass() };
+                       Object[] mainArgs = { uiArgs };
+                       Method mainMethod = clss.getMethod("main", mainArgsClasses);
+                       mainMethod.invoke(null, mainArgs);
+               }
+       }
+
+       /* UTILITIES */
+
+       /**
+        * Transform a line into an array of arguments, taking "" as single
+        * arguments. (nested \" are not supported)
+        */
+       private static String[] readArgumentsFromLine(String lineOrig) {
+
+               String line = lineOrig.trim();// remove trailing spaces
+               // System.out.println("line=" + line);
+               List args = new Vector();
+               StringBuffer curr = new StringBuffer("");
+               boolean inQuote = false;
+               char[] arr = line.toCharArray();
+               for (int i = 0; i < arr.length; i++) {
+                       char c = arr[i];
+                       switch (c) {
+                       case '\"':
+                               inQuote = !inQuote;
+                               break;
+                       case ' ':
+                               if (!inQuote) {// otherwise, no break: goes to default
+                                       if (curr.length() > 0) {
+                                               args.add(curr.toString());
+                                               curr = new StringBuffer("");
+                                       }
+                                       break;
+                               }
+                       default:
+                               curr.append(c);
+                               break;
+                       }
+               }
+
+               // Add last arg
+               if (curr.length() > 0) {
+                       args.add(curr.toString());
+                       curr = null;
+               }
+
+               String[] res = new String[args.size()];
+               for (int i = 0; i < args.size(); i++) {
+                       res[i] = args.get(i).toString();
+                       // System.out.println("res[i]=" + res[i]);
+               }
+               return res;
+       }
+
+       private static void info(Object obj) {
+               System.out.println("[INFO] " + obj);
+       }
+
+       private static void bundleInstallWarn(Object obj) {
+               System.err.println("[WARN] " + obj);
+       }
+}
index 8564dcb1134b8d7ba79c8820788660ea10db936c..cc5f22e47a2427e15b76c044c3cafa6fc0ac433f 100644 (file)
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0\r
 Created-By: 1.5.0_16 (Sun Microsystems Inc.)\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
-Import-Package: org.apache.commons.cli;resolution:=optional;version="1\r
- .1",org.apache.commons.io;version="1.4",org.apache.commons.logging;ve\r
- rsion="1.1",org.argeo.slc;version="0.11.2.SNAPSHOT",org.argeo.slc.bui\r
- ld;version="0.11.2.SNAPSHOT",org.argeo.slc.cli;version="0.11.2.SNAPSH\r
- OT",org.argeo.slc.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.logg\r
- ing;version="0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SNA\r
- PSHOT",org.argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.argeo.slc.\r
- support.deploy.ant;version="0.11.2.SNAPSHOT",org.argeo.slc.test.sprin\r
- g\r
+Import-Package: org.apache.commons.cli;version="1.1",org.apache.common\r
+ s.io;version="1.4",org.apache.commons.logging;version="1.1",org.argeo\r
+ .slc;version="0.11.2.SNAPSHOT",org.argeo.slc.build;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.cli;version="0.11.2.SNAPSHOT",org.argeo.slc.dep\r
+ loy;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11.2.S\r
+ NAPSHOT",org.argeo.slc.maven;version="0.11.2.SNAPSHOT",org.argeo.slc.\r
+ runtime;version="0.11.2.SNAPSHOT",org.argeo.slc.support.deploy.ant;ve\r
+ rsion="0.11.2.SNAPSHOT",org.eclipse.core.runtime.adaptor,org.osgi.fra\r
+ mework;version="1.4"\r
 Export-Package: org.argeo.slc.support.deploy.ant;version="0.11.2.SNAPS\r
  HOT",org.argeo.slc.maven;uses:="org.argeo.slc.build,org.argeo.slc.dep\r
  loy";version="0.11.2.SNAPSHOT",org.argeo.slc.cli;uses:="org.argeo.slc\r
- ,org.argeo.slc.logging,org.argeo.slc.runtime,org.apache.commons.io,or\r
- g.apache.commons.logging,org.apache.commons.cli";version="0.11.2.SNAP\r
- SHOT"\r
+ ,org.osgi.framework,org.apache.commons.logging,org.argeo.slc.logging,\r
+ org.apache.commons.io,org.argeo.slc.runtime,org.eclipse.core.runtime.\r
adaptor,org.apache.commons.cli";version="0.11.2.SNAPSHOT"\r
 Bundle-Version: 0.11.2.SNAPSHOT\r
 Bundle-Name: Argeo SLC Launcher\r
 Bundle-Description: SLC Distribution\r
index 11320996e5a48c0b2397c913499ed9a6e9059abe..dd3ec7e74e51d7e5c20e1d449f77496100f9c30b 100644 (file)
@@ -68,9 +68,5 @@
                        <groupId>org.apache.bsf</groupId>
                        <artifactId>com.springsource.org.apache.bsf</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.beanshell</groupId>
-                       <artifactId>com.springsource.bsh</artifactId>
-               </dependency>
        </dependencies>
 </project>
\ No newline at end of file
index 0af0f021fea5b230d3f828576071fa61e9810566..81dc9b235bc946f9c11f813cbfc5906c1d780bd5 100644 (file)
                                                <Export-Package>
                                                        org.argeo.slc.*
                                                </Export-Package>
-                                               <Import-Package>*,org.apache.commons.logging;version="1.1"</Import-Package>
+                                               <Import-Package>*,javax.xml.parsers;resolution:=optional,
+                                               javax.xml.transform;resolution:=optional,
+                                               javax.xml.transform.dom;resolution:=optional,
+                                               javax.xml.transform.stream;resolution:=optional,
+                                               org.w3c.dom;resolution:=optional,
+                                               org.xml.sax;resolution:=optional
+                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
                        <artifactId>com.springsource.org.apache.xerces</artifactId>
                </dependency>
 
+               <dependency>
+                       <groupId>org.apache.xalan</groupId>
+                       <artifactId>com.springsource.org.apache.xalan</artifactId>
+               </dependency>
+
                <dependency>
                        <groupId>javax.xml.stream</groupId>
                        <artifactId>com.springsource.javax.xml.stream</artifactId>
diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/process/FileSlcExecutionNotifier.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/process/FileSlcExecutionNotifier.java
deleted file mode 100644 (file)
index f7aa684..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.argeo.slc.core.process;\r
-\r
-import java.io.File;\r
-import java.io.FileWriter;\r
-import java.text.SimpleDateFormat;\r
-import java.util.Date;\r
-import java.util.HashMap;\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-import javax.xml.transform.stream.StreamResult;\r
-\r
-import org.apache.commons.io.IOUtils;\r
-import org.argeo.slc.SlcException;\r
-import org.argeo.slc.process.SlcExecution;\r
-import org.argeo.slc.process.SlcExecutionNotifier;\r
-import org.argeo.slc.process.SlcExecutionStep;\r
-import org.springframework.oxm.Marshaller;\r
-\r
-public class FileSlcExecutionNotifier implements SlcExecutionNotifier {\r
-       private final static SimpleDateFormat sdf = new SimpleDateFormat(\r
-                       "yyyyMMdd-HHmmss");\r
-\r
-       private String basePath;\r
-       private Marshaller marshaller;\r
-\r
-       private Map<String, String> uuidToDir = new HashMap<String, String>();\r
-\r
-       public void addSteps(SlcExecution slcExecution,\r
-                       List<SlcExecutionStep> additionalSteps) {\r
-               writeSlcExecution(slcExecution);\r
-       }\r
-\r
-       public void newExecution(SlcExecution slcExecution) {\r
-               String dirPath = basePath + File.separator + sdf.format(new Date())\r
-                               + '-' + slcExecution.getUuid();\r
-               File dir = new File(dirPath);\r
-               dir.mkdirs();\r
-\r
-               uuidToDir.put(slcExecution.getUuid(), dirPath);\r
-\r
-               writeSlcExecution(slcExecution);\r
-       }\r
-\r
-       public void updateExecution(SlcExecution slcExecution) {\r
-               writeSlcExecution(slcExecution);\r
-       }\r
-\r
-       public void updateStatus(SlcExecution slcExecution, String oldStatus,\r
-                       String newStatus) {\r
-               writeSlcExecution(slcExecution);\r
-       }\r
-\r
-       protected void writeSlcExecution(SlcExecution slcExecution) {\r
-               FileWriter out = null;\r
-               try {\r
-                       out = new FileWriter(getFilePath(slcExecution));\r
-                       marshaller.marshal(slcExecution, new StreamResult(out));\r
-               } catch (Exception e) {\r
-                       throw new SlcException("Cannot marshall SlcExecution to "\r
-                                       + getFilePath(slcExecution), e);\r
-               } finally {\r
-                       IOUtils.closeQuietly(out);\r
-               }\r
-       }\r
-\r
-       protected String getFileName(SlcExecution slcExecution) {\r
-               return "SlcExecution-" + slcExecution.getUuid() + ".xml";\r
-       }\r
-\r
-       protected String getFilePath(SlcExecution slcExecution) {\r
-               String dirPath = uuidToDir.get(slcExecution.getUuid());\r
-               return dirPath + File.separator + "SlcExecution-"\r
-                               + slcExecution.getUuid() + ".xml";\r
-       }\r
-\r
-       public void setBasePath(String basePath) {\r
-               this.basePath = basePath;\r
-       }\r
-\r
-       public void setMarshaller(Marshaller marshaller) {\r
-               this.marshaller = marshaller;\r
-       }\r
-\r
-}\r
diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/test/tree/XsltReportGenerator.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/test/tree/XsltReportGenerator.java
deleted file mode 100644 (file)
index 3bb7cd4..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.argeo.slc.core.test.tree;\r
-\r
-import java.io.File;\r
-import java.io.FileOutputStream;\r
-import java.io.InputStream;\r
-import java.io.OutputStream;\r
-\r
-import javax.xml.parsers.DocumentBuilder;\r
-import javax.xml.parsers.DocumentBuilderFactory;\r
-import javax.xml.transform.Templates;\r
-import javax.xml.transform.Transformer;\r
-import javax.xml.transform.TransformerFactory;\r
-import javax.xml.transform.dom.DOMResult;\r
-import javax.xml.transform.dom.DOMSource;\r
-import javax.xml.transform.stream.StreamResult;\r
-import javax.xml.transform.stream.StreamSource;\r
-\r
-import org.springframework.core.io.Resource;\r
-import org.springframework.oxm.Marshaller;\r
-import org.springframework.xml.transform.StringResult;\r
-import org.w3c.dom.Document;\r
-\r
-import org.apache.commons.io.IOUtils;\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-\r
-import org.argeo.slc.SlcException;\r
-import org.argeo.slc.test.TestResultListener;\r
-import org.argeo.slc.test.TestResultPart;\r
-\r
-public class XsltReportGenerator implements TestResultListener<TreeTestResult> {\r
-       private Log log = LogFactory.getLog(getClass());\r
-\r
-       private DocumentBuilder documentBuilder = null;\r
-\r
-       private Resource xsltStyleSheet;\r
-\r
-       private Templates templates;\r
-\r
-       private Marshaller marshaller;\r
-\r
-       private String outputDir;\r
-       private String outputFileExtension = "html";\r
-\r
-       private Boolean logXml = false;\r
-\r
-       public void init() {\r
-               if (templates != null)\r
-                       return;\r
-\r
-               if (xsltStyleSheet == null)\r
-                       throw new SlcException("XSLT style sheet not specified.");\r
-\r
-               InputStream in = null;\r
-               try {\r
-                       TransformerFactory transformerFactory = TransformerFactory\r
-                                       .newInstance();\r
-                       in = xsltStyleSheet.getInputStream();\r
-                       StreamSource xsltSource = new StreamSource(in);\r
-                       templates = transformerFactory.newTemplates(xsltSource);\r
-               } catch (Exception e) {\r
-                       throw new SlcException("Could not initialize templates", e);\r
-               } finally {\r
-                       IOUtils.closeQuietly(in);\r
-               }\r
-       }\r
-\r
-       public void resultPartAdded(TreeTestResult testResult,\r
-                       TestResultPart testResultPart) {\r
-\r
-       }\r
-\r
-       public void close(TreeTestResult testResult) {\r
-               if (templates == null)\r
-                       throw new SlcException("XSLT template not initialized");\r
-\r
-               File file = getFile(testResult);\r
-               OutputStream out = null;\r
-\r
-               try {\r
-                       Transformer transformer = templates.newTransformer();\r
-\r
-                       if (documentBuilder == null)\r
-                               documentBuilder = DocumentBuilderFactory.newInstance()\r
-                                               .newDocumentBuilder();\r
-\r
-                       Document document = documentBuilder.newDocument();\r
-                       DOMResult marshallResult = new DOMResult(document);\r
-                       marshaller.marshal(testResult, marshallResult);\r
-\r
-                       if (logXml) {\r
-                               Transformer identityTransformer = TransformerFactory\r
-                                               .newInstance().newTransformer();\r
-                               StringResult xmlResult = new StringResult();\r
-                               identityTransformer.transform(new DOMSource(marshallResult\r
-                                               .getNode()), xmlResult);\r
-                               log.info("Marshalled XML:\n" + xmlResult);\r
-                       }\r
-\r
-                       DOMSource transfoSource = new DOMSource(marshallResult.getNode());\r
-\r
-                       if (outputDir != null) {\r
-                               File dir = new File(outputDir);\r
-                               dir.mkdirs();\r
-                               out = new FileOutputStream(file);\r
-                               StreamResult outputResult = new StreamResult(out);\r
-                               transformer.transform(transfoSource, outputResult);\r
-                       } else {\r
-                               // print on console if no output dir\r
-                               StringResult result = new StringResult();\r
-                               transformer.transform(transfoSource, result);\r
-                               log.info("Generated report:\n" + result);\r
-                       }\r
-               } catch (Exception e) {\r
-                       throw new SlcException(\r
-                                       "Could not transform test result to " + file, e);\r
-               } finally {\r
-                       IOUtils.closeQuietly(out);\r
-               }\r
-       }\r
-\r
-       public Resource getXsltStyleSheet() {\r
-               return xsltStyleSheet;\r
-       }\r
-\r
-       public void setXsltStyleSheet(Resource xsltStyleSheet) {\r
-               this.xsltStyleSheet = xsltStyleSheet;\r
-       }\r
-\r
-       public void setTemplates(Templates templates) {\r
-               this.templates = templates;\r
-       }\r
-\r
-       public void setMarshaller(Marshaller marshaller) {\r
-               this.marshaller = marshaller;\r
-       }\r
-\r
-       public void setOutputDir(String outputDir) {\r
-               this.outputDir = outputDir;\r
-       }\r
-\r
-       public void setOutputFileExtension(String outputFileExtension) {\r
-               this.outputFileExtension = outputFileExtension;\r
-       }\r
-\r
-       protected File getFile(TreeTestResult result) {\r
-               Long time = System.currentTimeMillis();\r
-               return new File(outputDir + File.separator + time + "-"\r
-                               + result.getUuid() + "." + outputFileExtension);\r
-       }\r
-\r
-       public void setLogXml(Boolean logXml) {\r
-               this.logXml = logXml;\r
-       }\r
-\r
-}\r
diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java
new file mode 100644 (file)
index 0000000..f16b4e7
--- /dev/null
@@ -0,0 +1,85 @@
+package org.argeo.slc.xml.process;\r
+\r
+import java.io.File;\r
+import java.io.FileWriter;\r
+import java.text.SimpleDateFormat;\r
+import java.util.Date;\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Map;\r
+\r
+import javax.xml.transform.stream.StreamResult;\r
+\r
+import org.apache.commons.io.IOUtils;\r
+import org.argeo.slc.SlcException;\r
+import org.argeo.slc.process.SlcExecution;\r
+import org.argeo.slc.process.SlcExecutionNotifier;\r
+import org.argeo.slc.process.SlcExecutionStep;\r
+import org.springframework.oxm.Marshaller;\r
+\r
+public class FileSlcExecutionNotifier implements SlcExecutionNotifier {\r
+       private final static SimpleDateFormat sdf = new SimpleDateFormat(\r
+                       "yyyyMMdd-HHmmss");\r
+\r
+       private String basePath;\r
+       private Marshaller marshaller;\r
+\r
+       private Map<String, String> uuidToDir = new HashMap<String, String>();\r
+\r
+       public void addSteps(SlcExecution slcExecution,\r
+                       List<SlcExecutionStep> additionalSteps) {\r
+               writeSlcExecution(slcExecution);\r
+       }\r
+\r
+       public void newExecution(SlcExecution slcExecution) {\r
+               String dirPath = basePath + File.separator + sdf.format(new Date())\r
+                               + '-' + slcExecution.getUuid();\r
+               File dir = new File(dirPath);\r
+               dir.mkdirs();\r
+\r
+               uuidToDir.put(slcExecution.getUuid(), dirPath);\r
+\r
+               writeSlcExecution(slcExecution);\r
+       }\r
+\r
+       public void updateExecution(SlcExecution slcExecution) {\r
+               writeSlcExecution(slcExecution);\r
+       }\r
+\r
+       public void updateStatus(SlcExecution slcExecution, String oldStatus,\r
+                       String newStatus) {\r
+               writeSlcExecution(slcExecution);\r
+       }\r
+\r
+       protected void writeSlcExecution(SlcExecution slcExecution) {\r
+               FileWriter out = null;\r
+               try {\r
+                       out = new FileWriter(getFilePath(slcExecution));\r
+                       marshaller.marshal(slcExecution, new StreamResult(out));\r
+               } catch (Exception e) {\r
+                       throw new SlcException("Cannot marshall SlcExecution to "\r
+                                       + getFilePath(slcExecution), e);\r
+               } finally {\r
+                       IOUtils.closeQuietly(out);\r
+               }\r
+       }\r
+\r
+       protected String getFileName(SlcExecution slcExecution) {\r
+               return "SlcExecution-" + slcExecution.getUuid() + ".xml";\r
+       }\r
+\r
+       protected String getFilePath(SlcExecution slcExecution) {\r
+               String dirPath = uuidToDir.get(slcExecution.getUuid());\r
+               return dirPath + File.separator + "SlcExecution-"\r
+                               + slcExecution.getUuid() + ".xml";\r
+       }\r
+\r
+       public void setBasePath(String basePath) {\r
+               this.basePath = basePath;\r
+       }\r
+\r
+       public void setMarshaller(Marshaller marshaller) {\r
+               this.marshaller = marshaller;\r
+       }\r
+\r
+}\r
diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java
new file mode 100644 (file)
index 0000000..51ad392
--- /dev/null
@@ -0,0 +1,157 @@
+package org.argeo.slc.xml.test.tree;\r
+\r
+import java.io.File;\r
+import java.io.FileOutputStream;\r
+import java.io.InputStream;\r
+import java.io.OutputStream;\r
+\r
+import javax.xml.parsers.DocumentBuilder;\r
+import javax.xml.parsers.DocumentBuilderFactory;\r
+import javax.xml.transform.Templates;\r
+import javax.xml.transform.Transformer;\r
+import javax.xml.transform.TransformerFactory;\r
+import javax.xml.transform.dom.DOMResult;\r
+import javax.xml.transform.dom.DOMSource;\r
+import javax.xml.transform.stream.StreamResult;\r
+import javax.xml.transform.stream.StreamSource;\r
+\r
+import org.springframework.core.io.Resource;\r
+import org.springframework.oxm.Marshaller;\r
+import org.springframework.xml.transform.StringResult;\r
+import org.w3c.dom.Document;\r
+\r
+import org.apache.commons.io.IOUtils;\r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
+\r
+import org.argeo.slc.SlcException;\r
+import org.argeo.slc.core.test.tree.TreeTestResult;\r
+import org.argeo.slc.test.TestResultListener;\r
+import org.argeo.slc.test.TestResultPart;\r
+\r
+public class XsltReportGenerator implements TestResultListener<TreeTestResult> {\r
+       private Log log = LogFactory.getLog(getClass());\r
+\r
+       private DocumentBuilder documentBuilder = null;\r
+\r
+       private Resource xsltStyleSheet;\r
+\r
+       private Templates templates;\r
+\r
+       private Marshaller marshaller;\r
+\r
+       private String outputDir;\r
+       private String outputFileExtension = "html";\r
+\r
+       private Boolean logXml = false;\r
+\r
+       public void init() {\r
+               if (templates != null)\r
+                       return;\r
+\r
+               if (xsltStyleSheet == null)\r
+                       throw new SlcException("XSLT style sheet not specified.");\r
+\r
+               InputStream in = null;\r
+               try {\r
+                       TransformerFactory transformerFactory = TransformerFactory\r
+                                       .newInstance();\r
+                       in = xsltStyleSheet.getInputStream();\r
+                       StreamSource xsltSource = new StreamSource(in);\r
+                       templates = transformerFactory.newTemplates(xsltSource);\r
+               } catch (Exception e) {\r
+                       throw new SlcException("Could not initialize templates", e);\r
+               } finally {\r
+                       IOUtils.closeQuietly(in);\r
+               }\r
+       }\r
+\r
+       public void resultPartAdded(TreeTestResult testResult,\r
+                       TestResultPart testResultPart) {\r
+\r
+       }\r
+\r
+       public void close(TreeTestResult testResult) {\r
+               if (templates == null)\r
+                       throw new SlcException("XSLT template not initialized");\r
+\r
+               File file = getFile(testResult);\r
+               OutputStream out = null;\r
+\r
+               try {\r
+                       Transformer transformer = templates.newTransformer();\r
+\r
+                       if (documentBuilder == null)\r
+                               documentBuilder = DocumentBuilderFactory.newInstance()\r
+                                               .newDocumentBuilder();\r
+\r
+                       Document document = documentBuilder.newDocument();\r
+                       DOMResult marshallResult = new DOMResult(document);\r
+                       marshaller.marshal(testResult, marshallResult);\r
+\r
+                       if (logXml) {\r
+                               Transformer identityTransformer = TransformerFactory\r
+                                               .newInstance().newTransformer();\r
+                               StringResult xmlResult = new StringResult();\r
+                               identityTransformer.transform(new DOMSource(marshallResult\r
+                                               .getNode()), xmlResult);\r
+                               log.info("Marshalled XML:\n" + xmlResult);\r
+                       }\r
+\r
+                       DOMSource transfoSource = new DOMSource(marshallResult.getNode());\r
+\r
+                       if (outputDir != null) {\r
+                               File dir = new File(outputDir);\r
+                               dir.mkdirs();\r
+                               out = new FileOutputStream(file);\r
+                               StreamResult outputResult = new StreamResult(out);\r
+                               transformer.transform(transfoSource, outputResult);\r
+                       } else {\r
+                               // print on console if no output dir\r
+                               StringResult result = new StringResult();\r
+                               transformer.transform(transfoSource, result);\r
+                               log.info("Generated report:\n" + result);\r
+                       }\r
+               } catch (Exception e) {\r
+                       throw new SlcException(\r
+                                       "Could not transform test result to " + file, e);\r
+               } finally {\r
+                       IOUtils.closeQuietly(out);\r
+               }\r
+       }\r
+\r
+       public Resource getXsltStyleSheet() {\r
+               return xsltStyleSheet;\r
+       }\r
+\r
+       public void setXsltStyleSheet(Resource xsltStyleSheet) {\r
+               this.xsltStyleSheet = xsltStyleSheet;\r
+       }\r
+\r
+       public void setTemplates(Templates templates) {\r
+               this.templates = templates;\r
+       }\r
+\r
+       public void setMarshaller(Marshaller marshaller) {\r
+               this.marshaller = marshaller;\r
+       }\r
+\r
+       public void setOutputDir(String outputDir) {\r
+               this.outputDir = outputDir;\r
+       }\r
+\r
+       public void setOutputFileExtension(String outputFileExtension) {\r
+               this.outputFileExtension = outputFileExtension;\r
+       }\r
+\r
+       protected File getFile(TreeTestResult result) {\r
+               Long time = System.currentTimeMillis();\r
+               return new File(outputDir + File.separator + time + "-"\r
+                               + result.getUuid() + "." + outputFileExtension);\r
+       }\r
+\r
+       public void setLogXml(Boolean logXml) {\r
+               this.logXml = logXml;\r
+       }\r
+\r
+}\r
index d3048b78b3b8846474aba9ad1efc7da2f993e11b..74248c7ff6e037ed0245f5ec2adc047573dc624f 100644 (file)
@@ -1,53 +1,57 @@
 Manifest-Version: 1.0\r
-Created-By: 1.5.0_16 (Sun Microsystems Inc.)\r
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
-Import-Package: javax.xml.parsers;version="1.3",javax.xml.transform;ve\r
- rsion="1.3",javax.xml.transform.dom;version="1.3",javax.xml.transform\r
- .stream;version="1.3",junit.framework;version="3.8",org.apache.common\r
- s.io;version="1.4",org.apache.commons.logging;version="1.1",org.argeo\r
- .slc;version="0.11.2.SNAPSHOT",org.argeo.slc.castor;version="0.11.2.S\r
- NAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org.argeo\r
- .slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.sp\r
- ring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure;version\r
- ="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.a\r
- rgeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.cor\r
- e.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree\r
- ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SN\r
- APSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.ar\r
- geo.slc.process;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version=\r
- "0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.ex\r
- olab.castor.mapping;version="1.2",org.springframework.core.io;version\r
- ="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframew\r
- ork.xml.transform;version="1.5.5.A",org.springframework.xml.validatio\r
- n;version="1.5.5.A",org.springframework.xml.xsd;version="1.5.5.A",org\r
- .w3c.dom;version="1.3",org.xml.sax;version="1.3"\r
-Export-Package: org.argeo.slc.core.test.tree;uses:="org.argeo.slc,org.\r
- argeo.slc.test,org.w3c.dom,org.apache.commons.logging,org.springframe\r
- work.oxm,javax.xml.transform,javax.xml.transform.dom,org.springframew\r
- ork.core.io,javax.xml.parsers,org.apache.commons.io,javax.xml.transfo\r
- rm.stream,org.springframework.xml.transform";version="0.11.2.SNAPSHOT\r
- ",org.argeo.slc.castor.test.tree;uses:="org.argeo.slc.test,org.argeo.\r
- slc.core.test,org.exolab.castor.mapping";version="0.11.2.SNAPSHOT",or\r
- g.argeo.slc.unit;uses:="org.xml.sax,org.springframework.xml.xsd,org.a\r
- pache.commons.logging,junit.framework,org.springframework.xml.validat\r
- ion,javax.xml.transform";version="0.11.2.SNAPSHOT",org.argeo.slc.cast\r
- or.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;uses:\r
- ="org.argeo.slc,org.argeo.slc.process,org.apache.commons.io,javax.xml\r
- .transform.stream,org.springframework.oxm,javax.xml.transform";versio\r
- n="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree;uses:="org.ex\r
- olab.castor.mapping,org.argeo.slc.core.structure.tree";version="0.11.\r
- 2.SNAPSHOT",org.argeo.slc.castor.structure;version="0.11.2.SNAPSHOT",\r
- org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org.argeo.slc.cast\r
- or.test;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.spring;version\r
- ="0.11.2.SNAPSHOT",org.argeo.slc.castor;version="0.11.2.SNAPSHOT"\r
-Bundle-Version: 0.11.2.SNAPSHOT\r
+Export-Package: org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org\r
+ .argeo.slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo.slc.cas\r
+ tor.test;version="0.11.2.SNAPSHOT",org.argeo.slc.xml.test.tree;uses:=\r
+ "org.springframework.oxm,org.apache.commons.logging,org.argeo.slc.tes\r
+ t,org.springframework.xml.transform,org.springframework.core.io,javax\r
+ .xml.parsers,org.argeo.slc.core.test.tree,javax.xml.transform.dom,org\r
+ .w3c.dom,javax.xml.transform,javax.xml.transform.stream,org.apache.co\r
+ mmons.io,org.argeo.slc";version="0.11.2.SNAPSHOT",org.argeo.slc.casto\r
+ r.structure.tree;uses:="org.exolab.castor.mapping,org.argeo.slc.core.\r
+ structure.tree";version="0.11.2.SNAPSHOT",org.argeo.slc.castor.struct\r
+ ure;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.spring;version="0.\r
+ 11.2.SNAPSHOT",org.argeo.slc.castor.test.tree;uses:="org.argeo.slc.te\r
+ st,org.exolab.castor.mapping,org.argeo.slc.core.test";version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.unit;uses:="org.apache.commons.logging,junit\r
+ .framework,javax.xml.transform,org.springframework.xml.xsd,org.spring\r
+ framework.xml.validation,org.xml.sax";version="0.11.2.SNAPSHOT",org.a\r
+ rgeo.slc.xml.process;uses:="org.springframework.oxm,javax.xml.transfo\r
+ rm,org.argeo.slc.process,javax.xml.transform.stream,org.apache.common\r
+ s.io,org.argeo.slc";version="0.11.2.SNAPSHOT",org.argeo.slc.castor;ve\r
+ rsion="0.11.2.SNAPSHOT"\r
+Tool: Bnd-0.0.255\r
 Bundle-Name: Argeo SLC Support Castor\r
+Created-By: 1.6.0 (Sun Microsystems Inc.)\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.11.2.SNAPSHOT\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: Implementations of SLC Specs using Castor\r
+Import-Package: javax.xml.parsers;resolution:=optional;version="1.3",j\r
+ avax.xml.transform;resolution:=optional;version="1.3",javax.xml.trans\r
+ form.dom;resolution:=optional;version="1.3",javax.xml.transform.strea\r
+ m;resolution:=optional;version="1.3",junit.framework;version="3.8",or\r
+ g.apache.commons.io;version="1.4",org.apache.commons.logging;version=\r
+ "1.1",org.argeo.slc;version="0.11.2.SNAPSHOT",org.argeo.slc.castor;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAP\r
+ SHOT",org.argeo.slc.castor.process;version="0.11.2.SNAPSHOT",org.arge\r
+ o.slc.castor.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.st\r
+ ructure;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.\r
+ SNAPSHOT",org.argeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",or\r
+ g.argeo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.s\r
+ lc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;v\r
+ ersion="0.11.2.SNAPSHOT",org.argeo.slc.process;version="0.11.2.SNAPSH\r
+ OT",org.argeo.slc.test;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;v\r
+ ersion="0.11.2.SNAPSHOT",org.argeo.slc.xml.process;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.xml.test.tree;version="0.11.2.SNAPSHOT",org.exo\r
+ lab.castor.mapping;version="1.2",org.springframework.core.io;version=\r
+ "2.5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframewo\r
+ rk.xml.transform;version="1.5.5.A",org.springframework.xml.validation\r
+ ;version="1.5.5.A",org.springframework.xml.xsd;version="1.5.5.A",org.\r
+ w3c.dom;resolution:=optional;version="1.3",org.xml.sax;resolution:=op\r
+ tional;version="1.3"\r
+Bundle-SymbolicName: org.argeo.slc.support.castor\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
-Bundle-ManifestVersion: 2\r
-Bundle-Vendor: Argeo\r
-Bundle-SymbolicName: org.argeo.slc.support.castor\r
-Tool: Bnd-0.0.255\r
 \r
index 45a470a3f2eb1913ad381355a69dfb0ac81370a0..414a2f49a058118858281d487972489c3e86aaf5 100644 (file)
@@ -25,7 +25,7 @@
        </bean>
 
        <bean id="slcDefault.castor.xsltReportGenerator"
-               class="org.argeo.slc.core.test.tree.XsltReportGenerator"
+               class="org.argeo.slc.xml.test.tree.XsltReportGenerator"
                init-method="init">
                <property name="xsltStyleSheet"
                        value="classpath:/org/argeo/slc/core/test/tree/basicReport.xslt" />
                <property name="outputDir" value="${slc.workDir}/results/html" />
        </bean>
 
+       <bean name="slcDefault.castor.fileSlcExecutionNotifier"
+               class="org.argeo.slc.xml.process.FileSlcExecutionNotifier">
+               <property name="basePath" value="${slc.workDir}/process" />
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />
+       </bean>
 
 </beans>
index 42534e229d02f9083849c876bd93f17a846c2d2e..1680c2722b32ccb8d03e2ee1087966e8dad41f49 100644 (file)
                                                <Export-Package>
                                                        org.argeo.slc.*
                                                </Export-Package>
-                                               <Import-Package>*,org.apache.commons.logging;version="1.1"</Import-Package>
+                                               <Import-Package>*,org.apache.commons.logging;version="1.1",
+                                                       org.dbunit;resolution:="optional",
+                                                       org.dbunit.database;resolution:="optional",
+                                                       org.dbunit.dataset;resolution:="optional",
+                                                       org.dbunit.dataset.xml;resolution:="optional",
+                                                       org.dbunit.operation;resolution:="optional"
+                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
                        <groupId>org.junit</groupId>
                        <artifactId>com.springsource.junit</artifactId>
                </dependency>
+
+               <!-- Required by DB Unit -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.collections</artifactId>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file
index 7a603c1525adc56bc92c0f18e4b6917e511825b4..3ca2f5c5499d98ae7d998778ea284354680bda84 100644 (file)
@@ -6,32 +6,33 @@ Import-Package: javax.sql,junit.framework;version="3.8",org.apache.com
  ache.log4j;version="1.2",org.argeo.slc;version="0.11.2.SNAPSHOT",org.\r
  argeo.slc.build;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.spring;version="0.11.2.SNAPSHOT",or\r
- g.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.co\r
- re.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;v\r
- ersion="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;version="0.1\r
- 1.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT\r
- ",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.sl\r
- c.dao.test;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test.tree;vers\r
- ion="0.11.2.SNAPSHOT",org.argeo.slc.deploy;version="0.11.2.SNAPSHOT",\r
- org.argeo.slc.diff;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;ve\r
- rsion="0.11.2.SNAPSHOT",org.argeo.slc.msg.process;version="0.11.2.SNA\r
- PSHOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.arge\r
- o.slc.process;version="0.11.2.SNAPSHOT",org.argeo.slc.spring;version=\r
- "0.11.2.SNAPSHOT",org.argeo.slc.structure;version="0.11.2.SNAPSHOT",o\r
- rg.argeo.slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.s\r
- upport.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version\r
- ="0.11.2.SNAPSHOT",org.argeo.slc.test.context;version="0.11.2.SNAPSHO\r
- T",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.unit.pr\r
- ocess;version="0.11.2.SNAPSHOT",org.argeo.slc.unit.test.tree;version=\r
- "0.11.2.SNAPSHOT",org.argeo.slc.xml;version="0.11.2.SNAPSHOT",org.arg\r
- eo.slc.xml.spring;version="0.11.2.SNAPSHOT",org.dbunit;version="2.2",\r
- org.dbunit.database;version="2.2",org.dbunit.dataset;version="2.2",or\r
- g.dbunit.dataset.xml;version="2.2",org.dbunit.operation;version="2.2"\r
- ,org.springframework.beans.factory;version="2.5.6.A",org.springframew\r
- ork.context;version="2.5.6.A",org.springframework.context.support;ver\r
- sion="2.5.6.A",org.springframework.core.io;version="2.5.6.A",org.spri\r
- ngframework.util;version="2.5.6.A"\r
+ PSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.arg\r
+ eo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.co\r
+ re.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;ver\r
+ sion="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org\r
+ .argeo.slc.dao.test;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test.\r
+ tree;version="0.11.2.SNAPSHOT",org.argeo.slc.deploy;version="0.11.2.S\r
+ NAPSHOT",org.argeo.slc.diff;version="0.11.2.SNAPSHOT",org.argeo.slc.l\r
+ ogging;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.process;version="0.11.2.SNAPSHOT",org.argeo.slc.spring\r
+ ;version="0.11.2.SNAPSHOT",org.argeo.slc.structure;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.support.deploy;version="0.11.2.SNAPSHOT",org.ar\r
+ geo.slc.support.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.tes\r
+ t;version="0.11.2.SNAPSHOT",org.argeo.slc.test.context;version="0.11.\r
+ 2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.argeo.sl\r
+ c.unit.process;version="0.11.2.SNAPSHOT",org.argeo.slc.unit.test.tree\r
+ ;version="0.11.2.SNAPSHOT",org.argeo.slc.xml;version="0.11.2.SNAPSHOT\r
+ ",org.argeo.slc.xml.spring;version="0.11.2.SNAPSHOT",org.dbunit;resol\r
+ ution:=optional;version="2.2",org.dbunit.database;resolution:=optiona\r
+ l;version="2.2",org.dbunit.dataset;resolution:=optional;version="2.2"\r
+ ,org.dbunit.dataset.xml;resolution:=optional;version="2.2",org.dbunit\r
+ .operation;resolution:=optional;version="2.2",org.springframework.bea\r
+ ns.factory;version="2.5.6.A",org.springframework.context;version="2.5\r
+ .6.A",org.springframework.context.support;version="2.5.6.A",org.sprin\r
+ gframework.core.io;version="2.5.6.A",org.springframework.util;version\r
+ ="2.5.6.A"\r
 Export-Package: org.argeo.slc.dao.test.tree;uses:="org.argeo.slc.test,\r
  org.argeo.slc.core.test.tree,org.argeo.slc.core.test,org.argeo.slc.da\r
  o.test,org.apache.commons.logging,org.argeo.slc.core.structure.tree";\r
@@ -41,47 +42,46 @@ Export-Package: org.argeo.slc.dao.test.tree;uses:="org.argeo.slc.test,
  o.slc.test.context,org.argeo.slc.test,org.argeo.slc.process,org.argeo\r
  .slc.core.test.context,org.apache.commons.logging,org.argeo.slc.core.\r
  structure.tree,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",org.ar\r
- geo.slc.core.process.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.m\r
- sg.process;uses:="org.argeo.slc.process";version="0.11.2.SNAPSHOT",or\r
- g.argeo.slc.unit.process;uses:="org.argeo.slc.process,org.argeo.slc.u\r
- nit,junit.framework";version="0.11.2.SNAPSHOT",org.argeo.slc.core.tes\r
- t.context;uses:="org.argeo.slc,org.argeo.slc.test.context,org.argeo.s\r
- lc.test,org.argeo.slc.core.test,org.apache.commons.logging,org.spring\r
- framework.beans.factory,org.argeo.slc.core.structure.tree,org.argeo.s\r
- lc.structure";version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;vers\r
- ion="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.\r
- SNAPSHOT",org.argeo.slc.xml.spring;version="0.11.2.SNAPSHOT",org.arge\r
- o.slc.support.deploy;uses:="org.argeo.slc,org.argeo.slc.build,org.apa\r
- che.commons.logging,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",o\r
- rg.argeo.slc.support.deploy.db;uses:="org.argeo.slc,org.dbunit.databa\r
- se,org.dbunit.dataset.xml,org.argeo.slc.build,org.apache.commons.logg\r
- ing,org.dbunit,javax.sql,org.dbunit.dataset,org.springframework.core.\r
- io,org.dbunit.operation,org.argeo.slc.deploy";version="0.11.2.SNAPSHO\r
- T",org.argeo.slc.logging;uses:="org.argeo.slc,org.apache.log4j,org.sp\r
- ringframework.core.io,org.apache.commons.io,org.springframework.util"\r
- ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;uses:="org.ar\r
- geo.slc,org.argeo.slc.test,org.apache.commons.logging,org.argeo.slc.c\r
- ore.structure.tree,org.argeo.slc.structure,org.argeo.slc.core.structu\r
- re";version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;uses:="org.\r
- argeo.slc,org.argeo.slc.test,org.argeo.slc.core.test.tree,org.argeo.s\r
- lc.core.test,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPS\r
- HOT",org.argeo.slc.xml;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;u\r
- ses:="org.argeo.slc,org.apache.commons.logging,junit.framework,org.ar\r
- geo.slc.spring,org.springframework.context,org.springframework.contex\r
- t.support,org.springframework.beans.factory";version="0.11.2.SNAPSHOT\r
- ",org.argeo.slc.unit.test.tree;uses:="org.argeo.slc.test,org.argeo.sl\r
- c.core.test,org.argeo.slc.unit.process,org.argeo.slc.build,org.apache\r
- .commons.logging,org.argeo.slc.structure,org.argeo.slc.core.test.tree\r
- ,org.argeo.slc.msg.test.tree,org.argeo.slc.unit,org.argeo.slc.process\r
- ,junit.framework,org.argeo.slc.core.structure.tree,org.argeo.slc.core\r
- .structure,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",org.argeo.\r
- slc.diff;uses:="org.argeo.slc,org.springframework.core.io";version="0\r
- .11.2.SNAPSHOT",org.argeo.slc.spring;uses:="org.argeo.slc,org.springf\r
- ramework.core.io,org.apache.commons.logging,org.springframework.beans\r
- .factory";version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree\r
- ;uses:="org.argeo.slc,org.argeo.slc.structure,org.argeo.slc.core.stru\r
- cture";version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;uses:="\r
- org.argeo.slc.structure";version="0.11.2.SNAPSHOT"\r
+ geo.slc.msg.process;uses:="org.argeo.slc.process";version="0.11.2.SNA\r
+ PSHOT",org.argeo.slc.unit.process;uses:="org.argeo.slc.process,org.ar\r
+ geo.slc.unit,junit.framework";version="0.11.2.SNAPSHOT",org.argeo.slc\r
+ .core.test.context;uses:="org.argeo.slc,org.argeo.slc.test.context,or\r
+ g.argeo.slc.test,org.argeo.slc.core.test,org.apache.commons.logging,o\r
+ rg.springframework.beans.factory,org.argeo.slc.core.structure.tree,or\r
+ g.argeo.slc.structure";version="0.11.2.SNAPSHOT",org.argeo.slc.core.b\r
+ uild;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version\r
+ ="0.11.2.SNAPSHOT",org.argeo.slc.xml.spring;version="0.11.2.SNAPSHOT"\r
+ ,org.argeo.slc.support.deploy;uses:="org.argeo.slc,org.argeo.slc.buil\r
+ d,org.apache.commons.logging,org.argeo.slc.deploy";version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.logging;uses:="org.argeo.slc,org.apache.log4j,o\r
+ rg.springframework.core.io,org.apache.commons.io,org.springframework.\r
+ util";version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;uses:="o\r
+ rg.argeo.slc,org.argeo.slc.test,org.apache.commons.logging,org.argeo.\r
+ slc.core.structure.tree,org.argeo.slc.structure,org.argeo.slc.core.st\r
+ ructure";version="0.11.2.SNAPSHOT",org.argeo.slc.support.deploy.db;us\r
+ es:="org.argeo.slc,org.dbunit.database,org.dbunit.dataset.xml,org.arg\r
+ eo.slc.build,org.apache.commons.logging,org.dbunit,javax.sql,org.dbun\r
+ it.dataset,org.springframework.core.io,org.dbunit.operation,org.argeo\r
+ .slc.deploy";version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;us\r
+ es:="org.argeo.slc,org.argeo.slc.test,org.argeo.slc.core.test.tree,or\r
+ g.argeo.slc.core.test,org.argeo.slc.core.structure.tree";version="0.1\r
+ 1.2.SNAPSHOT",org.argeo.slc.xml;version="0.11.2.SNAPSHOT",org.argeo.s\r
+ lc.unit;uses:="org.argeo.slc,org.apache.commons.logging,junit.framewo\r
+ rk,org.argeo.slc.spring,org.springframework.context,org.springframewo\r
+ rk.context.support,org.springframework.beans.factory";version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.unit.test.tree;uses:="org.argeo.slc.test,org\r
+ .argeo.slc.core.test,org.argeo.slc.unit.process,org.argeo.slc.build,o\r
+ rg.apache.commons.logging,org.argeo.slc.structure,org.argeo.slc.core.\r
+ test.tree,org.argeo.slc.msg.test.tree,org.argeo.slc.unit,org.argeo.sl\r
+ c.process,junit.framework,org.argeo.slc.core.structure.tree,org.argeo\r
+ .slc.core.structure,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",o\r
+ rg.argeo.slc.diff;uses:="org.argeo.slc,org.springframework.core.io";v\r
+ ersion="0.11.2.SNAPSHOT",org.argeo.slc.spring;uses:="org.argeo.slc,or\r
+ g.springframework.core.io,org.apache.commons.logging,org.springframew\r
+ ork.beans.factory";version="0.11.2.SNAPSHOT",org.argeo.slc.core.struc\r
+ ture.tree;uses:="org.argeo.slc,org.argeo.slc.structure,org.argeo.slc.\r
+ core.structure";version="0.11.2.SNAPSHOT",org.argeo.slc.core.structur\r
+ e;uses:="org.argeo.slc.structure";version="0.11.2.SNAPSHOT"\r
 Bundle-Version: 0.11.2.SNAPSHOT\r
 Bundle-Name: Argeo SLC Support Simple\r
 Bundle-Description: Basic implementations of SLC Specifications\r
diff --git a/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/process/spring/applicationContext.xml b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/process/spring/applicationContext.xml
deleted file mode 100644 (file)
index 45bcac9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
-       default-lazy-init="true">\r
-\r
-       <import
-               resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
-
-       <bean name="slcDefault.process.fileSlcExecutionNotifier"
-               class="org.argeo.slc.core.process.FileSlcExecutionNotifier">
-               <property name="basePath" value="${slc.workDir}/process" />
-               <property name="marshaller" ref="slcDefault.castor.marshaller" />
-       </bean>
-</beans>
\ No newline at end of file