[jboss-svn-commits] JBL Code SVN: r11597 - in labs/jbossesb/trunk: product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed May 2 19:25:39 EDT 2007


Author: kurt.stam at jboss.com
Date: 2007-05-02 19:25:39 -0400 (Wed, 02 May 2007)
New Revision: 11597

Added:
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml
Removed:
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/HsqldbUtil.java
Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
   labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
Log:
JBESB-418, adding qa test for the MessagePersister.

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java	2007-05-02 22:48:46 UTC (rev 11596)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java	2007-05-02 23:25:39 UTC (rev 11597)
@@ -74,4 +74,11 @@
 	 */
 	public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException;
 
+    /**
+     * Get a map of all messages for a certain classification.
+     * @return map
+     * @param classification
+     * @throws MessageStoreException
+     */
+    public Map<URI, Message> getDeliveredMessages(String classification) throws MessageStoreException;
 }
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-05-02 22:48:46 UTC (rev 11596)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-05-02 23:25:39 UTC (rev 11597)
@@ -221,7 +221,7 @@
 	 */
 	public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
 		HashMap<URI, Message> messages = new HashMap<URI, Message>();
-		String sql = "select uuid from message where delivered='FALSE'";
+		String sql = "select uuid from message where delivered='TRUE'";
         if (classification!=null) {
             sql += " and classification='" + classification + "'";
         }
@@ -256,7 +256,51 @@
 		return messages;
 		
 	}
