[jboss-cvs] JBossAS SVN: r87852 - in projects/bootstrap/trunk: impl-base/src/main/java/org/jboss/bootstrap/impl/base/config and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 27 05:29:34 EDT 2009
Author: ALRubinger
Date: 2009-04-27 05:29:34 -0400 (Mon, 27 Apr 2009)
New Revision: 87852
Removed:
projects/bootstrap/trunk/impl-mc/src/test/resources/conf/
Modified:
projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java
projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationInitializer.java
projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationValidator.java
projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicServerConfig.java
projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractBasicServerInitializer.java
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/TestConfigFactory.java
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/BasicConfigurationTestCase.java
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigInitializationTestCase.java
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigValidationTestCase.java
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/ServerInitializationTestCase.java
projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java
projects/bootstrap/trunk/spi/src/main/java/org/jboss/bootstrap/spi/config/ServerConfig.java
Log:
[JBBOOT-55] Removed bootstrapConf property (redundant)
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-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -434,29 +434,6 @@
log.info("Got expected: " + expected);
}
- /**
- * Ensures that the default AS Bootstrap Conf is set to:
- * $JBOSS_HOME/server/$serverName/conf
- *
- * @throws Throwable
- */
- @Test
- public void testBootstrapConfDefault() throws Throwable
- {
- // Log
- log.info("testBootstrapConfDefault");
-
- // Get out the bootstrap URL
- final String actual = config.getBootstrapConfLocation().toExternalForm();
-
- // Get expected value
- final String expected = this.getBootstrapHome(); // For AS, the Conf is the home
-
- // Test
- TestCase.assertEquals("Bootstrap Conf for AS was not defaulted as expected", expected, actual);
- log.info("Got expected: " + expected);
- }
-
//-------------------------------------------------------------------------------||
// Internal Helper Methods ------------------------------------------------------||
//-------------------------------------------------------------------------------||
Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationInitializer.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationInitializer.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationInitializer.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -93,7 +93,6 @@
final URL bootstrapUrl = config.getBootstrapUrl();
final URL home = config.getBootstrapHome();
- final URL conf = config.getBootstrapConfLocation();
final String name = config.getBootstrapName();
/*
@@ -132,48 +131,6 @@
* If bootstrapConf was not initialized, set it from either home or URL base
*/
- if (conf == null)
- {
- // Make a new conf
- URL newConf = null;
-
- // If we've got a home
- if (home != null)
- {
- try
- {
- String homeExternal = home.toExternalForm();
- newConf = new URL(homeExternal);
- log.debug("Defaulted bootstrapConf from bootstrap home: " + homeExternal);
- }
- catch (MalformedURLException e)
- {
- throw new RuntimeException("Could not default the conf from home", e);
- }
- }
- // If we've got a bootstrapURL
- else if (bootstrapUrl != null)
- {
- try
- {
- final String bootstrapUrlString = bootstrapUrl.toExternalForm();
- final String bootstrapUrlBase = bootstrapUrlString.substring(0, bootstrapUrlString.lastIndexOf("/") + 1);
- newConf = new URL(bootstrapUrlBase);
- log.debug("Defaulted bootstrapConf from bootstrapURL's base: " + bootstrapUrlBase);
- }
- catch (MalformedURLException e)
- {
- throw new RuntimeException("Could not default the conf from bootstrapURL base", e);
- }
- }
-
- // Set
- if (newConf != null)
- {
- config.bootstrapConfLocation(newConf);
- }
- }
-
// If there's no name, default it, then run this config again to
// default other properties if necessary
if (name == null || name.length() == 0)
@@ -248,13 +205,6 @@
config.bootstrapHome(overrideHome);
}
- // Conf
- final String overrideConf = this.getOverrideValue(ServerConfig.PROP_KEY_BOOTSTRAP_CONF_URL, properties);
- if (overrideConf != null)
- {
- config.bootstrapConfLocation(overrideConf);
- }
-
// URL
final String overrideUrl = this.getOverrideValue(ServerConfig.PROP_KEY_BOOTSTRAP_URL, properties);
if (overrideUrl != null)
Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationValidator.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationValidator.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationValidator.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -29,7 +29,6 @@
import org.jboss.bootstrap.spi.config.ServerConfig;
import org.jboss.logging.Logger;
-
/**
* AbstractBasicConfigurationValidator
*
@@ -75,7 +74,6 @@
final String name = config.getBootstrapName();
final URL home = config.getBootstrapHome();
final URL direct = config.getBootstrapUrl();
- final URL conf = config.getBootstrapConfLocation();
// If no direct bootstrap URL
if (direct == null)
@@ -88,17 +86,6 @@
}
}
- // If no conf
- if (conf == null)
- {
- // Ensure we may construct this from home
- if (home == null)
- {
- throw new InvalidConfigurationException("Bootstrap configuration location must be specified explicity, "
- + "or a home must be provided such that it may be constructed");
- }
- }
-
// Log
log.debug("Configuration passed on: " + config);
}
Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicServerConfig.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicServerConfig.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicServerConfig.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -73,14 +73,6 @@
private URL bootstrapUrl;
/**
- * Bootstrap configuration home (URLs referenced in the
- * main bootstrap are relative to this URL).
- * Synchronized on "this". Must
- * not be exported (so copy on return).
- */
- private URL bootstrapConfLocation;
-
- /**
* Bootstrap home, used in defaulting/construction
* of other properties. Synchronized on "this". Must
* not be exported (so copy on return).
@@ -164,19 +156,6 @@
//-------------------------------------------------------------------------------------||
/* (non-Javadoc)
- * @see org.jboss.bootstrap.spi.config.ServerConfig#getBootstrapConfLocation()
- */
- public URL getBootstrapConfLocation()
- {
- URL url = null;
- synchronized (this)
- {
- url = this.bootstrapConfLocation;
- }
- return this.copyURL(url);
- }
-
- /* (non-Javadoc)
* @see org.jboss.bootstrap.spi.config.ServerConfig#getBootstrapHome()
*/
public URL getBootstrapHome()
@@ -219,27 +198,6 @@
}
/* (non-Javadoc)
- * @see org.jboss.bootstrap.spi.config.ServerConfig#setBootstrapConfLocation(java.net.URL)
- */
- public synchronized T bootstrapConfLocation(final URL confLocation) throws IllegalArgumentException
- {
- // Precondition check
- this.checkMutable();
-
- // Adjust
- final URL newUrl = this.adjustToDirectory(confLocation);
-
- // Set property
- this.setPropertyForUrl(PROP_KEY_BOOTSTRAP_CONF_URL, newUrl);
-
- // Set URL
- this.bootstrapConfLocation = newUrl;
-
- // Return
- return this.covarientReturn();
- }
-
- /* (non-Javadoc)
* @see org.jboss.bootstrap.spi.config.ServerConfig#setBootstrapHome(java.net.URL)
*/
public synchronized T bootstrapHome(final URL bootstrapHome) throws IllegalArgumentException
@@ -328,18 +286,6 @@
}
/* (non-Javadoc)
- * @see org.jboss.bootstrap.spi.config.ServerConfig#bootstrapConfLocation(java.lang.String)
- */
- public T bootstrapConfLocation(String confLocation) throws IllegalArgumentException, IllegalStateException
- {
- // Set
- this.bootstrapConfLocation(this.urlFromString(confLocation));
-
- // Return
- return this.covarientReturn();
- }
-
- /* (non-Javadoc)
* @see org.jboss.bootstrap.spi.config.ServerConfig#bootstrapHome(java.lang.String)
*/
public T bootstrapHome(String bootstrapHome) throws IllegalArgumentException, IllegalStateException
Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractBasicServerInitializer.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractBasicServerInitializer.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractBasicServerInitializer.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -32,7 +32,6 @@
import org.jboss.bootstrap.spi.server.ServerInitializer;
import org.jboss.logging.Logger;
-
/**
* AbstractBasicServerInitializer
*
@@ -135,7 +134,6 @@
// Set Properties from Config
this.setSystemProperty(ServerConfig.PROP_KEY_BOOTSTRAP_HOME_URL, configuration.getBootstrapHome());
this.setSystemProperty(ServerConfig.PROP_KEY_BOOTSTRAP_URL, configuration.getBootstrapUrl());
- this.setSystemProperty(ServerConfig.PROP_KEY_BOOTSTRAP_CONF_URL, configuration.getBootstrapConfLocation());
this.setSystemProperty(ServerConfig.PROP_KEY_BOOTSTRAP_NAME, configuration.getBootstrapName());
}
Modified: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/TestConfigFactory.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/TestConfigFactory.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/TestConfigFactory.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -39,8 +39,6 @@
// Class Members ----------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
- private static final String NAME_CONF = "conf";
-
private static final String NAME_BOOTSTRAP = "bootstrap.xml";
//-------------------------------------------------------------------------------------||
@@ -68,11 +66,9 @@
final URL home = getResourcesBase();
// Construct URLs
- URL conf = null;
URL bootstrap = null;
try
{
- conf = new URL(home, NAME_CONF);
bootstrap = new URL(home, NAME_BOOTSTRAP);
}
catch (MalformedURLException e)
@@ -81,8 +77,7 @@
}
// Populate and return
- return config.bootstrapHome(home).bootstrapConfLocation(conf).bootstrapUrl(bootstrap).bootstrapName(
- NAME_BOOTSTRAP);
+ return config.bootstrapHome(home).bootstrapUrl(bootstrap).bootstrapName(NAME_BOOTSTRAP);
}
/**
Modified: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/BasicConfigurationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/BasicConfigurationTestCase.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/BasicConfigurationTestCase.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -30,7 +30,6 @@
import org.jboss.logging.Logger;
import org.junit.Test;
-
/**
* BasicConfigurationTestCase
*
@@ -55,37 +54,6 @@
//-------------------------------------------------------------------------------------||
/**
- * Ensures that the supplied conf location is a directory
- *
- * JBBOOT-36
- *
- * @throws Throwable
- */
- @Test
- public void testValidationConfIsDirectory() throws Throwable
- {
- // Log
- log.info("testValidationConfIsDirectory");
-
- // Make a config
- final TestServerConfig configuration = new TestServerConfig();
-
- // Make some URL to a non-directory
- final URL url = new URL("http://manual");
- final String externalForm = url.toExternalForm();
- TestCase
- .assertTrue("Test should not start by looking for trailing slash", !externalForm.endsWith(TRAILING_SLASH));
-
- // Set
- configuration.bootstrapConfLocation(url);
-
- // Test
- final URL newUrl = configuration.getBootstrapConfLocation();
- TestCase.assertTrue("Conf location should have been adjusted to have a trailing slash", newUrl.toExternalForm()
- .endsWith(TRAILING_SLASH));
- }
-
- /**
* Ensures that the supplied home location is a directory
*
* JBBOOT-36
Modified: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigInitializationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigInitializationTestCase.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigInitializationTestCase.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -73,66 +73,6 @@
//-------------------------------------------------------------------------------------||
/**
- * Ensures that the conf is defaulted from home
- *
- * @throws Throwable
- */
- @Test
- public void testBootstrapConfDefaultedInInitializationFromHome() throws Throwable
- {
- // Log
- log.info("testBootstrapConfDefaultedInInitializationFromHome");
-
- // Get a populated config
- final TestServerConfig configuration = TestConfigFactory.createConfiguration();
-
- // Remove conf and set on server
- configuration.bootstrapConfLocation((String) null);
-
- // Initialize
- configurationInitializer.initialize(configuration);
-
- // Create the expected URL
- final URL expectedConfigurationURL = configuration.getBootstrapHome();
-
- // Get the actual URL
- final URL confURL = configuration.getBootstrapConfLocation();
-
- // Test
- TestCase.assertNotNull("Configuration URL was not initialized", confURL);
- TestCase.assertEquals("Initialized configuration is to incorrect location", expectedConfigurationURL, confURL);
- log.info("Got expected Configuration URL: " + confURL);
- }
-
- /**
- * Ensures that the conf is required by validation if no home is provided
- *
- * @throws Throwable
- */
- @Test
- public void testBootstrapConfDefaultedInInitializationFromBootstrapUrlBase() throws Throwable
- {
- // Get a populated config
- final TestServerConfig configuration = TestConfigFactory.createConfiguration();
-
- // Remove conf and home
- configuration.bootstrapHome((String) null).bootstrapConfLocation((String) null);
-
- // Initialize
- configurationInitializer.initialize(configuration);
-
- // Create the expected URL
- final URL expectedConfigurationURL = TestConfigFactory.getResourcesBase();
-
- // Get the actual URL
- final URL confURL = configuration.getBootstrapConfLocation();
-
- // Test
- TestCase.assertNotNull("Configuration URL was not initialized", confURL);
- TestCase.assertEquals("Initialized configuration is to incorrect location", expectedConfigurationURL, confURL);
- }
-
- /**
* Ensures that setting a configuration results in proper defaulting
* of the bootstrap URL if it's not been explicitly specified
*
@@ -254,13 +194,11 @@
// Define some property values
final String expectedBootstrapName = "overrideBootstrapName";
final String expectedBootstrapHome = "file://overrideBootstrapHome/";
- final String expectedBootstrapConf = "file://overrideBootstrapConf/";
final String expectedBootstrapUrl = "file://overrideBootstrapUrl";
// Set as overrides
configuration.property(ServerConfig.PROP_KEY_BOOTSTRAP_NAME, expectedBootstrapName).property(
ServerConfig.PROP_KEY_BOOTSTRAP_HOME_URL, expectedBootstrapHome).property(
- ServerConfig.PROP_KEY_BOOTSTRAP_CONF_URL, expectedBootstrapConf).property(
ServerConfig.PROP_KEY_BOOTSTRAP_URL, expectedBootstrapUrl);
// Initialize
@@ -270,8 +208,6 @@
final String failMessage = "Override was not honored";
TestCase.assertEquals(failMessage, expectedBootstrapName, configuration.getBootstrapName());
TestCase.assertEquals(failMessage, expectedBootstrapHome, configuration.getBootstrapHome().toExternalForm());
- TestCase.assertEquals(failMessage, expectedBootstrapConf, configuration.getBootstrapConfLocation()
- .toExternalForm());
TestCase.assertEquals(failMessage, expectedBootstrapUrl, configuration.getBootstrapUrl().toExternalForm());
}
@@ -297,19 +233,16 @@
final URL expectedHome = home;
final String defaultName = ConfigurationInitializer.DEFAULT_VALUE_BOOTSTRAP_NAME;
final URL expectedUrl = new URL(expectedHome, defaultName);
- final URL expectedConf = expectedHome;
final String expectedName = defaultName;
// Get the actual name
final URL actualHome = configuration.getBootstrapHome();
final URL actualUrl = configuration.getBootstrapUrl();
- final URL actualConf = configuration.getBootstrapConfLocation();
final String actualname = configuration.getBootstrapName();
// Test
TestCase.assertEquals("Initialized bootstrap is to incorrect home", expectedHome, actualHome);
TestCase.assertEquals("Initialized bootstrap is to incorrect URL", expectedUrl, actualUrl);
- TestCase.assertEquals("Initialized bootstrap is to incorrect conf", expectedConf, actualConf);
TestCase.assertEquals("Initialized bootstrap is to incorrect name", expectedName, actualname);
}
}
Modified: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigValidationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigValidationTestCase.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/unit/ConfigValidationTestCase.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -79,7 +79,6 @@
final TestServerConfig configuration = TestConfigFactory.createConfiguration();
// Test
- TestCase.assertNotNull("conf was not populated", configuration.getBootstrapConfLocation());
TestCase.assertNotNull("home was not populated", configuration.getBootstrapHome());
TestCase.assertNotNull("name was not populated", configuration.getBootstrapName());
TestCase.assertNotNull("URL was not populated", configuration.getBootstrapUrl());
Modified: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/ServerInitializationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/ServerInitializationTestCase.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/ServerInitializationTestCase.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -110,19 +110,16 @@
// Get Properties from Configuration
final String homeFromConfigProp = configuration.getProperties().get(ServerConfig.PROP_KEY_BOOTSTRAP_HOME_URL);
final String bootstrapURLFromConfigProp = configuration.getProperties().get(ServerConfig.PROP_KEY_BOOTSTRAP_URL);
- final String confFromConfigProp = configuration.getProperties().get(ServerConfig.PROP_KEY_BOOTSTRAP_CONF_URL);
final String nameFromConfigProp = configuration.getProperties().get(ServerConfig.PROP_KEY_BOOTSTRAP_NAME);
// Get Properties from System
final String homeFromSystem = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_HOME_URL);
final String bootstrapURLFromSystem = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_URL);
- final String confFromSystem = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_CONF_URL);
final String nameFromSystem = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_NAME);
// Get Expected Values
final String home = configuration.getBootstrapHome().toExternalForm();
final String bootstrapURL = configuration.getBootstrapUrl().toExternalForm();
- final String conf = configuration.getBootstrapConfLocation().toExternalForm();
final String name = configuration.getBootstrapName();
// Ensure all equal
@@ -132,8 +129,6 @@
bootstrapURLFromConfigProp);
TestCase.assertEquals("bootstrapURL in configuration must match the system property", bootstrapURL,
bootstrapURLFromSystem);
- TestCase.assertEquals("conf in configuration must match the config property", conf, confFromConfigProp);
- TestCase.assertEquals("conf in configuration must match the system property", conf, confFromSystem);
TestCase.assertEquals("name in configuration must match the config property", name, nameFromConfigProp);
TestCase.assertEquals("name in configuration must match the system property", name, nameFromSystem);
@@ -143,14 +138,12 @@
// Get Properties from System
final String homeFromSystemAfterCleanup = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_HOME_URL);
final String bootstrapURLFromSystemAfterCleanup = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_URL);
- final String confFromSystemAfterCleanup = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_CONF_URL);
final String nameFromSystemAfterCleanup = System.getProperty(ServerConfig.PROP_KEY_BOOTSTRAP_NAME);
// Ensure all null
String failMessage = "System property should be null after cleanup";
TestCase.assertNull(failMessage, homeFromSystemAfterCleanup);
TestCase.assertNull(failMessage, bootstrapURLFromSystemAfterCleanup);
- TestCase.assertNull(failMessage, confFromSystemAfterCleanup);
TestCase.assertNull(failMessage, nameFromSystemAfterCleanup);
}
Modified: projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -197,7 +197,7 @@
// Determine the url for the bootstrap
final T config = this.getConfiguration();
- final URL configURL = config.getBootstrapConfLocation();
+ final URL homeUrl = config.getBootstrapHome();
final URL bootstrapUrl = config.getBootstrapUrl();
log.info("Starting Microcontainer, Main bootstrapURL=" + bootstrapUrl);
@@ -213,7 +213,7 @@
log.warn("No bootstrap urls in " + bootstrapUrl);
}
log.debug("BootstrapURLs=" + bootstrapURLs);
- log.debug("Bootstrap URLs are relative to: " + configURL);
+ log.debug("Bootstrap URLs are relative to: " + homeUrl);
// Create an xml deployer
kernelDeployer = new TempBasicXMLDeployer(kernel);
@@ -223,7 +223,7 @@
for (String bootstrapURL : bootstrapURLs)
{
log.debug("BEFORE: " + bootstrapURL);
- final URL suburl = new URL(configURL, bootstrapURL);
+ final URL suburl = new URL(homeUrl, bootstrapURL);
log.debug("Deploying bootstrap xml: " + suburl);
kernelDeployer.deploy(suburl);
}
Modified: projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -59,14 +59,10 @@
private static final Logger log = Logger.getLogger(MCServerUnitTestCase.class);
- private static final String NAME_CONF = "conf/";
-
private static final String NAME_BOOTSTRAP_POJO = "bootstrap-pojo.xml";
private static final String BIND_NAME_POJO = "org.jboss.bootstrap.test.POJO";
- private static final String VALUE_POJO_CONF_DEPLOYMENT = "deployedFromConf";
-
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
@@ -176,32 +172,6 @@
this.assertPojo();
}
- /**
- * Ensures that deployment from a bootstrap.xml is relative to
- * an explicit bootstrap configuration directory
- *
- * @throws Throwable
- */
- @Test
- public void testBootstrapDeploymentFromExplicitConf() throws Throwable
- {
- // Log
- log.info("testBootstrapDeploymentFromExplicitConf");
-
- // Initialize
- final MCServer server = this.server;
-
- // Set name to deploy a test POJO via XML with default value
- final URL conf = new URL(this.getHome(), NAME_CONF);
- server.getConfiguration().bootstrapName(NAME_BOOTSTRAP_POJO).bootstrapConfLocation(conf);
-
- // Start the server
- server.start();
-
- // Test the POJO
- this.assertPojo(VALUE_POJO_CONF_DEPLOYMENT);
- }
-
//-------------------------------------------------------------------------------------||
// Internal Helper Methods ------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
Modified: projects/bootstrap/trunk/spi/src/main/java/org/jboss/bootstrap/spi/config/ServerConfig.java
===================================================================
--- projects/bootstrap/trunk/spi/src/main/java/org/jboss/bootstrap/spi/config/ServerConfig.java 2009-04-27 08:14:06 UTC (rev 87851)
+++ projects/bootstrap/trunk/spi/src/main/java/org/jboss/bootstrap/spi/config/ServerConfig.java 2009-04-27 09:29:34 UTC (rev 87852)
@@ -47,11 +47,6 @@
String PROP_KEY_BOOTSTRAP_HOME_URL = "jboss.bootstrap.home.url";
/**
- * Property denoting the URL of the configuration home
- */
- String PROP_KEY_BOOTSTRAP_CONF_URL = "jboss.bootstrap.conf.url";
-
- /**
* Property denoting the name of the bootstrap configuration
*/
String PROP_KEY_BOOTSTRAP_NAME = "jboss.bootstrap.name";
@@ -147,37 +142,6 @@
T bootstrapName(String name) throws IllegalArgumentException, IllegalStateException;
/**
- * Obtains the location of the bootstrap configuration location. Corresponds to
- * {@link ServerConfig#PROP_KEY_BOOTSTRAP_CONF_URL}.
- *
- * @return
- */
- URL getBootstrapConfLocation();
-
- /**
- * Sets the name of the bootstrap configuration location. Corresponds to
- * {@link ServerConfig#PROP_KEY_BOOTSTRAP_CONF_URL}.
- *
- * @param confLocation
- * @return This configuration
- * @throws IllegalArgumentException If the location was not specified
- * @throws IllegalStateException If the configuration has been frozen
- */
- T bootstrapConfLocation(URL confLocation) throws IllegalArgumentException, IllegalStateException;
-
- /**
- * Sets the location of the bootstrap file. Corresponds to
- * {@link ServerConfig#PROP_KEY_BOOTSTRAP_CONF_URL}.
- *
- * @param confLocation
- * @return This configuration
- * @throws IllegalArgumentException If the location was not specified,
- * or could not be assigned to a URL (ie. {@link MalformedURLException}
- * @throws IllegalStateException If the configuration has been frozen
- */
- T bootstrapConfLocation(String confLocation) throws IllegalArgumentException, IllegalStateException;
-
- /**
* Returns an immutable copy of the properties used in configuring the server
*
* @return
More information about the jboss-cvs-commits
mailing list