From ac67b0ccef6b1235afba3f8bb5861c1333b6344e Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 29 Jul 2014 17:40:38 +0200 Subject: Reinstated URL parameter to CastorXMLUtility (other modules use their own instances of it) Renamed variables back to their original names --- src/test/java/MainTest.java | 11 +---------- src/test/resources/server.conf | 3 ++- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src/test') diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java index 431c4c0..ccef17a 100644 --- a/src/test/java/MainTest.java +++ b/src/test/java/MainTest.java @@ -12,7 +12,6 @@ import com.c2kernel.persistency.outcome.SchemaValidator; import com.c2kernel.process.Gateway; import com.c2kernel.scripting.Script; import com.c2kernel.utils.CastorXMLUtility; -import com.c2kernel.scripting.ScriptParsingException; import com.c2kernel.utils.FileStringUtility; import com.c2kernel.utils.Logger; @@ -37,16 +36,8 @@ public class MainTest { } } - /** - * @throws Exception - */ public void testMapFiles() throws Exception { - - Properties wAppProperties = new Properties(); - wAppProperties.put(CastorXMLUtility.CASTOR_XML_SERIALIZER_FACTORY, - "org.exolab.castor.xml.XercesXMLSerializerFactory"); - - new CastorXMLUtility(Gateway.getResource(), wAppProperties, "mapFiles/"); + new CastorXMLUtility(Gateway.getResource(), Gateway.getProperties(), Gateway.getResource().getKernelResourceURL("mapFiles/")); } public void testBootItems() throws Exception { diff --git a/src/test/resources/server.conf b/src/test/resources/server.conf index 476aeb0..c8a072a 100644 --- a/src/test/resources/server.conf +++ b/src/test/resources/server.conf @@ -1 +1,2 @@ -ClusterStorage=MemoryOnlyClusterStorage \ No newline at end of file +ClusterStorage=MemoryOnlyClusterStorage +org.exolab.castor.xml.serializer.factory=org.exolab.castor.xml.XercesXMLSerializerFactory \ No newline at end of file -- cgit v1.2.3