From 0ac058008df6cb8cdb27137bff23150e959a149f Mon Sep 17 00:00:00 2001
From: Dustin Johnson <Dustin.P.Johnson@raytheon.com>
Date: Thu, 30 May 2013 09:03:05 -0500
Subject: [PATCH] Issue #2038 Remove unused schemas from datadelivery spring
 files

Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: b99a8bc4f998885f420007a545ce80a62bf51a0e [formerly efc3c6a2f2f2c851011b517fc192976144895793 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]
Former-commit-id: efc3c6a2f2f2c851011b517fc192976144895793
Former-commit-id: 463bed7647668e3f9687e706cf542bd0a522ee17
---
 cave/com.raytheon.viz.gfe/res/spring/gfe.xml  |  7 +------
 edexOsgi/build.edex/esb/conf/spring/edex.xml  |  7 +------
 .../res/spring/datadelivery-service.xml       | 12 ++++++------
 .../spring/bandwidth-datadelivery-daos.xml    |  5 ++---
 .../bandwidth-datadelivery-edex-impl.xml      |  4 +---
 .../bandwidth-datadelivery-wfo-router.xml     |  5 ++---
 .../res/spring/retrieval-datadelivery.xml     |  3 +--
 .../spring/datadelivery-service-handlers.xml  |  6 ++----
 .../res/spring/nwsauth-request.xml            |  6 ++----
 .../res/spring/ebxml-webserver.xml            |  6 ++----
 .../res/spring/ebxml.xml                      |  6 ++----
 .../res/spring/useradmin-request.xml          |  6 ++----
 .../ebxml/dao/AbstractRegistryTest.java       |  9 +--------
 .../LifecycleManagerSubmitObjectsTest.java    | 19 -------------------
 .../ebxml/dao/PluginSubscribedListener.java   |  4 +++-
 tests/resources/unit-test-db-beans.xml        |  9 +++------
 tests/resources/unit-test-db-beans2.xml       |  9 +++------
 tests/resources/unit-test-db-session.xml      | 18 ++++++++++--------
 tests/runTests.sh                             | 11 +++++++++--
 .../dao/sessionManagedServiceTest.xml         |  7 ++-----
 20 files changed, 55 insertions(+), 104 deletions(-)

diff --git a/cave/com.raytheon.viz.gfe/res/spring/gfe.xml b/cave/com.raytheon.viz.gfe/res/spring/gfe.xml
index dec76c009a..357da0db2e 100644
--- a/cave/com.raytheon.viz.gfe/res/spring/gfe.xml
+++ b/cave/com.raytheon.viz.gfe/res/spring/gfe.xml
@@ -1,12 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-  http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
   
         <bean id="gfeClientConfig" class="com.raytheon.viz.gfe.core.GfeClientConfig" factory-method="getInstance">
            <property name="maxSaveThreads" value="3"/>
diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml
index 5a318a163e..84cdffbbf1 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml
@@ -2,16 +2,11 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
   xmlns:util="http://www.springframework.org/schema/util"
-  xmlns:tx="http://www.springframework.org/schema/tx"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-3.1.xsd
-  http://www.springframework.org/schema/tx
-  http://www.springframework.org/schema/tx/spring-tx.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
   
   	<!-- Separated out database specific beans to seperate file so they can be loaded by themselves if necessary -->
   	<import resource="file:///${edex.home}/conf/spring/edex-db.xml"/>
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml b/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml
index 02a0624419..67e0b5d076 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml
@@ -1,15 +1,15 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-  http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+    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-3.1.xsd">
 
     <bean id="subscriptionNotificationService"
         class="com.raytheon.uf.common.datadelivery.service.SendToServerSubscriptionNotificationService" />
 
-    <bean id="subscriptionDuplicateChecker" class="com.raytheon.uf.common.datadelivery.service.subscription.SubscriptionDuplicateChecker" />
+    <bean id="subscriptionDuplicateChecker"
+        class="com.raytheon.uf.common.datadelivery.service.subscription.SubscriptionDuplicateChecker" />
 
