[jboss-svn-commits] JBL Code SVN: r6522 - in labs/jbossesb/trunk: product/core/listeners/tests/src/org/jboss/soa/esb/actions product/core/rosetta/src/org/jboss/soa/esb/common qa/junit/src/org/jboss/soa/esb/objpersist qa/junit/src/org/jboss/soa/esb/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 2 12:15:00 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-10-02 12:14:55 -0400 (Mon, 02 Oct 2006)
New Revision: 6522
Modified:
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ObjectToFileWriterUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/objpersist/ObjStoreTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java
Log:
fixing build
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ObjectToFileWriterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ObjectToFileWriterUnitTest.java 2006-10-02 13:47:08 UTC (rev 6521)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ObjectToFileWriterUnitTest.java 2006-10-02 16:14:55 UTC (rev 6522)
@@ -89,7 +89,8 @@
FileToByteArray fileToByteArray = new FileToByteArray();
byte[] fileContent = (byte[])fileToByteArray.process(file);
- // Make sure the contents are ass expected...
- assertEquals(expected, new String(fileContent));
+ // Make sure the contents are as expected...
+ String fileContentString = new String(fileContent);
+ assertEquals(expected, fileContentString);
}
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2006-10-02 13:47:08 UTC (rev 6521)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2006-10-02 16:14:55 UTC (rev 6522)
@@ -50,7 +50,11 @@
new KeyValuePair(Environment.PARAMS_REPOS_IMPL_CLASS,
getParamRepositoryImplClass()),
new KeyValuePair(Environment.OBJECT_STORE_CONFIG_FILE, getObjStoreConfigFile()),
- new KeyValuePair(Environment.ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass())
+ new KeyValuePair(Environment.ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass()),
+ new KeyValuePair(Environment.DB_DRIVER, getDbDriver()),
+ new KeyValuePair(Environment.DB_URL, getDbUrl()),
+ new KeyValuePair(Environment.DB_USER, getDbUser()),
+ new KeyValuePair(Environment.DB_PASSWORD, getDbPassword())
};
@@ -126,4 +130,29 @@
org.jboss.soa.esb.services.DefaultEncryptionFactory.class
.getName());
}
+
+ public static String getDbDriver()
+ {
+ String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_DRIVER);
+ return property;
+ }
+
+ public static String getDbUrl()
+ {
+ String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_URL);
+ return property;
+ }
+
+ public static String getDbUser()
+ {
+ String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_USER);
+ return property;
+ }
+
+ public static String getDbPassword()
+ {
+ String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_PASSWORD);
+ return property;
+ }
+
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java 2006-10-02 13:47:08 UTC (rev 6521)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java 2006-10-02 16:14:55 UTC (rev 6522)
@@ -47,6 +47,14 @@
public static final String ENCRYPT_FACTORY_CLASS = "org.jboss.soa.esb.encryption.factory.class";
/*
+ * Connection specific properties
+ */
+ public static String DB_DRIVER = "org.jboss.esb.db.driver";
+ public static String DB_URL = "org.jboss.esb.db.url";
+ public static String DB_USER = "org.jboss.esb.db.user";
+ public static String DB_PASSWORD = "org.jboss.esb.db.password";
+
+ /*
* Some default values.
*/
public static final String DEFAULT_PROPERTY_FILE = "jbossesb-properties.xml";
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/objpersist/ObjStoreTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/objpersist/ObjStoreTest.java 2006-10-02 13:47:08 UTC (rev 6521)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/objpersist/ObjStoreTest.java 2006-10-02 16:14:55 UTC (rev 6522)
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.jboss.soa.esb.common.SystemProperties;
+import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.common.bizclasses.*;
import org.jboss.soa.esb.services.*;
@@ -12,12 +12,12 @@
public class ObjStoreTest extends TestCase {
- private IpersistHandler m_oH;
+ private PersistManager m_oH;
protected void setUp() throws Exception {
// get a handle to your business delegate
m_oH = PersistHandlerFactory.getPersistHandler("remote",
- SystemProperties.getJndiServerType(), SystemProperties
+ Configuration.getJndiServerType(), Configuration
.getJndiServerURL());
}
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-10-02 13:47:08 UTC (rev 6521)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java 2006-10-02 16:14:55 UTC (rev 6522)
@@ -47,23 +47,14 @@
private static Logger logger = Logger.getLogger(DbUtils.class);
- private static String DB_DRIVER = "org.jboss.esb.db.driver";
- private static String DB_URL = "org.jboss.esb.db.url";
- private static String DB_USER = "org.jboss.esb.db.user";
- private static String DB_PASSWORD = "org.jboss.esb.db.password";
+ public static String dbDriver = Configuration.getDbDriver();
- public static String dbDriver = Configuration.getPropertyManager()
- .getProperty(DB_DRIVER);
+ public static String dbUrl = Configuration.getDbUrl();
- public static String dbUrl = Configuration.getPropertyManager()
- .getProperty(DB_URL);
+ public static String dbUser = Configuration.getDbUser();
- public static String dbUser = Configuration.getPropertyManager()
- .getProperty(DB_USER);
+ public static String dbPassword = Configuration.getDbPassword();
- public static String dbPassword = Configuration.getPropertyManager()
- .getProperty(DB_PASSWORD);
-
private static Properties properties = new Properties();
static
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java 2006-10-02 13:47:08 UTC (rev 6521)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java 2006-10-02 16:14:55 UTC (rev 6522)
@@ -1,7 +1,6 @@
package org.jboss.soa.esb.util;
import java.io.Serializable;
-import java.util.List;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -17,7 +16,7 @@
import junit.framework.TestCase;
import org.apache.log4j.Logger;
-import org.jboss.soa.esb.common.SystemProperties;
+import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.helpers.AppServerContext;
import org.jboss.soa.esb.helpers.KeyValuePair;
@@ -102,8 +101,8 @@
private JMSSendQueueSetup(QUEUE queue) throws Exception {
Context m_oCtx = AppServerContext.getServerContext(
- SystemProperties.getJndiServerType(),
- SystemProperties.getJndiServerURL());
+ Configuration.getJndiServerType(),
+ Configuration.getJndiServerURL());
QueueConnectionFactory qcf = (QueueConnectionFactory) m_oCtx.lookup("ConnectionFactory");
QueueConnection oQconn = qcf.createQueueConnection();
More information about the jboss-svn-commits
mailing list