+    
+    /**
+     * This method can be used to retrieve a collection of all from the message-store
+     * You should test for 'null' on the return type to see if any messages exist in the collection
+     * @return Map<URI, Message> - a collection of all the undelivered messages in the message-store
+     * @throws MessageStoreException
+     */
+    public Map<URI, Message> getDeliveredMessages(String classification) throws MessageStoreException {
+        HashMap<URI, Message> messages = new HashMap<URI, Message>();
+        String sql = "select uuid from message where delivered!='FALSE'";
+        if (classification!=null) {
+            sql += " and classification='" + classification + "'";
+        }
+        
+        try
+        {
+            conn = mgr.getConnection();
+            Statement stmt;
+            ResultSet rs;
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql);
+            
+            while (rs.next()) {
+                URI uid = new URI(rs.getString(1));
+                Message msg = getMessage(uid);
+                messages.put(uid, msg);
+            }
+            rs.close();
+            stmt.close();
 
+        }
+        catch (Exception e)
+        {
+            logger.error(e);
+            throw new MessageStoreException(e);
+        } 
+        finally
+        {
+            release();
+        }
+        logger.info("retrieved " + messages.size() + " undelivered messages");
+        return messages;
+        
+    }
+
 	private void release ()
 	{
 

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-05-02 22:48:46 UTC (rev 11596)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-05-02 23:25:39 UTC (rev 11597)
@@ -245,6 +245,15 @@
 	public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
 		return new HashMap<URI, Message>();
 	}
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.jboss.soa.esb.services.persistence.MessageStore#getUndeliveredMessages()
+     */
+    public Map<URI, Message> getDeliveredMessages(String classification) throws MessageStoreException {
+        return new HashMap<URI, Message>();
+    }
 
 	/*
 	 * (non-Javadoc)

Modified: labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml	2007-05-02 22:48:46 UTC (rev 11596)
+++ labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml	2007-05-02 23:25:39 UTC (rev 11597)
@@ -68,7 +68,7 @@
 	    <property name="org.jboss.soa.esb.persistence.db.datasource.name" 	value="java:/JBossesbDS"/>
 		
 		<!-- standalone connection pooling settings -->
-		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/jbossesb"/>
+		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/juddi"/>
 		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
 		<property name="org.jboss.soa.esb.persistence.db.user" 				value="sa"/>
 		<property name="org.jboss.soa.esb.persistence.db.pwd" 				value=""/>		

Added: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	                        (rev 0)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	2007-05-02 23:25:39 UTC (rev 11597)
@@ -0,0 +1,288 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.xml.DOMConfigurator;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.addressing.MalformedEPRException;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.couriers.Courier;
+import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.couriers.CourierFactory;
+import org.jboss.soa.esb.listeners.StandAloneBootStrapper;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.services.persistence.MessageStoreFactory;
+import org.jboss.soa.esb.services.persistence.MessageStoreType;
+import org.jboss.soa.esb.services.registry.Registry;
+import org.jboss.soa.esb.services.registry.RegistryException;
+import org.jboss.soa.esb.services.registry.RegistryFactory;
+import org.jboss.soa.esb.testutils.FileUtil;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Testing the MessagePersister.
+ * 
+ * @author <a href="mailto:kurt.stam at redhat.com">Kurt Stam</a>
+ * 
+ */
+public class MessagePersisterTest
+{
+	private static Logger logger = Logger.getLogger(MessagePersisterTest.class);
+
+	private static StandAloneBootStrapper _boot = null;
+
+	private static String mDbDriver;
+
+	private static String mDbUrl;
+
+	private static String mDbUsername;
+
+	private static String mDbPassword;
+
+	private static final String SERVICE_CATEGORY_NAME = "Persistance";
+
+	private static final String SERVICE_NAME = "persister";
+
+	/**
+	 * Testing the MessagePersister.
+	 */
+	@Test
+	public void sendMessage()
+	{
+		try
+		{
+            Date now = new Date();
+            String body = "<message>First Message " + now + " </message>";
+			sendMessage(body);
+             //now we can check the messageStore to see if our message made it in there.
+            MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
+            Map<URI, Message> messages = store.getDeliveredMessages("TEST");
+            assertEquals(1, messages.size());
+            
+            //Now check if it is the same message
+            Message message=messages.values().iterator().next();
+            String bodyFromStore = new String(message.getBody().getContents());
+            assertEquals(body, bodyFromStore);
+		}
+		catch (Exception re)
+		{
+			re.printStackTrace();
+			assertTrue(false);
+		}
+	}
+
+	/**
+	 * Sends a message to the CbrJmsQueueListener.
+	 * 
+	 * @param body -
+	 *            a String containing the body of the message.
+	 * @throws RegistryException
+	 * @throws CourierException
+	 * @throws MalformedEPRException
+	 */
+	
+	private static void sendMessage(String body) throws RegistryException, CourierException, MalformedEPRException
+	{
+		Message msg = MessageFactory.getInstance().getMessage();
+		msg.getBody().setContents(body.getBytes());
+		
+		Registry registry = RegistryFactory.getRegistry();
+		EPR epr = registry.findEPR(SERVICE_CATEGORY_NAME,
+				SERVICE_NAME);
+		Courier courier = CourierFactory.getCourier(epr);
+		courier.deliver(msg);
+	}
+
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(MessagePersisterTest.class);
+	}
+
+	@BeforeClass
+	public static void runBeforeAllTests()
+	{
+        System.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "on");
+		try
+		{
+			DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product",
+					"../product")
+					+ "etc/test/resources/log4j.xml");
+			TestEnvironmentUtil.setESBPropertiesFileToUse("product",
+					"../product");
+            
+            logger.info(Configuration.dump());
+            
+            logger.info(Configuration.getRegistryImplementationClass());
+			// Set the juddi properties file in System so juddi will pick it up
+			// later and use the test values.
+			String juddiPropertiesFile = "/org/jboss/soa/esb/services/registry/juddi-qatest.properties";
+			System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
+			// Read this properties file to get the db connection string
+			Properties props = new Properties();
+			InputStream inStream = Class.class
+					.getResourceAsStream(juddiPropertiesFile);
+			props.load(inStream);
+			mDbDriver = props.getProperty("juddi.jdbcDriver");
+			mDbUrl = props.getProperty("juddi.jdbcUrl");
+			mDbUsername = props.getProperty("juddi.jdbcUsername");
+			mDbPassword = props.getProperty("juddi.jdbcPassword");
+
+			String database = "not tested yet";
+			if ("org.hsqldb.jdbcDriver".equals(mDbDriver))
+			{
+				database = "hsqldb";
+				// Bring up hsql on default port 9001
+				HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir(
+						"product", "../product")
+						+ "build/hsqltestdb", "juddi");
+			}
+			else if ("com.mysql.jdbc.Driver".equals(mDbDriver))
+			{
+				database = "mysql";
+			} // add and test your own database..
+
+			// Get the registry-schema create scripts
+			String sqlDir = TestEnvironmentUtil.getUserDir("product",
+					"../product")
+					+ "install/jUDDI-registry/sql/" + database + "/";
+			// Drop what is there now, if exists. We want to start fresh.
+			String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
+					+ "drop_database.sql"));
+			String sqlCreateCmd = FileUtil.readTextFile(new File(sqlDir
+					+ "create_database.sql"));
+			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
+					+ "insert_publishers.sql"));
+            //Add the messageStore table
+            sqlDir = TestEnvironmentUtil.getUserDir("product","../product") + "install/message-store/sql/" + database + "/";
+            String sqlCreateCmd2 = FileUtil.readTextFile(new File(sqlDir 
+                    + "create_database.sql"));
+            String sqlDropCmd2   = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
+            
+			try
+			{
+				Class.forName(mDbDriver);
+			}
+			catch (Exception e)
+			{
+				System.out.println("ERROR: failed to load " + database
+						+ " JDBC driver.");
+				e.printStackTrace();
+				return;
+			}
+			java.sql.Connection con = DriverManager.getConnection(mDbUrl,
+					mDbUsername, mDbPassword);
+			Statement stmnt = con.createStatement();
+			System.out.println("Dropping the schema if exist");
+			stmnt.execute(sqlDropCmd);
+            stmnt.execute(sqlDropCmd2);
+			System.out.println("Creating the juddi-schema");
+			stmnt.execute(sqlCreateCmd);
+			System.out.println("Adding the jbossesb publisher");
+			stmnt.execute(sqlInsertPubCmd);
+            System.out.println("Adding the messageStore table");
+            stmnt.execute(sqlCreateCmd2);
+			
+			// Now we can bring up the MessageStore Service
+			String deploymentConfigFile = TestEnvironmentUtil.getUserDir("qa")
+					+ "junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml";
+			String validationFileName = TestEnvironmentUtil.getUserDir(
+					"product", "../product")
+					+ "etc/schemas/xml/jbossesb-1.0.1.xsd";
+			// Make sure this file exists
+			File validationFile = new File(validationFileName);
+			if (!validationFile.exists())
+			{
+				System.err.println("Validation file "
+						+ validationFile.getAbsolutePath() + " does not exist");
+				assertTrue(false);
+			}
+			_boot = new StandAloneBootStrapper(deploymentConfigFile,
+					validationFileName);
+
+			logger
+					.info("Testing to see if we can instantiate and start ListenerManager");
+		}
+		catch (Throwable e)
+		{
+			e.printStackTrace();
+			System.out
+					.println("We should stop testing, since we don't have a db.");
+			assertTrue(false);
+		}
+
+	}
+
+	/**
+	 * Shutdown the database
+	 * 
+	 * @throws Exception
+	 */
+	@AfterClass
+	public static void runAfterAllTests() throws Exception
+	{
+        Thread.sleep(2000);
+		// Increase Sleep for debugging
+		_boot.requestEnd();
+		// Give the esb time to finish
+		Thread.sleep(2000);
+		// Cleaning up the generated files
+		String listenerConfigFile = TestEnvironmentUtil.getUserDir("qa")
+				+ "junit/src/org/jboss/soa/esb/actions/jbossesb-listener.xml";
+		File listenerFile = new File(listenerConfigFile);
+		if (listenerFile.exists())
+			listenerFile.delete();
+		String gatewayConfigFile = TestEnvironmentUtil.getUserDir("qa")
+				+ "junit/src/org/jboss/soa/esb/actions/jbossesb-gateway.xml";
+		File gatewayFile = new File(gatewayConfigFile);
+		if (gatewayFile.exists())
+			gatewayFile.delete();
+
+		if ("org.hsqldb.jdbcDriver".equals(mDbDriver))
+		{
+			HsqldbUtil.stopHsqldb(mDbUrl, mDbUsername, mDbPassword);
+		}
+	}
+
+}