-    <bean id="subscriptionOverlapService" class="com.raytheon.uf.common.datadelivery.service.subscription.SubscriptionOverlapService">
+    <bean id="subscriptionOverlapService"
+        class="com.raytheon.uf.common.datadelivery.service.subscription.SubscriptionOverlapService">
         <constructor-arg ref="subscriptionDuplicateChecker" />
     </bean>
 
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml
index f93d42e705..b66ff8e2cc 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:util="http://www.springframework.org/schema/util" 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-3.1.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+    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-3.1.xsd">
 
     <bean id="bandwidthAllocationDao"
         class="com.raytheon.uf.edex.datadelivery.bandwidth.hibernate.BandwidthAllocationDao">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
index cea335206d..292e7cf6ca 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
@@ -1,10 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:tx="http://www.springframework.org/schema/tx"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
       http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <tx:annotation-driven transaction-manager="metadataTxManager"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml
index 4dd231972d..65e667618b 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:util="http://www.springframework.org/schema/util" 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-3.1.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+    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-3.1.xsd">
 
     <bean id="ncfBandwidthManagerServiceRouter" class="com.raytheon.uf.edex.auth.RemoteServerRequestRouter">
         <constructor-arg value="${NCF_BANDWIDTH_MANAGER_SERVICE}" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
index cd0b177b13..79a95672fa 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+    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-3.1.xsd
-  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="ddRetrievalDatabaseProperties"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
index f6e824b2a1..08985c753d 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-  http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+    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-3.1.xsd">
 
     <bean id="datadeliveryAuthorization"
         class="com.raytheon.uf.edex.datadelivery.service.services.DataDeliveryPrivilegedRequestHandler" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
index 5d9a0c0591..5ba553fac3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-  http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+    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-3.1.xsd">
 
     <bean id="roleStorage" class="com.raytheon.uf.edex.plugin.nwsauth.NwsRoleStorage" />
     <bean id="authenticator"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
index 750501e6ec..fa5c9fff7a 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
-  http://www.springframework.org/schema/tx
-  http://www.springframework.org/schema/tx/spring-tx.xsd">
+	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-3.1.xsd">
 
 	<bean id="ebxmlRegistryWebServer" class="org.eclipse.jetty.server.Server"
 		init-method="start" destroy-method="stop">
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
index 6f37bea8d7..a062e3713d 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd 
-  http://www.springframework.org/schema/tx
-  http://www.springframework.org/schema/tx/spring-tx.xsd">
+	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-3.1.xsd">
 
 	<bean id="registrySubscriptionManagerInvoker"
 		class="com.raytheon.uf.edex.registry.ebxml.dao.EsbRouteRegistrySubscriptionManagerInvocation" />
diff --git a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
index 1d8a5a43a6..cb98375d92 100644
--- a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-  http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+    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-3.1.xsd">
 
     <bean id="userAdminAuthorization"
         class="com.raytheon.uf.edex.useradmin.services.UserAdminPrivilegedRequestHandler" />
diff --git a/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/AbstractRegistryTest.java b/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/AbstractRegistryTest.java
index 35d60c8575..78e1435d9c 100644
--- a/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/AbstractRegistryTest.java
+++ b/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/AbstractRegistryTest.java
@@ -47,7 +47,6 @@ import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryExceptionType;
 import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryResponseStatus;
 import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryResponseType;
 
-import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +58,6 @@ import org.springframework.transaction.annotation.Transactional;
 import com.google.common.collect.Lists;
 import com.raytheon.uf.common.registry.ebxml.RegistryUtil;
 import com.raytheon.uf.common.util.SpringFiles;
-import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.database.dao.DatabaseUtil;
 import com.raytheon.uf.edex.registry.ebxml.services.query.QueryConstants;
 import com.raytheon.uf.edex.registry.ebxml.services.query.QueryManagerImpl.RETURN_TYPE;
