[jboss-cvs] JBossAS SVN: r88556 - in projects/bootstrap/trunk: impl-as/src/test/java/org/jboss/bootstrap/impl/as/config and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 8 17:13:44 EDT 2009
Author: ALRubinger
Date: 2009-05-08 17:13:44 -0400 (Fri, 08 May 2009)
New Revision: 88556
Modified:
projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java
projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java
projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java
projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/config/JBossASConfigurationInitializer.java
Log:
[JBBOOT-65] Rename default value namespace
Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java 2009-05-08 21:13:34 UTC (rev 88555)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java 2009-05-08 21:13:44 UTC (rev 88556)
@@ -89,17 +89,17 @@
// ${jboss.bind.address}
final String bindAddress = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_BIND_ADDRESS, config
- .getBindAddress(), JBossASConfigurationInitializer.DEFAULT_VALUE_BIND_ADDRESS, configProps);
+ .getBindAddress(), JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_DEFAULT, configProps);
config.bindAddress(bindAddress);
// ${jboss.server.name}
final String serverName = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_NAME, config
- .getServerName(), JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_NAME, configProps);
+ .getServerName(), JBossASConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT, configProps);
config.serverName(serverName);
// ${jboss.lib.url}
final URL bootLibLocation = config.getBootLibraryLocation();
- final String bootLibDefault = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+ final String bootLibDefault = jbossHome + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
final String currentBootLibLocation = bootLibLocation != null ? bootLibLocation.toExternalForm() : null;
String resolvedBootLibLocation = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_BOOT_LIBRARY_URL,
currentBootLibLocation, bootLibDefault, configProps);
@@ -108,7 +108,7 @@
// ${jboss.server.base.url} / ${jboss.server.base.dir}
final URL serverBaseLocation = config.getServerBaseLocation();
- final String serverBaseDefault = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_BASE_URL_SUFFIX;
+ final String serverBaseDefault = jbossHome + JBossASConfigurationInitializer.VALUE_SERVER_BASE_URL_SUFFIX_DEFAULT;
final String currentServerBaseLocation = serverBaseLocation != null ? serverBaseLocation.toExternalForm() : null;
String resolvedServerBaseLocation = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_BASE_URL, currentServerBaseLocation, serverBaseDefault,
@@ -128,7 +128,7 @@
// ${jboss.common.base.url}
final URL commonBaseLocation = config.getCommonBaseLocation();
- final String commonBaseDefault = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_COMMON_BASE_URL_SUFFIX;
+ final String commonBaseDefault = jbossHome + JBossASConfigurationInitializer.VALUE_COMMON_BASE_URL_SUFFIX_DEFAULT;
final String currentCommonBaseLocation = commonBaseLocation != null ? commonBaseLocation.toExternalForm() : null;
String resolvedCommonBaseLocation = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_COMMON_BASE_URL, currentCommonBaseLocation, commonBaseDefault,
@@ -139,7 +139,7 @@
// ${jboss.common.lib.url}
final URL commonLibLocation = config.getCommonLibLocation();
final String commonLibDefault = resolvedCommonBaseLocation
- + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
final String currentCommonLibLocation = commonLibLocation != null ? commonLibLocation.toExternalForm() : null;
String resolvedCommonLibLocation = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_COMMON_LIBRARY_URL, currentCommonLibLocation, commonLibDefault,
@@ -150,7 +150,7 @@
// ${jboss.server.log.dir}
final URL serverLogLocation = config.getServerLogLocation();
final String serverLogDefault = resolvedServerHomeLocation
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_LOG_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_LOG_DIR_SUFFIX_DEFAULT;
final String currentServerLogLocation = serverLogLocation != null ? serverLogLocation.toExternalForm() : null;
String resolvedServerLogLocation = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LOG_DIR,
currentServerLogLocation, serverLogDefault, configProps);
@@ -160,7 +160,7 @@
// ${jboss.server.conf.url}
final URL serverConfLocation = config.getServerConfLocation();
final String serverConfDefault = resolvedServerHomeLocation
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_CONFIG_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_CONFIG_URL_SUFFIX_DEFAULT;
final String currentServerConfLocation = serverConfLocation != null ? serverConfLocation.toExternalForm() : null;
String resolvedServerConfLocation = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_CONF_URL, currentServerConfLocation, serverConfDefault,
@@ -175,7 +175,7 @@
// ${jboss.server.lib.url}
final URL serverLibLocation = config.getServerLibLocation();
final String serverLibDefault = resolvedServerHomeLocation
- + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
final String currentServerLibLocation = serverLibLocation != null ? serverLibLocation.toExternalForm() : null;
String resolvedServerLibLocation = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL, currentServerLibLocation, serverLibDefault,
@@ -186,7 +186,7 @@
// ${jboss.server.data.dir}
final URL serverDataLocation = config.getServerDataLocation();
final String serverDataDefault = resolvedServerHomeLocation
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_DATA_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_DATA_DIR_SUFFIX_DEFAULT;
final String currentServerDataLocation = serverDataLocation != null ? serverDataLocation.toExternalForm() : null;
String resolvedServerDataLocation = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_DATA_DIR, currentServerDataLocation, serverDataDefault,
@@ -197,7 +197,7 @@
// ${jboss.server.tmp.dir}
final URL serverTempLocation = config.getServerTempLocation();
final String serverTempDefault = resolvedServerHomeLocation
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_TEMP_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_TEMP_DIR_SUFFIX_DEFAULT;
final String currentServerTempLocation = serverTempLocation != null ? serverTempLocation.toExternalForm() : null;
String resolvedServerTempLocation = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_TEMP_DIR, currentServerTempLocation, serverTempDefault,
@@ -217,7 +217,7 @@
// ${jboss.partition.name}
final String partitionName = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_PARTITION_NAME,
- config.getPartitionName(), JBossASConfigurationInitializer.DEFAULT_VALUE_PARITION_NAME, configProps);
+ config.getPartitionName(), JBossASConfigurationInitializer.VALUE_PARITION_NAME_DEFAULT, configProps);
config.partitionName(partitionName);
// ${jboss.partition.udpGroup}
@@ -247,7 +247,7 @@
final Boolean loadNative = config.isLoadNative();
final String loadNativeString = loadNative != null ? loadNative.toString() : null;
final String loadNativeResolved = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_NATIVE_LOAD,
- loadNativeString, JBossASConfigurationInitializer.DEFAULT_VALUE_NATIVE_LOAD.toString(), configProps);
+ loadNativeString, JBossASConfigurationInitializer.VALUE_NATIVE_LOAD_DEFAULT.toString(), configProps);
if (loadNativeResolved != null)
{
final boolean loadNativeOverride = Boolean.parseBoolean(loadNativeResolved);
@@ -257,7 +257,7 @@
// ${jboss.native.dir}
final URL nativeLibLocation = config.getNativeLibraryLocation();
final String nativeLibDefault = resolvedServerTempLocation
- + JBossASConfigurationInitializer.DEFAULT_VALUE_NATIVE_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_NATIVE_DIR_SUFFIX_DEFAULT;
final String currentNativeLibLocation = nativeLibLocation != null ? nativeLibLocation.toExternalForm() : null;
String resolvedNativeLibLocation = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_NATIVE_DIR,
currentNativeLibLocation, nativeLibDefault, configProps);
@@ -269,7 +269,7 @@
final String platformMBeanServerString = platformMBeanServer != null ? platformMBeanServer.toString() : null;
final String platformMBeanServerResolved = this.resolvePropertyValue(
JBossASServerConfig.PROP_KEY_JBOSSAS_PLATFORM_MBEANSERVER, platformMBeanServerString,
- JBossASConfigurationInitializer.DEFAULT_VALUE_PLATFORM_MBEAN_SERVER.toString(), configProps);
+ JBossASConfigurationInitializer.VALUE_PLATFORM_MBEAN_SERVER_DEFAULT.toString(), configProps);
if (platformMBeanServerResolved != null)
{
final boolean platformMbeanServerOverride = Boolean.parseBoolean(platformMBeanServerResolved);
Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java 2009-05-08 21:13:34 UTC (rev 88555)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java 2009-05-08 21:13:44 UTC (rev 88556)
@@ -141,7 +141,7 @@
final String bindAddress = config.getBindAddress();
// Get expected value
- final String expected = JBossASConfigurationInitializer.DEFAULT_VALUE_BIND_ADDRESS;
+ final String expected = JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_DEFAULT;
// Test
TestCase.assertEquals("Bind address was not defaulted as expected", expected, bindAddress);
@@ -162,7 +162,7 @@
final String serverName = config.getServerName();
// Get expected value
- final String expected = JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_NAME;
+ final String expected = JBossASConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT;
// Test
TestCase.assertEquals("Server name was not defaulted as expected", expected, serverName);
@@ -184,7 +184,7 @@
// Get expected value
final String expected = JBOSS_HOME.toExternalForm()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Boot library location was not defaulted as expected", expected, actual);
@@ -206,7 +206,7 @@
// Get expected value
final String expected = JBOSS_HOME.toExternalForm()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_BASE_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_BASE_URL_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Server base location was not defaulted as expected", expected, actual);
@@ -249,7 +249,7 @@
// Get expected value
final String expected = JBOSS_HOME.toExternalForm()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_COMMON_BASE_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_COMMON_BASE_URL_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Common base location was not defaulted as expected", expected, actual);
@@ -271,8 +271,8 @@
// Get expected value
final String expected = JBOSS_HOME.toExternalForm()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_COMMON_BASE_URL_SUFFIX
- + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_COMMON_BASE_URL_SUFFIX_DEFAULT
+ + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Common lib location was not defaulted as expected", expected, actual);
@@ -294,7 +294,7 @@
// Get expected value
final String expected = this.getServerHomeLocation()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_LOG_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_LOG_DIR_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Server log location was not defaulted as expected", expected, actual);
@@ -316,7 +316,7 @@
// Get expected value
final String expected = this.getServerHomeLocation()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_CONFIG_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_CONFIG_URL_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Server config location was not defaulted as expected", expected, actual);
@@ -338,7 +338,7 @@
// Get expected value
final String expected = this.getServerHomeLocation()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Server lib location was not defaulted as expected", expected, actual);
@@ -360,7 +360,7 @@
// Get expected value
final String expected = this.getServerHomeLocation()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_DATA_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_DATA_DIR_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Server data location was not defaulted as expected", expected, actual);
@@ -382,7 +382,7 @@
// Get expected value
final String expected = this.getServerHomeLocation()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_TEMP_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_SERVER_TEMP_DIR_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Server temp location was not defaulted as expected", expected, actual);
@@ -451,7 +451,7 @@
final String actual = config.getPartitionName();
// Get expected value
- final String expected = JBossASConfigurationInitializer.DEFAULT_VALUE_PARITION_NAME;
+ final String expected = JBossASConfigurationInitializer.VALUE_PARITION_NAME_DEFAULT;
// Test
TestCase.assertEquals("Partition name for AS was not defaulted as expected", expected, actual);
@@ -473,7 +473,7 @@
final Boolean actual = config.isLoadNative();
// Get expected value
- final Boolean expected = JBossASConfigurationInitializer.DEFAULT_VALUE_NATIVE_LOAD;
+ final Boolean expected = JBossASConfigurationInitializer.VALUE_NATIVE_LOAD_DEFAULT;
// Test
TestCase.assertEquals("Load Native for AS was not defaulted as expected", expected, actual);
@@ -497,7 +497,7 @@
// Get expected value
final String expected = this.getServerTempLocation()
- + JBossASConfigurationInitializer.DEFAULT_VALUE_NATIVE_DIR_SUFFIX;
+ + JBossASConfigurationInitializer.VALUE_NATIVE_DIR_SUFFIX_DEFAULT;
// Test
TestCase.assertEquals("Native Lib URL for AS was not defaulted as expected", expected, actual);
@@ -519,7 +519,7 @@
final Boolean actual = config.isUsePlatformMBeanServer();
// Get expected value
- final Boolean expected = JBossASConfigurationInitializer.DEFAULT_VALUE_PLATFORM_MBEAN_SERVER;
+ final Boolean expected = JBossASConfigurationInitializer.VALUE_PLATFORM_MBEAN_SERVER_DEFAULT;
// Test
TestCase.assertEquals("Using Platform MBean Server for AS was not defaulted as expected", expected, actual);
@@ -535,8 +535,8 @@
*/
private String getServerHomeLocation()
{
- return JBOSS_HOME.toExternalForm() + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_BASE_URL_SUFFIX
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_NAME + TRAILING_SLASH;
+ return JBOSS_HOME.toExternalForm() + JBossASConfigurationInitializer.VALUE_SERVER_BASE_URL_SUFFIX_DEFAULT
+ + JBossASConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT + TRAILING_SLASH;
}
/**
@@ -545,7 +545,7 @@
*/
private String getServerTempLocation()
{
- return this.getServerHomeLocation() + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_TEMP_DIR_SUFFIX;
+ return this.getServerHomeLocation() + JBossASConfigurationInitializer.VALUE_SERVER_TEMP_DIR_SUFFIX_DEFAULT;
}
/**
@@ -554,6 +554,6 @@
*/
private String getBootstrapHome()
{
- return this.getServerHomeLocation() + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_CONFIG_URL_SUFFIX;
+ return this.getServerHomeLocation() + JBossASConfigurationInitializer.VALUE_SERVER_CONFIG_URL_SUFFIX_DEFAULT;
}
}
Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java 2009-05-08 21:13:34 UTC (rev 88555)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java 2009-05-08 21:13:44 UTC (rev 88556)
@@ -515,23 +515,23 @@
final String jbossHome = this.getJBossHome().getAbsolutePath() + "/";
final URL bootstrapHome = this.getBootstrapHome();
final String bootstrapName = BOOTSTRAP_NAME;
- final String bindAddress = JBossASConfigurationInitializer.DEFAULT_VALUE_BIND_ADDRESS;
- final String serverName = JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_NAME;
- final String bootLib = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
- final String serverBase = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_BASE_URL_SUFFIX;
+ final String bindAddress = JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_DEFAULT;
+ final String serverName = JBossASConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT;
+ final String bootLib = jbossHome + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
+ final String serverBase = jbossHome + JBossASConfigurationInitializer.VALUE_SERVER_BASE_URL_SUFFIX_DEFAULT;
final String serverHome = serverBase + serverName + "/";
- final String commonBase = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_COMMON_BASE_URL_SUFFIX;
- final String commonLib = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_COMMON_BASE_URL_SUFFIX
- + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
- final String serverLog = serverHome + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
- final String serverConfig = serverHome + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_CONFIG_URL_SUFFIX;
- final String serverLib = serverHome + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
- final String serverData = serverHome + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_DATA_DIR_SUFFIX;
- final String serverTemp = serverHome + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_TEMP_DIR_SUFFIX;
- final String partitionName = JBossASConfigurationInitializer.DEFAULT_VALUE_PARITION_NAME;
- final Boolean nativeLoad = JBossASConfigurationInitializer.DEFAULT_VALUE_NATIVE_LOAD;
- final String nativeLibLocation = serverTemp + JBossASConfigurationInitializer.DEFAULT_VALUE_NATIVE_DIR_SUFFIX;
- final Boolean usePlatformMBeanServer = JBossASConfigurationInitializer.DEFAULT_VALUE_PLATFORM_MBEAN_SERVER;
+ final String commonBase = jbossHome + JBossASConfigurationInitializer.VALUE_COMMON_BASE_URL_SUFFIX_DEFAULT;
+ final String commonLib = jbossHome + JBossASConfigurationInitializer.VALUE_COMMON_BASE_URL_SUFFIX_DEFAULT
+ + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
+ final String serverLog = serverHome + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
+ final String serverConfig = serverHome + JBossASConfigurationInitializer.VALUE_SERVER_CONFIG_URL_SUFFIX_DEFAULT;
+ final String serverLib = serverHome + JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT;
+ final String serverData = serverHome + JBossASConfigurationInitializer.VALUE_SERVER_DATA_DIR_SUFFIX_DEFAULT;
+ final String serverTemp = serverHome + JBossASConfigurationInitializer.VALUE_SERVER_TEMP_DIR_SUFFIX_DEFAULT;
+ final String partitionName = JBossASConfigurationInitializer.VALUE_PARITION_NAME_DEFAULT;
+ final Boolean nativeLoad = JBossASConfigurationInitializer.VALUE_NATIVE_LOAD_DEFAULT;
+ final String nativeLibLocation = serverTemp + JBossASConfigurationInitializer.VALUE_NATIVE_DIR_SUFFIX_DEFAULT;
+ final Boolean usePlatformMBeanServer = JBossASConfigurationInitializer.VALUE_PLATFORM_MBEAN_SERVER_DEFAULT;
// Populate
config.jbossHome(jbossHome).bootstrapHome(bootstrapHome).bootstrapName(bootstrapName).bindAddress(bindAddress)
@@ -584,9 +584,9 @@
// Build Bootstrap Home relative to JBOSS_HOME
final File bootstrapHome = new File(jbossHome,
- JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_BASE_URL_SUFFIX
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_NAME + SLASH
- + JBossASConfigurationInitializer.DEFAULT_VALUE_SERVER_CONFIG_URL_SUFFIX + BOOTSTRAP_NAME);
+ JBossASConfigurationInitializer.VALUE_SERVER_BASE_URL_SUFFIX_DEFAULT
+ + JBossASConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT + SLASH
+ + JBossASConfigurationInitializer.VALUE_SERVER_CONFIG_URL_SUFFIX_DEFAULT + BOOTSTRAP_NAME);
// Convert to URL
final URL bootstrapHomeUrl = bootstrapHome.toURI().toURL();
Modified: projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/config/JBossASConfigurationInitializer.java
===================================================================
--- projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/config/JBossASConfigurationInitializer.java 2009-05-08 21:13:34 UTC (rev 88555)
+++ projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/config/JBossASConfigurationInitializer.java 2009-05-08 21:13:44 UTC (rev 88556)
@@ -52,7 +52,16 @@
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_BIND_ADDRESS}
* is not defined
*/
- String DEFAULT_VALUE_BIND_ADDRESS = "127.0.0.1";
+ String VALUE_BIND_ADDRESS_DEFAULT = "127.0.0.1";
+
+ /**
+ * Default address which will be set
+ * if {@link JBossASServerConfig#getBindAddress()} or
+ * system or configuration property
+ * {@link JBossASServerConfig#PROP_KEY_JBOSSAS_BIND_ADDRESS}
+ * is not defined
+ */
+ String VALUE_BIND_ADDRESS_ALL = "127.0.0.1";
/**
* Default server name which will be set if
@@ -61,7 +70,7 @@
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_SERVER_NAME}
* is not defined
*/
- String DEFAULT_VALUE_SERVER_NAME = "default";
+ String VALUE_SERVER_NAME_DEFAULT = "default";
/**
* The suffix used when generating the default value for
@@ -69,66 +78,66 @@
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_COMMON_LIBRARY_URL} and
* {@link #PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL}.
*/
- String DEFAULT_VALUE_LIBRARY_URL_SUFFIX = "lib/";
+ String VALUE_LIBRARY_URL_SUFFIX_DEFAULT = "lib/";
/**
* The suffix used when generating the default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_SERVER_BASE_URL}.
*/
- String DEFAULT_VALUE_SERVER_BASE_URL_SUFFIX = "server/";
+ String VALUE_SERVER_BASE_URL_SUFFIX_DEFAULT = "server/";
/**
* The suffix used when generating the default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_COMMON_BASE_URL}
*/
- String DEFAULT_VALUE_COMMON_BASE_URL_SUFFIX = "common/";
+ String VALUE_COMMON_BASE_URL_SUFFIX_DEFAULT = "common/";
/**
* The suffix used when generating the default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_SERVER_LOG_DIR}.
*/
- String DEFAULT_VALUE_SERVER_LOG_DIR_SUFFIX = "log/";
+ String VALUE_SERVER_LOG_DIR_SUFFIX_DEFAULT = "log/";
/**
* The suffix used when generating the default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_SERVER_CONF_URL}.
*/
- String DEFAULT_VALUE_SERVER_CONFIG_URL_SUFFIX = "conf/";
+ String VALUE_SERVER_CONFIG_URL_SUFFIX_DEFAULT = "conf/";
/**
* The suffix used when generating the default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_SERVER_DATA_DIR}.
*/
- String DEFAULT_VALUE_SERVER_DATA_DIR_SUFFIX = "data/";
+ String VALUE_SERVER_DATA_DIR_SUFFIX_DEFAULT = "data/";
/**
* The suffix used when generating the default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_SERVER_TEMP_DIR}.
*/
- String DEFAULT_VALUE_SERVER_TEMP_DIR_SUFFIX = "tmp/";
+ String VALUE_SERVER_TEMP_DIR_SUFFIX_DEFAULT = "tmp/";
/**
* The partition name used as the default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_PARTITION_NAME}
*/
- String DEFAULT_VALUE_PARITION_NAME = "DefaultPartition";
+ String VALUE_PARITION_NAME_DEFAULT = "DefaultPartition";
/**
* The default value for
* {@link JBossASServerConfig#PROP_KEY_JBOSSAS_NATIVE_LOAD}
*/
- Boolean DEFAULT_VALUE_NATIVE_LOAD = false;
+ Boolean VALUE_NATIVE_LOAD_DEFAULT = false;
/**
* The default suffix used to construct native libaray
* locations, relative to the Server Temp Home
* (eg. $JBOSS_HOME/server/[serverName]/tmp/native/)
*/
- String DEFAULT_VALUE_NATIVE_DIR_SUFFIX = "native/";
+ String VALUE_NATIVE_DIR_SUFFIX_DEFAULT = "native/";
/**
* The default value used in determining whether or not
* to use the Platform MBean Server under JDK 1.5+
*/
- Boolean DEFAULT_VALUE_PLATFORM_MBEAN_SERVER = true;
+ Boolean VALUE_PLATFORM_MBEAN_SERVER_DEFAULT = true;
}
More information about the jboss-cvs-commits
mailing list