[jboss-svn-commits] JBL Code SVN: r6829 - in labs/jbossesb/trunk/product: core/rosetta/src/org/jboss/soa/esb/common core/rosetta/tests/src/org/jboss/soa/esb/common/tests install/conf test/resources
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 16 15:33:03 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-10-16 15:33:00 -0400 (Mon, 16 Oct 2006)
New Revision: 6829
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/Environment.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java
labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
labs/jbossesb/trunk/product/test/resources/jbossesb-unittest-properties.xml
Log:
JBESB-203, Move Registry properties to a Registry specific component in jbossesb-properties.xml
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-16 19:12:02 UTC (rev 6828)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2006-10-16 19:33:00 UTC (rev 6829)
@@ -113,8 +113,7 @@
*/
public static String getRegistryQueryManageURI()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_QUERY_MANAGER_URI,
- Environment.DEFAULT_REGISTRY_QUERY_MANAGER_URI);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_QUERY_MANAGER_URI);
}
/**
* The Registry Lifecycle Manager URI can be use to publish services.
@@ -122,8 +121,7 @@
*/
public static String getRegistryLifecycleManagerURI()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_LIFECYCLE_MANAGER_URI,
- Environment.DEFAULT_REGISTRY_LIFECYCLE_MANAGER_URI);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_LIFECYCLE_MANAGER_URI);
}
/**
* The Registry Factory Class setting specifies which JAXR implementation should be used.
@@ -131,8 +129,7 @@
*/
public static String getRegistryFactoryClass()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_FACTORY_CLASS,
- Environment.DEFAULT_REGISTRY_FACTORY_CLASS);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_FACTORY_CLASS);
}
/**
* The Registry Scout Transport Class defines which communication protocol Scout should use to communicate
@@ -141,8 +138,7 @@
*/
public static String getRegistryScoutTransportClass()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_SCOUT_TRANSPORT_CLASS,
- Environment.DEFAULT_REGISTRY_SCOUT_TRANSPORT_CLASS);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_SCOUT_TRANSPORT_CLASS);
}
/**
* The Registry User is used to inquire and publish to the Registry.
@@ -150,8 +146,7 @@
*/
public static String getRegistryUser()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_USER,
- Environment.DEFAULT_REGISTRY_USER);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_USER);
}
/**
* The Registry Password that goes with the Registry User.
@@ -159,8 +154,7 @@
*/
public static String getRegistryPassword()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_PASSWORD,
- Environment.DEFAULT_REGISTRY_PASSWORD);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_PASSWORD);
}
public static String getParamRepositoryImplClass()
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-16 19:12:02 UTC (rev 6828)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java 2006-10-16 19:33:00 UTC (rev 6829)
@@ -90,13 +90,6 @@
public static final String DEFAULT_PORT = "25";
public static final String DEFAULT_SERVER_TYPE = "jboss";
- public static final String DEFAULT_REGISTRY_QUERY_MANAGER_URI = "org.apache.juddi.registry.local.InquiryService#inquire";
- public static final String DEFAULT_REGISTRY_LIFECYCLE_MANAGER_URI = "org.apache.juddi.registry.local.PublishService#publish";
- public static final String DEFAULT_REGISTRY_FACTORY_CLASS = "org.apache.ws.scout.registry.ConnectionFactoryImpl";
- public static final String DEFAULT_REGISTRY_USER = "jbossesb";
- public static final String DEFAULT_REGISTRY_PASSWORD = "password";
- public static final String DEFAULT_REGISTRY_SCOUT_TRANSPORT_CLASS = "org.apache.ws.scout.transport.LocalTransport";
-
/*
* DatabaseMessageStore Persistence Store properties.
*/
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java 2006-10-16 19:12:02 UTC (rev 6828)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java 2006-10-16 19:33:00 UTC (rev 6829)
@@ -78,10 +78,14 @@
*/
public static final String CORE_MODULE = "core";
+
+ public static final String CONNECTION_MODULE = "connection";
+
+ public static final String REGISTRY_MODULE = "registry";
public static final String TRANSPORTS_MODULE = "transports";
- public static final String CONNECTION_MODULE = "connection";
+
/**
* Get the property manager responsible for the module component in the
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-10-16 19:12:02 UTC (rev 6828)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java 2006-10-16 19:33:00 UTC (rev 6829)
@@ -5,20 +5,23 @@
public class TestUtil
{
- static Logger log = Logger.getLogger(TestUtil.getPrefix());
+ 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()
{
- String prefix="";
- String baseDir = System.getProperty("user.dir");
- log.log(Priority.INFO, baseDir);
- if (!baseDir.endsWith("product")) {
- prefix = "product/";
+ if (_prefix==null) {
+ _prefix="";
+ String baseDir = System.getProperty("user.dir");
+ log.log(Priority.INFO, baseDir);
+ if (!baseDir.endsWith("product")) {
+ _prefix = "product/";
+ }
}
- return prefix;
+ return _prefix;
}
/**
* Sets the jbossesb-properties.xml to use for test
Modified: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2006-10-16 19:12:02 UTC (rev 6828)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2006-10-16 19:33:00 UTC (rev 6829)
@@ -32,15 +32,16 @@
xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
<properties name="core">
<property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
- <property name="org.jboss.soa.esb.objStore.configFile" value="file:@org.jboss.esb.config.objstore@" />
- <property name="org.jboss.soa.esb.registry.queryManagerURL" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURL" value="org.apache.juddi.registry.local.PublishService#publish"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
<property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
<property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
<property name="org.jboss.soa.esb.registry.password" value="password"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
</properties>
<properties name="transports" depends="core">
<property name="org.jboss.soa.esb.mail.smtp.host" value="@org.jboss.soa.esb.mail.smtp.host@"/>
Modified: labs/jbossesb/trunk/product/test/resources/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/test/resources/jbossesb-unittest-properties.xml 2006-10-16 19:12:02 UTC (rev 6828)
+++ labs/jbossesb/trunk/product/test/resources/jbossesb-unittest-properties.xml 2006-10-16 19:33:00 UTC (rev 6829)
@@ -33,8 +33,10 @@
<properties name="core">
<property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
- <property name="org.jboss.soa.esb.registry.queryManagerURL" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURL" value="org.apache.juddi.registry.local.PublishService#publish"/>
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
<property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
<property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
<property name="org.jboss.soa.esb.registry.password" value="password"/>
More information about the jboss-svn-commits
mailing list