[jboss-svn-commits] JBL Code SVN: r6455 - in labs/jbossesb/trunk/product/core/common: src/org/jboss/soa/esb/common tests/src/org/jboss/soa/esb/common/tests
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 28 06:25:39 EDT 2006
Author: mark.little at jboss.com
Date: 2006-09-28 06:25:30 -0400 (Thu, 28 Sep 2006)
New Revision: 6455
Modified:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/Configuration.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
Log:
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/Configuration.java 2006-09-27 23:06:40 UTC (rev 6454)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/Configuration.java 2006-09-28 10:25:30 UTC (rev 6455)
@@ -37,18 +37,26 @@
public class Configuration
{
- public static PropertyManager propertyManager;
+ private static KeyValuePair[] s_oaKV = new KeyValuePair[]
+ {
+ new KeyValuePair(Environment.SMTP_HOST, getSmtpHost()),
+ new KeyValuePair(Environment.SMTP_USERNAME, getSmtpUsername()),
+ new KeyValuePair(Environment.SMTP_PASSWORD, getSmtpPassword()),
+ new KeyValuePair(Environment.SMTP_PORT, getSmtpPort()),
+ new KeyValuePair(Environment.SMTP_FROM, getSmtpFrom()),
+ new KeyValuePair(Environment.SMTP_AUTH, getSmtpAuth()),
+ new KeyValuePair(Environment.JNDI_SERVER_TYPE, getJndiServerType()),
+ new KeyValuePair(Environment.JNDI_SERVER_URL, getJndiServerURL()),
+ new KeyValuePair(Environment.PARAMS_REPOS_IMPL_CLASS,
+ getParamRepositoryImplClass()),
+ new KeyValuePair(Environment.OBJECT_STORE_CONFIG_FILE, getObjStoreConfigFile()),
+ new KeyValuePair(Environment.ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass())
- public static PropertyManager getPropertyManager()
- {
- return propertyManager;
- }
-
- private static KeyValuePair[] s_oaKV;
+ };
public static String dump()
{
- StringBuilder sb = new StringBuilder("Dump of Configuration:\n");
+ StringBuilder sb = new StringBuilder("Dump of SystemProperties:\n");
for (KeyValuePair oCurr : s_oaKV)
{
sb.append(oCurr.getKey()).append("=").append(oCurr.getValue())
@@ -59,154 +67,63 @@
public static String getSmtpHost()
{
- return getPropertyManager().getProperty(Environment.SMTP_HOST, Environment.DEFAULT_HOST);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_HOST, Environment.DEFAULT_HOST);
}
public static String getSmtpUsername()
{
- return System
- .getProperty(Environment.SMTP_USERNAME, Environment.DEFAULT_USERNAME);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_USERNAME,
+ Environment.DEFAULT_USERNAME);
}
public static String getSmtpPassword()
{
- return System
- .getProperty(Environment.SMTP_PASSWORD, Environment.DEFAULT_PASSWORD);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_PASSWORD,
+ Environment.DEFAULT_PASSWORD);
}
public static String getSmtpPort()
{
- return getPropertyManager().getProperty(Environment.SMTP_PORT, Environment.DEFAULT_PORT);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_PORT, Environment.DEFAULT_PORT);
}
public static String getSmtpFrom()
{
- return getPropertyManager().getProperty(Environment.SMTP_FROM);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_FROM);
}
public static String getSmtpAuth()
{
- return getPropertyManager().getProperty(Environment.SMTP_AUTH);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.SMTP_AUTH);
}
public static String getJndiServerType()
{
- return getPropertyManager().getProperty(Environment.JNDI_SERVER_TYPE,
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_TYPE,
Environment.DEFAULT_SERVER_TYPE);
}
public static String getJndiServerURL()
{
- return getPropertyManager().getProperty(Environment.JNDI_SERVER_URL, Environment.DEFAULT_HOST);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_URL,
+ Environment.DEFAULT_HOST);
}
public static String getParamRepositoryImplClass()
{
- return getPropertyManager().getProperty(Environment.PARAMS_REPOS_IMPL_CLASS);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.PARAMS_REPOS_IMPL_CLASS);
}
public static String getObjStoreConfigFile()
{
- String property = getPropertyManager().getProperty(Environment.OBJECT_STORE_CONFIG_FILE);
+ String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.OBJECT_STORE_CONFIG_FILE);
return property;
}
public static String getEncryptionFactoryClass()
{
- return getPropertyManager().getProperty(Environment.ENCRYPT_FACTORY_CLASS,
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.ENCRYPT_FACTORY_CLASS,
org.jboss.soa.esb.services.DefaultEncryptionFactory.class
.getName());
}
-
- static
- {
- /**
- * Retrieve the property manager from the factory and add the ESB properties file to it.
- *
- * Ideally the various components in the ESB should have their own sections within the
- * property file and the each component uses its own PropertyManager instance. However, the
- * current structure of the ESB does not lend itself well to that.
- *
- * TODO
- */
-
- propertyManager = new TempPropertyManager();
- //propertyManager = PropertyManagerFactory.getPropertyManager("com.arjuna.ats.propertymanager");
-
- //String propertiesFilename = getPropertyManager().getProperty(Environment.PROPERTIES_FILE, Environment.DEFAULT_PROPERTY_FILE);
-
- try
- {
- //propertyManager.load(XMLFilePlugin.class.getName(), propertiesFilename);
- }
- catch (Exception e)
- {
- throw new ExceptionInInitializerError(e.toString());
- }
-
- s_oaKV = new KeyValuePair[]
- {
- new KeyValuePair(Environment.SMTP_HOST, getSmtpHost()),
- new KeyValuePair(Environment.SMTP_USERNAME, getSmtpUsername()),
- new KeyValuePair(Environment.SMTP_PASSWORD, getSmtpPassword()),
- new KeyValuePair(Environment.SMTP_PORT, getSmtpPort()),
- new KeyValuePair(Environment.SMTP_FROM, getSmtpFrom()),
- new KeyValuePair(Environment.SMTP_AUTH, getSmtpAuth()),
- new KeyValuePair(Environment.JNDI_SERVER_TYPE, getJndiServerType()),
- new KeyValuePair(Environment.JNDI_SERVER_URL, getJndiServerURL()),
- new KeyValuePair(Environment.PARAMS_REPOS_IMPL_CLASS,
- getParamRepositoryImplClass()),
- new KeyValuePair(Environment.OBJECT_STORE_CONFIG_FILE, getObjStoreConfigFile()),
- new KeyValuePair(Environment.ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass())
-
- };
- }
-
- private static class TempPropertyManager implements PropertyManager {
-
- public String getProperty(String arg0) {
- return System.getProperty(arg0);
- }
-
- public String getProperty(String arg0, String arg1) {
- return System.getProperty(arg0, arg1);
- }
-
- public String setProperty(String arg0, String arg1, boolean arg2) {
- throw new UnsupportedOperationException("Not supported! Temporarily out of action");
- }
-
- public String setProperty(String arg0, String arg1) {
- return System.setProperty(arg0, arg1);
- }
-
- public String removeProperty(String arg0) {
- return (String) System.getProperties().remove(arg0);
- }
-
- public Properties getProperties() {
- return System.getProperties();
- }
-
- public Enumeration propertyNames() {
- return System.getProperties().keys();
- }
-
- public void load(String arg0, String arg1) throws IOException, ClassNotFoundException, LoadPropertiesException {
- throw new UnsupportedOperationException("Not supported! Temporarily out of action");
- }
-
- public void save(String arg0, String arg1) throws IOException, ClassNotFoundException, SavePropertiesException {
- throw new UnsupportedOperationException("Not supported! Temporarily out of action");
- }
-
- public void addManagementPlugin(PropertyManagementPlugin arg0) throws IOException, ManagementPluginException {
- throw new UnsupportedOperationException("Not supported! Temporarily out of action");
- }
-
- public boolean verbose() {
- return false;
- }
-
- }
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java 2006-09-27 23:06:40 UTC (rev 6454)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java 2006-09-28 10:25:30 UTC (rev 6455)
@@ -102,7 +102,7 @@
} catch (Exception ex) {
log.error("EJB3 Container Startup Error", ex);
- // throw new RuntimeException(ex);
+ throw new RuntimeException(ex);
}
}
More information about the jboss-svn-commits
mailing list