From 31dc5165b031f789381e6af8aa81f1a75661bd86 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 3 Oct 2012 14:15:04 +0000
Subject: [PATCH] Remove unused code

git-svn-id: https://svn.argeo.org/commons/trunk@5580 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../dep/org.argeo.security.dep.node/pom.xml   |  7 +++
 .../org.argeo.server.core/JndiJmsBinder.txt   | 62 -------------------
 .../org.argeo.server.core/build.properties    |  3 -
 server/runtime/org.argeo.server.core/pom.xml  | 23 ++++---
 4 files changed, 21 insertions(+), 74 deletions(-)
 delete mode 100644 server/runtime/org.argeo.server.core/JndiJmsBinder.txt

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 5a265ae9a..a21f6f66e 100644
--- 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
index 3b08284f7..000000000
--- a/server/runtime/org.argeo.server.core/JndiJmsBinder.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.hsbc.xfos.swapswire.jms;
-
-import java.util.Map;
-
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jndi.JndiTemplate;
-
-/** Register/unregister a JMS connection factory in JNDI. */
-public class JndiJmsBinder implements InitializingBean, DisposableBean {
-	private final static Log log = LogFactory.getLog(JndiJmsBinder.class);
-
-	private ConnectionFactory jmsConnectionFactory;
-	private JndiTemplate jndiTemplate;
-	private String connectionFactoryName;
-	private Map<String, Destination> destinations;
-
-	public void afterPropertiesSet() {
-		try {
-			Thread.sleep(5000);
-			jndiTemplate.bind(connectionFactoryName, jmsConnectionFactory);
-			for (String key : destinations.keySet())
-				jndiTemplate.bind(key, destinations.get(key));
-			log.info("JMS object bound to JNDI");
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot bind JMS objects", e);
-		}
-	}
-
-	public void destroy() {
-		try {
-			for (String key : destinations.keySet())
-				jndiTemplate.unbind(key);
-			jndiTemplate.unbind(connectionFactoryName);
-			log.info("JMS object unbound to JNDI");
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot unbind JMS objects", e);
-		}
-	}
-
-	public void setJmsConnectionFactory(ConnectionFactory jmsConnectionFactory) {
-		this.jmsConnectionFactory = jmsConnectionFactory;
-	}
-
-	public void setJndiTemplate(JndiTemplate jndiTemplate) {
-		this.jndiTemplate = jndiTemplate;
-	}
-
-	public void setConnectionFactoryName(String connectionFactoryName) {
-		this.connectionFactoryName = connectionFactoryName;
-	}
-
-	public void setDestinations(Map<String, Destination> destinations) {
-		this.destinations = destinations;
-	}
-
-}
diff --git a/server/runtime/org.argeo.server.core/build.properties b/server/runtime/org.argeo.server.core/build.properties
index 83ef31118..23bde2468 100644
--- 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 6d3d914be..2173bac67 100644
--- 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 -->
-- 
2.30.2