Property changes on: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml	                        (rev 0)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml	2007-05-02 23:25:39 UTC (rev 11597)
@@ -0,0 +1,41 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
+parameterReloadSecs="10">
+    
+	<providers>
+          <jms-provider name="localhost" 
+                      connection-factory="ConnectionFactory"
+                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+                      jndi-URL="localhost" >
+                      
+              <jms-bus busid="QueueA">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/A"
+                   />
+              </jms-bus>
+          </jms-provider>
+      </providers>
+      <services>
+          <service 
+              category="Persistance" 
+              name="persister" 
+              description="Stores messages to persist store">
+              <listeners>
+                  <jms-listener name="MessagePersisterListenQueue" busidref="QueueA"
+                      maxThreads="1">
+                  </jms-listener>
+              </listeners>
+              <actions>
+                  <action name="PersistAction" 
+               		class="org.jboss.soa.esb.actions.MessagePersister" >
+               		<property name="classfication" value="TEST"/>
+               		<property name="message-store-type" value="urn:jboss/esb/persistence/type/DATABASE"/>
+               </action>
+               <action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
+                    <property name="message" value="message was presisted" />
+               </action>
+              </actions> 
+          </service>
+   </services>
+</jbossesb>


Property changes on: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Deleted: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/HsqldbUtil.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/HsqldbUtil.java	2007-05-02 22:48:46 UTC (rev 11596)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/HsqldbUtil.java	2007-05-02 23:25:39 UTC (rev 11597)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.messagestore;
-
-import java.sql.DriverManager;
-import java.sql.Statement;
-
-import org.hsqldb.Server;
-/**
- * Utility to start and stop a hsql Database.
- * 
- * @author <a href="mailto:kurt.stam at jboss.com">Kurt Stam</a>
- *
- */
-public class HsqldbUtil 
-{
-	final private static String THREAD_NAME = "hypersonic-unittest";
-	/**
-	 * Starts the hsql database in it's own thread. 
-	 * Don't forget to shut it down when you're done.
-	 * 
-	 * @param databaseFile - i.e. build/hsqltestdb
-	 * @param databaseName - i.e. jbossesb
-	 * @throws Exception
-	 */
-	public static void startHsqldb(final String databaseFile,
-			final String databaseName) throws Exception 
-	{
-		// Start DB in new thread, or else it will block us
-		Thread serverThread = new Thread(THREAD_NAME) {
-			public void run() {
-				try {
-					// Create startup arguments
-					final String[] args = {
-						"-database.0", databaseFile,
-						"-dbname.0", databaseName,
-						"-no_system_exit", "true"
-					} ;
-					
-					System.out.println("creating db from this script: " + databaseFile);
-
-					// Start server
-					Server.main(args);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-//				log.error("Failed to start database", e);
-			}
-		};
-		serverThread.run();
-	}
-	/**
-	 * 
-	 * @param url
-	 * @param username
-	 * @param password
-	 * @throws Exception
-	 */
-	public static void stopHsqldb(String url, String username, String password) throws Exception {
-		java.sql.Connection connection = DriverManager.getConnection(
-				url, username, password);
-		Statement statement = connection.createStatement();
-		String shutdownCommand = "SHUTDOWN COMPACT";
-		statement.executeQuery(shutdownCommand);
-	}
-
-	
-}

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2007-05-02 22:48:46 UTC (rev 11596)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2007-05-02 23:25:39 UTC (rev 11597)
@@ -44,6 +44,7 @@
 import org.jboss.soa.esb.services.persistence.MessageStore;
 import org.jboss.soa.esb.services.persistence.MessageStoreFactory;
 import org.jboss.soa.esb.services.persistence.MessageStoreType;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
 import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -114,7 +115,7 @@
 			DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product","../product") + "etc/test/resources/log4j.xml");
 			TestEnvironmentUtil.setESBPropertiesFileToUse("product","../product");						
 			if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
-				HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir("product") + "build/hsqltestdb", "jbossesb");
+				HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir("product") + "build/hsqltestdb", "juddi");
 				//Get the registry-schema create scripts
 				String database = "hsqldb";
 				logger.info("TestUtil.getPrefixForQA() returns: " + TestEnvironmentUtil.getUserDir("product"));




More information about the jboss-svn-commits mailing list