[jboss-cvs] JBossAS SVN: r87744 - in projects/bootstrap/trunk/impl-as/src: main/java/org/jboss/bootstrap/impl/as/server and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 23 20:36:23 EDT 2009
Author: ALRubinger
Date: 2009-04-23 20:36:22 -0400 (Thu, 23 Apr 2009)
New Revision: 87744
Modified:
projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java
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/JBossASConfigurationValidator.java
projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java
projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java
projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializer.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/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java
Log:
[JBBOOT-31] Added support for jboss.server.lib.url
Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java 2009-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -99,6 +99,11 @@
*/
private URL serverConfigLocation;
+ /**
+ * Location in which the server libraries reside
+ */
+ private URL serverLibLocation;
+
//-------------------------------------------------------------------------------||
// Constructor ------------------------------------------------------------------||
//-------------------------------------------------------------------------------||
@@ -528,6 +533,56 @@
return this.covarientReturn();
}
+ /* (non-Javadoc)
+ * @see org.jboss.bootstrap.impl.as.config.JBossASServerConfig#getServerLibLocation()
+ */
+ public URL getServerLibLocation()
+ {
+ return this.serverLibLocation;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.bootstrap.impl.as.config.JBossASServerConfig#serverLibLocation(java.lang.String)
+ */
+ public JBossASServerConfig serverLibLocation(String serverLibLocation) throws IllegalArgumentException
+ {
+ // If null, just pass along
+ if (serverLibLocation == null)
+ {
+ return this.serverLibLocation((URL) null);
+ }
+
+ // Convert this String into a URL via File
+ final File file = new File(serverLibLocation);
+ URL url = null;
+ try
+ {
+ url = file.toURI().toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalArgumentException("Cannot construct URL given: " + serverLibLocation, e);
+ }
+
+ // Return
+ return this.serverLibLocation(url);
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.bootstrap.impl.as.config.JBossASServerConfig#serverLibLocation(java.net.URL)
+ */
+ public JBossASServerConfig serverLibLocation(URL serverLibLocation)
+ {
+ // Set
+ this.serverLibLocation = serverLibLocation;
+
+ // Set properties
+ this.setPropertyForUrl(PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL, serverLibLocation);
+
+ // Return
+ return this.covarientReturn();
+ }
+
//-------------------------------------------------------------------------------||
// Internal Helper Methods ------------------------------------------------------||
//-------------------------------------------------------------------------------||
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-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -158,6 +158,17 @@
resolvedServerConfLocation = this.adjustToTrailingSlash(resolvedServerConfLocation);
config.serverConfLocation(resolvedServerConfLocation);
+ // ${jboss.server.lib.url}
+ final URL serverLibLocation = config.getServerLibLocation();
+ final String serverLibDefault = resolvedServerHomeLocation
+ + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+ final String currentServerLibLocation = serverLibLocation != null ? serverLibLocation.toExternalForm() : null;
+ String resolvedServerLibLocation = this.resolvePropertyValue(
+ JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL, currentServerLibLocation, serverLibDefault,
+ configProps);
+ resolvedServerLibLocation = this.adjustToTrailingSlash(resolvedServerLibLocation);
+ config.serverLibLocation(resolvedServerLibLocation);
+
}
//-------------------------------------------------------------------------------||
Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidator.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidator.java 2009-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidator.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -91,6 +91,8 @@
this.require(config.getServerLogLocation(), JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LOG_DIR);
// jboss.server.conf.dir
this.require(config.getServerConfLocation(), JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_CONF_URL);
+ // jboss.server.lib.dir
+ this.require(config.getServerLibLocation(), JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL);
// Log
log.debug("Configuration is valid: " + config);
Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java 2009-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -131,6 +131,13 @@
*/
String PROP_KEY_JBOSSAS_SERVER_CONF_URL = "jboss.server.config.url";
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the URL where JBoss will read server specific
+ * library files from.
+ */
+ String PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL = "jboss.server.lib.url";
+
//-------------------------------------------------------------------------------||
// Contracts --------------------------------------------------------------------||
//-------------------------------------------------------------------------------||
@@ -351,4 +358,29 @@
* is non-null and cannot be constructed into a URL
*/
JBossASServerConfig serverConfLocation(String serverConfLocation) throws IllegalArgumentException;
+
+ /**
+ * Obtains the location in which the server libraries reside
+ *
+ * @return
+ */
+ URL getServerLibLocation();
+
+ /**
+ * Sets the location in which the server libraries reside
+ *
+ * @param serverLibLocation
+ * @return
+ */
+ JBossASServerConfig serverLibLocation(URL serverLibLocation);
+
+ /**
+ * Sets the location in which the server libraries reside
+ *
+ * @param serverLibLocation
+ * @return
+ * @throws IllegalArgumentException If the specified argument
+ * is non-null and cannot be constructed into a URL
+ */
+ JBossASServerConfig serverLibLocation(String serverLibLocation) throws IllegalArgumentException;
}
Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java 2009-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -97,13 +97,6 @@
/**
* Constant that holds the name of the environment property
- * for specifying the URL where JBoss will read server specific
- * library files from.
- */
- String PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL = "jboss.server.lib.url";
-
- /**
- * Constant that holds the name of the environment property
* for specifying a library directory URL that points to libraries
* shared by the various server configurations.
*
Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializer.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializer.java 2009-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializer.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -98,6 +98,7 @@
final URL commonBaseUrl = configuration.getCommonBaseLocation();
final String serverLogDir = this.getAbsoluteLocationOfUrl(configuration.getServerLogLocation());
final URL serverConfDir = configuration.getServerConfLocation();
+ final URL serverLibDir = configuration.getServerLibLocation();
// Set our system properties
this.setSystemProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_HOME, jbossHomeDir);
@@ -113,6 +114,7 @@
this.setSystemProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_COMMON_BASE_URL, commonBaseUrl);
this.setSystemProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LOG_DIR, serverLogDir);
this.setSystemProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_CONF_URL, serverConfDir);
+ this.setSystemProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL, serverLibDir);
}
//-------------------------------------------------------------------------------||
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-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -297,6 +297,28 @@
log.info("Got expected: " + expected);
}
+ /**
+ * Ensures that the server lib location defaults to $JBOSS_HOME/server/$serverName/lib
+ * @throws Throwable
+ */
+ @Test
+ public void testServerLibDefault() throws Throwable
+ {
+ // Log
+ log.info("testServerLibDefault");
+
+ // Get out server base location
+ final String actual = config.getServerLibLocation().toExternalForm();
+
+ // Get expected value
+ final String expected = this.getServerHomeLocation()
+ + JBossASConfigurationInitializer.DEFAULT_VALUE_LIBRARY_URL_SUFFIX;
+
+ // Test
+ TestCase.assertEquals("Server lib location was not defaulted as expected", expected, actual);
+ log.info("Got expected: " + expected);
+ }
+
//-------------------------------------------------------------------------------||
// Internal Helper Methods ------------------------------------------------------||
//-------------------------------------------------------------------------------||
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-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -332,6 +332,23 @@
this.assertMissingValueFails(config, "server config location");
}
+ /**
+ * Ensures that an empty/null Server Lib location fails
+ */
+ @Test
+ public void testNoServerLibLocationFails()
+ {
+ // Log
+ log.info("testNoServerLibLocationFails");
+
+ // Get config and clear out
+ final JBossASServerConfig config = this.config;
+ config.serverLibLocation((URL) null);
+
+ // Test
+ this.assertMissingValueFails(config, "server lib location");
+ }
+
//-------------------------------------------------------------------------------||
// Internal Helper Methods ------------------------------------------------------||
//-------------------------------------------------------------------------------||
@@ -386,12 +403,13 @@
final String commonBase = jbossHome + JBossASConfigurationInitializer.DEFAULT_VALUE_COMMON_BASE_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;
// Populate
config.jbossHome(jbossHome).bootstrapHome(bootstrapHome).bootstrapName(bootstrapName).bindAddress(bindAddress)
.serverName(serverName).bootLibraryLocation(bootLib).serverBaseLocation(serverBase).serverHomeLocation(
serverHome).commonBaseLocation(commonBase).serverLogLocation(serverLog).serverConfLocation(
- serverConfig);
+ serverConfig).serverLibLocation(serverLib);
// Return
return config;
Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java 2009-04-24 00:06:41 UTC (rev 87743)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java 2009-04-24 00:36:22 UTC (rev 87744)
@@ -129,6 +129,7 @@
final String commonBaseUrlPropKey = JBossASServerConfig.PROP_KEY_JBOSSAS_COMMON_BASE_URL;
final String serverLogDirPropKey = JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LOG_DIR;
final String serverConfUrlPropKey = JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_CONF_URL;
+ final String serverLibUrlPropKey = JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL;
// Get Properties from Configuration
final Map<String, String> properties = configuration.getProperties();
@@ -145,6 +146,7 @@
final String commonBaseUrlFromConfProp = properties.get(commonBaseUrlPropKey);
final String serverLogDirFromConfProp = properties.get(serverLogDirPropKey);
final String serverConfUrlFromConfProp = properties.get(serverConfUrlPropKey);
+ final String serverLibUrlFromConfProp = properties.get(serverLibUrlPropKey);
// Get Properties from System
final String jbossHomeFromSystem = System.getProperty(jbossHomePropKey);
@@ -160,6 +162,7 @@
final String commonBaseUrlFromSystem = System.getProperty(commonBaseUrlPropKey);
final String serverLogDirFromSystem = System.getProperty(serverLogDirPropKey);
final String serverConfUrlFromSystem = System.getProperty(serverConfUrlPropKey);
+ final String serverLibUrlFromSystem = System.getProperty(serverLibUrlPropKey);
// Get Expected Values
final URL jbossHomeFromConf = configuration.getJBossHome();
@@ -182,6 +185,7 @@
final File serverLogFile = new File(serverLogFromConf.toURI());
final String serverLogDirFromConf = serverLogFile.getAbsolutePath();
final String serverConfUrlFromConf = configuration.getServerConfLocation().toExternalForm();
+ final String serverLibUrlFromConf = configuration.getServerLibLocation().toExternalForm();
// Ensure all equal
TestCase.assertEquals("JBoss Home in configuration must match the config property", jbossHomeDirFromConf,
@@ -236,6 +240,10 @@
serverConfUrlFromConfProp);
TestCase.assertEquals("Server Conf URL in configuration must match the system property", serverConfUrlFromConf,
serverConfUrlFromSystem);
+ TestCase.assertEquals("Server Lib URL in configuration must match the config property", serverLibUrlFromConf,
+ serverLibUrlFromConfProp);
+ TestCase.assertEquals("Server Lib URL in configuration must match the system property", serverLibUrlFromConf,
+ serverLibUrlFromSystem);
// Cleanup
server.shutdown();
@@ -254,6 +262,7 @@
final String commonBaseUrlFromSystemAfterCleanup = System.getProperty(commonBaseUrlPropKey);
final String serverLogDirFromSystemAfterCleanup = System.getProperty(serverLogDirPropKey);
final String serverConfUrlFromSystemAfterCleanup = System.getProperty(serverConfUrlPropKey);
+ final String serverLibUrlFromSystemAfterCleanup = System.getProperty(serverLibUrlPropKey);
// Ensure all null
final String failMessage = "System property should be null after cleanup";
@@ -270,5 +279,6 @@
TestCase.assertNull(failMessage, commonBaseUrlFromSystemAfterCleanup);
TestCase.assertNull(failMessage, serverLogDirFromSystemAfterCleanup);
TestCase.assertNull(failMessage, serverConfUrlFromSystemAfterCleanup);
+ TestCase.assertNull(failMessage, serverLibUrlFromSystemAfterCleanup);
}
}
More information about the jboss-cvs-commits
mailing list