[jboss-svn-commits] JBL Code SVN: r7355 - in labs/jbossesb/trunk: product/core/rosetta/src/org/jboss/internal/soa/esb product/core/rosetta/src/org/jboss/soa/esb product/core/rosetta/src/org/jboss/soa/esb/services/persistence product/core/rosetta/tests/src/org/jboss/soa/esb product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests product/core/services/tests/src/org/jboss/soa/esb/services product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup qa/junit/src/org/jboss/soa/esb/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 2 19:14:12 EST 2006
Author: daniel.brum at jboss.com
Date: 2006-11-02 19:14:03 -0500 (Thu, 02 Nov 2006)
New Revision: 7355
Removed:
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/connection/
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/connection/
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/
labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/TestUtil.java
Modified:
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java
labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/MockLauncher.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
Log:
removed Connection and replaced with connection pooling offered in Message Store (DB Implementation using 3cp0)
some minor tweaks on tb2 stuff also
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java 2006-11-02 23:58:10 UTC (rev 7354)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java 2006-11-03 00:14:03 UTC (rev 7355)
@@ -5,9 +5,11 @@
import java.lang.reflect.Constructor;
import java.net.URI;
+import org.jboss.soa.esb.common.Configuration;
+
@SuppressWarnings("unchecked")
public abstract class MessageStoreFactory {
@@ -17,8 +19,8 @@
{
try {
- Class cls = Class.forName("org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl");
-// Class cls = Class.forName(Configuration.getStoreConnectionFactory());
+// Class cls = Class.forName("org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl");
+ Class cls = Class.forName(Configuration.getStoreConnectionFactory());
Constructor<MessageStoreFactory> c = cls.getConstructor(new Class[]{});
theFactory = c.newInstance(new Object[]{});
} catch (Exception e) {
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java 2006-11-02 23:58:10 UTC (rev 7354)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java 2006-11-03 00:14:03 UTC (rev 7355)
@@ -1,5 +1,10 @@
package org.jboss.soa.esb.common.tests;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
@@ -33,4 +38,17 @@
System.setProperty("org.jboss.soa.esb.propertyFile", jbossesbPropertiesFile);
}
+ public static String readTextFile(File file) throws IOException
+ {
+ StringBuffer sb = new StringBuffer(1024);
+ BufferedReader reader = new BufferedReader(new FileReader(file.getPath()));
+ char[] chars = new char[1];
+ while( (reader.read(chars)) > -1){
+ sb.append(String.valueOf(chars));
+ chars = new char[1];
+ }
+ reader.close();
+ return sb.toString();
+ }
+
}
Modified: labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/MockLauncher.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/MockLauncher.java 2006-11-02 23:58:10 UTC (rev 7354)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/MockLauncher.java 2006-11-03 00:14:03 UTC (rev 7355)
@@ -14,14 +14,16 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.messagestore.HsqldbUtil;
-import org.jboss.soa.esb.messagestore.TestUtil;
+import org.jboss.soa.esb.common.tests.TestUtil;
+
public class MockLauncher {
private static EsbListenerController _proc = null;
private static EPR _epr = null;
private static final String SERVICE_NAME = "LoanRequestService";
+
@SuppressWarnings("unused")
private static Logger _logger = Logger.getLogger(MockLauncher.class);
@@ -59,27 +61,28 @@
}
-protected static void runBeforeAllTests() throws Exception{
-
- if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
- HsqldbUtil.startHsqldb(TestUtil.getPrefix() + "build/hsqltestdb", "jbossesb");
- //Get the registry-schema create scripts
- String database = "hsqldb";
- String sqlDir = TestUtil.getPrefix() + "install/message-store/sql/" + database + "/";
- //Drop what is there now, if exists. We want to start fresh.
- String sqlCreateCmd = TestUtil.readTextFile(new File(sqlDir + "create_database.sql"));
- String sqlDropCmd = TestUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
-
- DBConnectionManager mgr = DBConnectionManager.getInstance();
- Connection con = mgr.getConnection();
- Statement stmnt = con.createStatement();
- System.out.println("Dropping the schema if exist");
- stmnt.execute(sqlDropCmd);
- System.out.println("Creating the message store schema");
- stmnt.execute(sqlCreateCmd);
- }
+protected static void runBeforeAllTests() throws Exception{
+TestUtil.setESBPropertiesFileToUse();
+
+ if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
+ HsqldbUtil.startHsqldb(TestUtil.getPrefix() + "build/hsqltestdb", "jbossesb");
+ //Get the registry-schema create scripts
+ String database = "hsqldb";
+ String sqlDir = TestUtil.getPrefix() + "install/message-store/sql/" + database + "/";
+ //Drop what is there now, if exists. We want to start fresh.
+ String sqlCreateCmd = TestUtil.readTextFile(new File(sqlDir + "create_database.sql"));
+ String sqlDropCmd = TestUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
+ DBConnectionManager mgr = DBConnectionManager.getInstance();
+ Connection con = mgr.getConnection();
+ Statement stmnt = con.createStatement();
+ System.out.println("Dropping the schema if exist");
+ stmnt.execute(sqlDropCmd);
+ System.out.println("Creating the message store schema");
+ stmnt.execute(sqlCreateCmd);
}
+
+ }
private static void runAfterAllTests() throws Exception{
Deleted: labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/TestUtil.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/TestUtil.java 2006-11-02 23:58:10 UTC (rev 7354)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/mockup/TestUtil.java 2006-11-03 00:14:03 UTC (rev 7355)
@@ -1,54 +0,0 @@
-package org.jboss.soa.esb.samples.trailblazer.mockup;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
-
-public class TestUtil
-{
- private static Logger log = Logger.getLogger(TestUtil.class);
- private static String _prefix=null;
- /**
- * When performing file system interaction, the user.dir may differ (i.e. running the
- * tests from within eclipse).
- */
- public static String getPrefix()
- {
- if (_prefix==null) {
- _prefix="";
- String baseDir = System.getProperty("user.dir");
- log.log(Priority.INFO, baseDir);
- if (!baseDir.endsWith("product")) {
- _prefix = "product/";
- }
- }
- return _prefix;
- }
- /**
- * Sets the jbossesb-properties.xml to use for test
- */
- public static void setESBPropertiesFileToUse()
- {
-
-// String jbossesbPropertiesFile = getPrefix() + "etc/test/resources/jbossesb-unittest-properties.xml";
- String jbossesbPropertiesFile = "jbossesb-unittest-properties.xml";
- System.setProperty("org.jboss.soa.esb.propertyFile", jbossesbPropertiesFile);
- }
-
- public static String readTextFile(File file) throws IOException
- {
- StringBuffer sb = new StringBuffer(1024);
- BufferedReader reader = new BufferedReader(new FileReader(file.getPath()));
- char[] chars = new char[1];
- while( (reader.read(chars)) > -1){
- sb.append(String.valueOf(chars));
- chars = new char[1];
- }
- reader.close();
- return sb.toString();
- }
-}
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java 2006-11-02 23:58:10 UTC (rev 7354)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java 2006-11-03 00:14:03 UTC (rev 7355)
@@ -33,7 +33,6 @@
import org.apache.log4j.Logger;
import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.connection.ConnectionProperties;
/**
* Database Utilitise.
@@ -55,13 +54,13 @@
private static Properties properties = new Properties();
- static
- {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, dbDriver);
- properties.put(ConnectionProperties.CONNECTION_URL, dbUrl);
- properties.put(ConnectionProperties.USERNAME, dbUser);
- properties.put(ConnectionProperties.PASSWORD, dbPassword);
- }
+// static
+// {
+// properties.put(ConnectionProperties.DRIVER_CLASSNAME, dbDriver);
+// properties.put(ConnectionProperties.CONNECTION_URL, dbUrl);
+// properties.put(ConnectionProperties.USERNAME, dbUser);
+// properties.put(ConnectionProperties.PASSWORD, dbPassword);
+// }
/**
* Execute an SQL statement. <p/> Calls
More information about the jboss-svn-commits
mailing list