svn commit: r357126 - /incubator/activemq/trunk/assembly/src/test/org/activemq/config/ConfigTest.java

[jlim]

Author: jlim
Date: Thu Dec 15 21:48:56 2005
New Revision: 357126

URL: http://svn.apache.org/viewcvs?rev=357126&view=rev
Log:
committed the wrong file earlier. Also added the correct header

Modified:
    
incubator/activemq/trunk/assembly/src/test/org/activemq/config/ConfigTest.java

Modified: 
incubator/activemq/trunk/assembly/src/test/org/activemq/config/ConfigTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/org/activemq/config/ConfigTest.java?rev=357126&r1=357125&r2=357126&view=diff
==============================================================================
--- 
incubator/activemq/trunk/assembly/src/test/org/activemq/config/ConfigTest.java 
(original)
+++ 
incubator/activemq/trunk/assembly/src/test/org/activemq/config/ConfigTest.java 
Thu Dec 15 21:48:56 2005
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2004 Protique Ltd
+ * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
 import org.activemq.store.jdbc.JDBCPersistenceAdapter;
 import org.activemq.store.journal.JournalPersistenceAdapter;
 import org.activemq.memory.UsageManager;
-import org.activemq.ActiveMQConnectionFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -71,14 +70,10 @@
 
         // Create broker from resource
         System.out.print("Creating broker... ");
-        broker = createBroker("org/activemq/config/activemq.xml");
+        broker = createBroker("org/activemq/config/example.xml");
         System.out.println("Success");
 
         try {
-
-        //    ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
-        //    factory.
-            /*
             // Check broker configuration
             System.out.print("Checking broker configurations... ");
             assertEquals("Broker Config Error (brokerName)", 
"brokerConfigTest", broker.getBrokerName());
@@ -196,15 +191,9 @@
             System.out.print("Checking if persistence adapter was succesfully 
created... ");
             assertTrue("Should have created a journal persistence adapter", 
broker.getPersistenceAdapter() instanceof JournalPersistenceAdapter);
             System.out.println("Success");
-
-            */
-
-        }catch(Exception e){
-             fail("Exception Starting Broker: "+ e.toString());
         } finally {
-            System.out.println("*******************");
             if (broker != null) {
-               broker.stop();
+                broker.stop();
             }
         }
     }
@@ -385,7 +374,9 @@
 
         assertTrue("Should have a broker!", broker != null);
 
-        broker.start();
+        //Broker is already started by default when using the XML file
+       // broker.start();
+
         return broker;
     }
 }