@@ -107,14 +105,9 @@ public class AbstractRegistryTest {
     @Autowired
     protected LifecycleManager lifecycleManager;
 
+    @Autowired
     protected QueryManager queryManager;
 
-    @Before
-    public void setUp() {
-        this.queryManager = EDEXUtil.getESBComponent(QueryManager.class,
-                "queryServiceImpl");
-    }
-
     /**
      * Submits the registry object to the registry and verifies it was
      * successfully processed.
diff --git a/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/LifecycleManagerSubmitObjectsTest.java b/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/LifecycleManagerSubmitObjectsTest.java
index fcf85e1277..e61cf3e73f 100644
--- a/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/LifecycleManagerSubmitObjectsTest.java
+++ b/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/LifecycleManagerSubmitObjectsTest.java
@@ -47,15 +47,8 @@ import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryResponseType;
 import oasis.names.tc.ebxml.regrep.xsd.rs.v4.UnresolvedReferenceExceptionType;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.transaction.TransactionConfiguration;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.google.common.collect.Sets;
-import com.raytheon.uf.common.util.SpringFiles;
-import com.raytheon.uf.edex.database.dao.DatabaseUtil;
 
 /**
  * Test {@link LifecycleManager} submit objects functionality.
@@ -76,18 +69,6 @@ import com.raytheon.uf.edex.database.dao.DatabaseUtil;
  * @author djohnson
  * @version 1.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { DatabaseUtil.UNIT_TEST_DB_BEANS_XML,
-        SpringFiles.EVENTBUS_COMMON_XML,
-        SpringFiles.EBXML_XML, SpringFiles.EBXML_IMPL_XML,
-        SpringFiles.EBXML_QUERYTYPES_XML, SpringFiles.EBXML_REGISTRY_DAO_XML,
-        SpringFiles.EBXML_WEBSERVICES_XML, SpringFiles.EBXML_XACML_XML,
-        SpringFiles.EBXML_VALIDATOR_PLUGINS_XML,
-        SpringFiles.EBXML_SUBSCRIPTION_XML,
-        SpringFiles.UNIT_TEST_EBXML_BEANS_XML,
-        SpringFiles.UNIT_TEST_LOCALIZATION_BEANS_XML })
-@TransactionConfiguration(transactionManager = "metadataTxManager", defaultRollback = true)
-@Transactional
 public class LifecycleManagerSubmitObjectsTest extends AbstractRegistryTest {
 
     /**
diff --git a/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/PluginSubscribedListener.java b/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/PluginSubscribedListener.java
index 8493f60206..be50e5f072 100644
--- a/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/PluginSubscribedListener.java
+++ b/tests/integration/com/raytheon/uf/edex/registry/ebxml/dao/PluginSubscribedListener.java
@@ -22,6 +22,8 @@ package com.raytheon.uf.edex.registry.ebxml.dao;
 import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.NotificationListener;
 import oasis.names.tc.ebxml.regrep.xsd.rim.v4.NotificationType;
 
+import org.junit.Ignore;
+
 /**
  * A plugin subscribed listener.
  * 
@@ -38,7 +40,7 @@ import oasis.names.tc.ebxml.regrep.xsd.rim.v4.NotificationType;
  * @author djohnson
  * @version 1.0
  */
-
+@Ignore
 public class PluginSubscribedListener implements NotificationListener {
 
     private boolean notified;
diff --git a/tests/resources/unit-test-db-beans.xml b/tests/resources/unit-test-db-beans.xml
index 83ff494d92..e3504e2868 100644
--- a/tests/resources/unit-test-db-beans.xml
+++ b/tests/resources/unit-test-db-beans.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:tx="http://www.springframework.org/schema/tx"
+    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.xsd
-                           http://www.springframework.org/schema/tx
-                           http://www.springframework.org/schema/tx/spring-tx.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean
         class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="location">
             <value>classpath:/unit-test-db-beans.properties</value>
         </property>
-        <property name="ignoreUnresolvablePlaceholders" value="true"/>
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
     </bean>
 
     <import resource="classpath:/unit-test-db-session.xml" />
diff --git a/tests/resources/unit-test-db-beans2.xml b/tests/resources/unit-test-db-beans2.xml
index 1ad00562e5..3659363320 100644
--- a/tests/resources/unit-test-db-beans2.xml
+++ b/tests/resources/unit-test-db-beans2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:tx="http://www.springframework.org/schema/tx"
+    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.xsd
-                           http://www.springframework.org/schema/tx
-                           http://www.springframework.org/schema/tx/spring-tx.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- Used in the case where a second in-memory database needs to be started 
         in the same unit test -->
@@ -15,7 +12,7 @@
         <property name="location">
             <value>classpath:/unit-test-db-beans2.properties</value>
         </property>
-        <property name="ignoreUnresolvablePlaceholders" value="true"/>
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
     </bean>
 
     <import resource="classpath:/unit-test-db-session.xml" />
diff --git a/tests/resources/unit-test-db-session.xml b/tests/resources/unit-test-db-session.xml
index bb5e6579ed..b5141866d8 100644
--- a/tests/resources/unit-test-db-session.xml
+++ b/tests/resources/unit-test-db-session.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:tx="http://www.springframework.org/schema/tx"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
     xsi:schemaLocation="http://www.springframework.org/schema/beans 
                            http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/tx
@@ -22,24 +21,27 @@
         </property>
     </bean>
 
-    <tx:annotation-driven transaction-manager="metadataTxManager" proxy-target-class="true" />
+    <tx:annotation-driven transaction-manager="metadataTxManager"
+        proxy-target-class="true" />
 
     <bean id="metadataTxManager"
         class="org.springframework.orm.hibernate3.HibernateTransactionManager">
         <property name="sessionFactory" ref="metadataSessionFactory" />
     </bean>
-    
-    <bean id="metadataTxTemplate" class="org.springframework.transaction.support.TransactionTemplate">
-        <property name="transactionManager" ref="metadataTxManager"/>
+
+    <bean id="metadataTxTemplate"
+        class="org.springframework.transaction.support.TransactionTemplate">
+        <property name="transactionManager" ref="metadataTxManager" />
     </bean>
 
     <!-- Register the application context with EDEXUtil -->
     <bean class="com.raytheon.uf.edex.core.EDEXUtil" />
-    
+
     <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
         destroy-method="close">
         <property name="driverClassName" value="org.h2.Driver" />
-        <property name="url" value="${unit.test.jdbc.url}:;INIT=create schema IF NOT EXISTS ebxml" />
+        <property name="url"
+            value="${unit.test.jdbc.url}:;INIT=create schema IF NOT EXISTS ebxml" />
         <property name="username" value="sa" />
         <property name="password" value="" />
         <property name="defaultAutoCommit" value="false" />
diff --git a/tests/runTests.sh b/tests/runTests.sh
index 935cb539f8..85c426abaa 100644
--- a/tests/runTests.sh
+++ b/tests/runTests.sh
@@ -1,7 +1,14 @@
 #!/bin/sh
 
-INITIAL_PERMGEN_SIZE="64m"
-MAX_PERMGEN_SIZE="128m"
+if [ "${INITIAL_PERMGEN_SIZE}" = "" ]
+then
+   export INITIAL_PERMGEN_SIZE="64m"
+fi
+
+if [ "${MAX_PERMGEN_SIZE}" = "" ]
+then
+   export MAX_PERMGEN_SIZE="192m"
+fi
 
 export ANT_OPTS="-XX:PermSize=${INITIAL_PERMGEN_SIZE} -XX:MaxPermSize=${MAX_PERMGEN_SIZE}"
 ant
diff --git a/tests/unit/com/raytheon/uf/edex/database/dao/sessionManagedServiceTest.xml b/tests/unit/com/raytheon/uf/edex/database/dao/sessionManagedServiceTest.xml
index 9bfdd3b935..32460cd189 100644
--- a/tests/unit/com/raytheon/uf/edex/database/dao/sessionManagedServiceTest.xml
+++ b/tests/unit/com/raytheon/uf/edex/database/dao/sessionManagedServiceTest.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:tx="http://www.springframework.org/schema/tx"
+    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.xsd
-                           http://www.springframework.org/schema/tx
-                           http://www.springframework.org/schema/tx/spring-tx.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="mockService" class="com.raytheon.uf.edex.database.dao.MockService">
         <property name="sessionFactory" ref="metadataSessionFactory" />