From 293dfcc0e7dbb3d7a6e3db1ee7b95ae52d1d565c Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 28 Aug 2007 11:41:56 +0000
Subject: [PATCH] Tidy up dependencies inintegration tests

---
 integration/pom.xml                           |  4 ++
 .../DerbyDataSourceFactoryBean.java           | 71 -------------------
 2 files changed, 4 insertions(+), 71 deletions(-)

diff --git a/integration/pom.xml b/integration/pom.xml
index 91580602b..af066848e 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -57,6 +57,10 @@
 					<groupId>mx4j</groupId>
 					<artifactId>mx4j</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+				</exclusion>
 			</exclusions>
 			<scope>test</scope>
 		</dependency>
diff --git a/integration/src/main/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/integration/src/main/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
index 82da4b7b1..de5db29a3 100644
--- a/integration/src/main/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
+++ b/integration/src/main/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
@@ -1,43 +1,18 @@
 package test.jdbc.datasource;
 
 import java.io.File;
-import java.io.IOException;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.derby.jdbc.EmbeddedDataSource;
-import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.util.StringUtils;
 
 public class DerbyDataSourceFactoryBean extends AbstractFactoryBean {
 
 	private String dataDirectory = "derby-home";
 
-	private Resource initScript;
-
-	private Resource destroyScript;
-
 	DataSource dataSource;
 
-	public void destroy() throws Exception {
-		super.destroy();
-
-		try {
-			doExecuteScript(destroyScript);
-		}
-		catch (Exception e) {
-			logger.warn("Could not execute destroy script [" + destroyScript + "]", e);
-		}
-	}
-
 	public void setDataDirectory(String dataDirectory) {
 		this.dataDirectory = dataDirectory;
 	}
@@ -53,57 +28,11 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean {
 		ds.setCreateDatabase("create");
 		dataSource = ds;
 
-		try {
-			doExecuteScript(destroyScript);
-		}
-		catch (Exception e) {
-			logger.debug("Could not execute destroy script [" + destroyScript + "]", e);
-		}
-		doExecuteScript(initScript);
 		return ds;
 	}
 
-	private void doExecuteScript(final Resource scriptResource) {
-		if (scriptResource == null || !scriptResource.exists())
-			return;
-		TransactionTemplate transactionTemplate = new TransactionTemplate(new DataSourceTransactionManager(dataSource));
-		if (initScript != null) {
-			transactionTemplate.execute(new TransactionCallback() {
-
-				public Object doInTransaction(TransactionStatus status) {
-					JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-					String[] scripts;
-					try {
-						scripts = StringUtils.delimitedListToStringArray(IOUtils.toString(scriptResource
-								.getInputStream()), ";");
-					}
-					catch (IOException e) {
-						throw new BeanInitializationException("Cannot load script from [" + initScript + "]", e);
-					}
-					for (int i = 0; i < scripts.length; i++) {
-						String script = scripts[i].trim();
-						if (StringUtils.hasText(script)) {
-							jdbcTemplate.execute(scripts[i]);
-						}
-					}
-					return null;
-				}
-
-			});
-
-		}
-	}
-
 	public Class getObjectType() {
 		return DataSource.class;
 	}
 
-	public void setInitScript(Resource initScript) {
-		this.initScript = initScript;
-	}
-
-	public void setDestroyScript(Resource destroyScript) {
-		this.destroyScript = destroyScript;
-	}
-
 }