Author: aco
Date: Thu Nov  9 23:29:23 2006
New Revision: 473224

URL: http://svn.apache.org/viewvc?view=rev&rev=473224
Log:
Fix some failing test cases in windows.

Modified:
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java?view=diff&rev=473224&r1=473223&r2=473224
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java Thu Nov  9 23:29:23 2006
@@ -44,8 +44,8 @@
         // configure the embedded broker using an XML config file
         // which is either a URL or a resource on the classpath
         
-        File f = new File(System.getProperty("basedir", "."));
-        properties.put(Context.PROVIDER_URL, "vm://localhost?brokerConfig=xbean:file:"+f+"/src/test/resources/activemq.xml");
+        File f = new File(System.getProperty("basedir", "."), "/src/test/resources/activemq.xml");
+        properties.put(Context.PROVIDER_URL, "vm://localhost?brokerConfig=xbean:" + f.toURI());
 
         InitialContext context = new InitialContext(properties);
         ActiveMQConnectionFactory connectionFactory = (ActiveMQConnectionFactory) context.lookup("ConnectionFactory");

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java?view=diff&rev=473224&r1=473223&r2=473224
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java Thu Nov  9 23:29:23 2006
@@ -115,6 +115,8 @@
      */
     public void testJdbcConfig() throws Exception {
 //        System.out.print("Checking jdbc persistence adapter configuration... ");
+        File derbyFile = new File(DERBY_ROOT + "testJDBCConfig/derbydb"); // Default derby name
+        recursiveDelete(derbyFile);
 
         BrokerService broker;
         broker = createBroker(new FileSystemResource(CONF_ROOT + "jdbc-example.xml"));