Clean directory structure.

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

diff --git a/org.argeo.slc.detached/pom.xml b/org.argeo.slc.detached/pom.xml
index c1dac5e6e37dc6d7e7df4eab5a33d5846071f8c8..f276f7bc6a3e9f10adec58cb5b6278b4fd076697 100644 (file)
--- a/org.argeo.slc.detached/pom.xml
+++ b/org.argeo.slc.detached/pom.xml
@@ -11,7 +11,6 @@
        <artifactId>org.argeo.slc.detached</artifactId>
        <name>Argeo SLC Detached</name>
        <packaging>bundle</packaging>
-       <description />
        <build>
                <plugins>
                        <plugin>
@@ -27,9 +26,6 @@
                                                <Bundle-SymbolicName>
                                                        ${pom.artifactId}
                                                </Bundle-SymbolicName>
-                                               <Bundle-Activator>
-                                                       org.argeo.slc.detached.AutoUiActivator
-                                               </Bundle-Activator>
                                                <Export-Package>
                                                        org.argeo.slc.detached.*
                                                </Export-Package>
@@ -62,16 +58,16 @@
                        <version>2.0.8</version>
                </dependency>
 
-<!-- 
-               <dependency>
+               <!-- 
+                       <dependency>
                        <groupId>org.codehaus.castor</groupId>
                        <artifactId>castor</artifactId>
-               </dependency>
- -->
+                       </dependency>
+               -->
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
                        <scope>test</scope>
-               </dependency>           
+               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

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
index eed2346df40a80d916928b746ca0afcc7a59b5cb..0db6f9343316bc671481466d285bb08cd35964c3 100644 (file)
--- 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
@@ -34,8 +34,7 @@ public class AbstractDetachedActivator implements BundleActivator {
                        XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(
                                        (BeanDefinitionRegistry) applicationContext);
 
-                       URL url = bundle
-                                       .getResource("META-INF/slc/conf/applicationContext.xml");
+                       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 + ")");

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/AutoUiActivator.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/AutoUiActivator.java
deleted file mode 100644 (file)
index dd5b1e0..0000000
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/AutoUiActivator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.argeo.slc.detached;
-
-
-public class AutoUiActivator extends AbstractDetachedActivator {
-}

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiContext.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiContext.java
deleted file mode 100644 (file)
index 01fdba0..0000000
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiContext.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.argeo.slc.detached.rmi;
-
-public interface AutoUiContext {
-       public Object getLocalRef(String key);
-
-       public void setLocalRef(String key, Object ref);
-}

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiServer.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiServer.java
deleted file mode 100644 (file)
index e224eff..0000000
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiServer.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.argeo.slc.detached.rmi;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface AutoUiServer extends Remote {
-       public Object executeTask(AutoUiTask task) throws RemoteException;
-}

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiServerImpl.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiServerImpl.java
deleted file mode 100644 (file)
index fa102a2..0000000
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiServerImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.argeo.slc.detached.rmi;
-
-import java.rmi.Naming;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.Map;
-import java.util.TreeMap;
-
-public class AutoUiServerImpl extends UnicastRemoteObject implements
-               AutoUiServer, AutoUiContext {
-       private Map map = new TreeMap();
-
-       public AutoUiServerImpl() throws RemoteException {
-               super();
-       }
-
-       public Object executeTask(AutoUiTask task) throws RemoteException {
-               try {
-                       return task.execute(this);
-               } catch (Exception e) {
-                       throw new RemoteException("Coul not execute task.", e);
-               }
-       }
-
-       public Object getLocalRef(String key) {
-               return map.get(key);
-       }
-
-       public void setLocalRef(String key, Object ref) {
-               map.put(key, ref);
-       }
-
-       public static void main(String[] args) {
-               if (System.getSecurityManager() == null) {
-                       System.setSecurityManager(new SecurityManager());
-               }
-               try {
-                       String name = "AutoUiServer";
-                       AutoUiServer engine = new AutoUiServerImpl();
-                       // AutoUiServer stub = (AutoUiServer) UnicastRemoteObject
-                       // .exportObject(engine, 0);
-                       // Registry registry = LocateRegistry.getRegistry();
-                       // registry.rebind(name, stub);
-                       Naming.rebind(name, engine);
-                       System.out.println("AutoUiServer bound");
-
-               } catch (Exception e) {
-                       System.err.println("AutoUiServer exception:");
-                       e.printStackTrace();
-               }
-
-       }
-}

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiTask.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiTask.java
deleted file mode 100644 (file)
index 20d68a3..0000000
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/rmi/AutoUiTask.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.argeo.slc.detached.rmi;
-
-import java.io.Serializable;
-
-public interface AutoUiTask extends Serializable {
-       public Object execute(AutoUiContext context) throws Exception;
-}

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 ff1a465088d5b40ca91013455d1249ef314d8650..2c158afef58ebec128ddccf47d134287ff3ca772 100644 (file)
--- 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,10 +1,10 @@
 Manifest-Version: 1.0\r
-Export-Package: org.argeo.slc.detached.rmi,org.argeo.slc.detached;uses\r
- :="org.springframework.beans.factory.support,org.apache.commons.loggi\r
- ng,org.springframework.context.support,org.springframework.core.io,or\r
- g.osgi.framework,org.springframework.beans.factory.xml,org.springfram\r
- ework.context,org.springframework.beans.factory",org.argeo.slc.detach\r
- ed.drivers;uses:="org.argeo.slc.detached"\r
+Export-Package: org.argeo.slc.detached;uses:="org.springframework.bean\r
+ s.factory.support,org.apache.commons.logging,org.springframework.cont\r
+ ext.support,org.springframework.core.io,org.osgi.framework,org.spring\r
+ framework.beans.factory.xml,org.springframework.context,org.springfra\r
+ mework.beans.factory",org.argeo.slc.detached.drivers;uses:="org.argeo\r
+ .slc.detached"\r
 Built-By: mbaudier\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: Argeo SLC Detached\r
@@ -12,16 +12,15 @@ Created-By: Apache Maven Bundle Plugin
 Bundle-Vendor: Argeo\r
 Build-Jdk: 1.6.0\r
 Bundle-Version: 0.11.1.SNAPSHOT\r
-Bnd-LastModified: 1222615485731\r
+Bnd-LastModified: 1222616555343\r
 Bundle-ManifestVersion: 2\r
-Bundle-Activator: org.argeo.slc.detached.AutoUiActivator\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: SLC Distribution\r
 Import-Package: org.apache.commons.logging,org.argeo.slc.detached,org.\r
- argeo.slc.detached.drivers,org.argeo.slc.detached.rmi,org.osgi.framew\r
- ork,org.springframework.beans.factory,org.springframework.beans.facto\r
- ry.support,org.springframework.beans.factory.xml,org.springframework.\r
- context,org.springframework.context.support,org.springframework.core.\r
- io\r
+ argeo.slc.detached.drivers,org.osgi.framework,org.springframework.bea\r
+ ns.factory,org.springframework.beans.factory.support,org.springframew\r
+ ork.beans.factory.xml,org.springframework.context,org.springframework\r
+ .context.support,org.springframework.core.io\r
 Bundle-SymbolicName: org.argeo.slc.detached\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: Apache Maven Bundle Plugin\r