Remove unused code

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

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 5a265ae9a7ae9fb4a781edaa8743446f0e3cd5be..a21f6f66e681f53e3467ad0b032e173e752e3ef1 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -55,6 +55,13 @@
                        <type>pom</type>
                </dependency>
 
+               <!-- Argeo Server -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.core</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+
                <!-- Argeo Security -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>

diff --git a/server/runtime/org.argeo.server.core/JndiJmsBinder.txt b/server/runtime/org.argeo.server.core/JndiJmsBinder.txt
deleted file mode 100644 (file)
index 3b08284..0000000
--- a/server/runtime/org.argeo.server.core/JndiJmsBinder.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.hsbc.xfos.swapswire.jms;\r
-\r
-import java.util.Map;\r
-\r
-import javax.jms.ConnectionFactory;\r
-import javax.jms.Destination;\r
-\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-import org.springframework.beans.factory.DisposableBean;\r
-import org.springframework.beans.factory.InitializingBean;\r
-import org.springframework.jndi.JndiTemplate;\r
-\r
-/** Register/unregister a JMS connection factory in JNDI. */\r
-public class JndiJmsBinder implements InitializingBean, DisposableBean {\r
-       private final static Log log = LogFactory.getLog(JndiJmsBinder.class);\r
-\r
-       private ConnectionFactory jmsConnectionFactory;\r
-       private JndiTemplate jndiTemplate;\r
-       private String connectionFactoryName;\r
-       private Map<String, Destination> destinations;\r
-\r
-       public void afterPropertiesSet() {\r
-               try {\r
-                       Thread.sleep(5000);\r
-                       jndiTemplate.bind(connectionFactoryName, jmsConnectionFactory);\r
-                       for (String key : destinations.keySet())\r
-                               jndiTemplate.bind(key, destinations.get(key));\r
-                       log.info("JMS object bound to JNDI");\r
-               } catch (Exception e) {\r
-                       throw new RuntimeException("Cannot bind JMS objects", e);\r
-               }\r
-       }\r
-\r
-       public void destroy() {\r
-               try {\r
-                       for (String key : destinations.keySet())\r
-                               jndiTemplate.unbind(key);\r
-                       jndiTemplate.unbind(connectionFactoryName);\r
-                       log.info("JMS object unbound to JNDI");\r
-               } catch (Exception e) {\r
-                       throw new RuntimeException("Cannot unbind JMS objects", e);\r
-               }\r
-       }\r
-\r
-       public void setJmsConnectionFactory(ConnectionFactory jmsConnectionFactory) {\r
-               this.jmsConnectionFactory = jmsConnectionFactory;\r
-       }\r
-\r
-       public void setJndiTemplate(JndiTemplate jndiTemplate) {\r
-               this.jndiTemplate = jndiTemplate;\r
-       }\r
-\r
-       public void setConnectionFactoryName(String connectionFactoryName) {\r
-               this.connectionFactoryName = connectionFactoryName;\r
-       }\r
-\r
-       public void setDestinations(Map<String, Destination> destinations) {\r
-               this.destinations = destinations;\r
-       }\r
-\r
-}\r

diff --git a/server/runtime/org.argeo.server.core/build.properties b/server/runtime/org.argeo.server.core/build.properties
index 83ef3111849539a43064602d639d61cf16cba506..23bde2468660f6057720a82db73d900f16c70bae 100644 (file)
--- a/server/runtime/org.argeo.server.core/build.properties
+++ b/server/runtime/org.argeo.server.core/build.properties
@@ -1,4 +1 @@
-additional.bundles = org.springframework.web,\
-                     org.springframework.web.servlet,\
-                     org.springframework.xml
 source.. = src/main/java/

diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml
index 6d3d914bef267c468a6adf107d2df20e87887ac4..2173bac671d5f91ba85b605f74a00e53c01acc21 100644 (file)
--- a/server/runtime/org.argeo.server.core/pom.xml
+++ b/server/runtime/org.argeo.server.core/pom.xml
@@ -46,18 +46,15 @@
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
 
-               <!-- JCR -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.jcr</artifactId>
-                       <version>1.1.4-SNAPSHOT</version>
-               </dependency>
-
                <!-- Apache Commons -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.apache.commons.io</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.vfs</artifactId>
+               </dependency>
 
                <!-- Spring -->
                <dependency>
@@ -66,11 +63,19 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.web.servlet</artifactId>
+                       <artifactId>org.springframework.beans</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.oxm</artifactId>
+                       <artifactId>org.springframework.context</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.web.servlet</artifactId>
                </dependency>
 
                <!-- J2EE -->