[jboss-cvs] JBossAS SVN: r84838 - in projects/bootstrap/trunk: src/main/java/org/jboss/bootstrap and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 26 23:17:55 EST 2009
Author: ALRubinger
Date: 2009-02-26 23:17:54 -0500 (Thu, 26 Feb 2009)
New Revision: 84838
Modified:
projects/bootstrap/trunk/pom.xml
projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/AbstractServerImpl.java
projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java
projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/ServerLoader.java
projects/bootstrap/trunk/src/test/java/org/jboss/bootstrap/test/jboot11/unit/FileFromServerConfigPropertyTestCase.java
Log:
[JBBOOT-15] Further strip jboss-bootstrap of VFS
Modified: projects/bootstrap/trunk/pom.xml
===================================================================
--- projects/bootstrap/trunk/pom.xml 2009-02-27 04:14:35 UTC (rev 84837)
+++ projects/bootstrap/trunk/pom.xml 2009-02-27 04:17:54 UTC (rev 84838)
@@ -92,12 +92,6 @@
<version>${version.org.jboss.microcontainer_jboss.kernel}</version>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.org.jboss_jboss.vfs}</version>
- </dependency>
-
<!-- junit:junit -->
<dependency>
<groupId>junit</groupId>
Modified: projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/AbstractServerImpl.java
===================================================================
--- projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/AbstractServerImpl.java 2009-02-27 04:14:35 UTC (rev 84837)
+++ projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/AbstractServerImpl.java 2009-02-27 04:17:54 UTC (rev 84838)
@@ -58,7 +58,16 @@
implements ServerProcess, NotificationEmitter
{
/** Instance logger. */
- protected Logger log = Logger.getLogger(AbstractServerImpl.class.getName() + " - [DEFAULT]");
+ protected static Logger log ;static{
+ try
+ {
+ log= Logger.getLogger(AbstractServerImpl.class.getName() + " - [DEFAULT]");
+ }
+ catch(Exception e )
+ {
+ // Swallow the exception if we cannot create the temporary logger
+ }
+ }
/** Container for version information. */
private final Version version = Version.getInstance();
Modified: projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java
===================================================================
--- projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java 2009-02-27 04:14:35 UTC (rev 84837)
+++ projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java 2009-02-27 04:17:54 UTC (rev 84838)
@@ -22,15 +22,14 @@
package org.jboss.bootstrap;
import java.io.File;
-import java.io.IOException;
import java.lang.reflect.Type;
import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.Properties;
import org.jboss.bootstrap.spi.Server;
import org.jboss.bootstrap.spi.ServerConfig;
+import org.jboss.logging.Logger;
import org.jboss.managed.api.annotation.ManagementComponent;
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperties;
@@ -47,7 +46,6 @@
import org.jboss.util.Null;
import org.jboss.util.Primitives;
import org.jboss.util.platform.Java;
-import org.jboss.virtual.VirtualFile;
/**
* A container for the basic configuration elements required to create
@@ -126,10 +124,10 @@
this.props = props;
// Must have HOME_DIR
- homeDir = getFile(ServerConfig.HOME_DIR);
+ homeDir = getFileFromProperty(ServerConfig.HOME_DIR);
if (homeDir == null)
throw new Exception("Missing configuration value for: " + ServerConfig.HOME_DIR);
- System.setProperty(ServerConfig.HOME_DIR, homeDir.toString());
+ System.setProperty(ServerConfig.HOME_DIR, homeDir.getAbsolutePath());
// Setup the SERVER_HOME_DIR system property
getServerHomeDir();
@@ -266,17 +264,10 @@
{
if (serverBaseDir == null)
{
- serverBaseDir = getFile(ServerConfig.SERVER_BASE_DIR);
+ serverBaseDir = getFileFromProperty(ServerConfig.SERVER_BASE_DIR);
if (serverBaseDir == null)
{
- try
- {
- serverBaseDir = new File(homeDir, ServerConfig.SERVER_BASE_DIR_SUFFIX);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ serverBaseDir = new File(homeDir, ServerConfig.SERVER_BASE_DIR_SUFFIX);
System.setProperty(ServerConfig.SERVER_BASE_DIR, serverBaseDir.toString());
}
}
@@ -290,17 +281,10 @@
{
if (serverHomeDir == null)
{
- serverHomeDir = getFile(ServerConfig.SERVER_HOME_DIR);
+ serverHomeDir = getFileFromProperty(ServerConfig.SERVER_HOME_DIR);
if (serverHomeDir == null)
{
- try
- {
- serverHomeDir = new File(getServerBaseDir(), getServerName());
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ serverHomeDir = new File(getServerBaseDir(), getServerName());
System.setProperty(ServerConfig.SERVER_HOME_DIR, serverHomeDir.toString());
}
}
@@ -322,17 +306,10 @@
{
if (serverLogDir == null)
{
- serverLogDir = getFile(ServerConfig.SERVER_LOG_DIR);
+ serverLogDir = getFileFromProperty(ServerConfig.SERVER_LOG_DIR);
if (serverLogDir == null)
{
- try
- {
- serverLogDir = new File(getServerHomeDir(), ServerConfig.SERVER_LOG_DIR_SUFFIX);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ serverLogDir = new File(getServerHomeDir(), ServerConfig.SERVER_LOG_DIR_SUFFIX);
System.setProperty(ServerConfig.SERVER_LOG_DIR, serverLogDir.toString());
}
}
@@ -351,17 +328,10 @@
{
if (serverTempDir == null)
{
- serverTempDir = getFile(ServerConfig.SERVER_TEMP_DIR);
+ serverTempDir = getFileFromProperty(ServerConfig.SERVER_TEMP_DIR);
if (serverTempDir == null)
{
- try
- {
- serverTempDir = new File(getServerHomeDir(), ServerConfig.SERVER_TEMP_DIR_SUFFIX);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ serverTempDir = new File(getServerHomeDir(), ServerConfig.SERVER_TEMP_DIR_SUFFIX);
System.setProperty(ServerConfig.SERVER_TEMP_DIR, serverTempDir.toString());
}
}
@@ -380,17 +350,10 @@
{
if (serverDataDir == null)
{
- serverDataDir = getFile(ServerConfig.SERVER_DATA_DIR);
+ serverDataDir = getFileFromProperty(ServerConfig.SERVER_DATA_DIR);
if (serverDataDir == null)
{
- try
- {
- serverDataDir = new File(getServerHomeDir(), ServerConfig.SERVER_DATA_DIR_SUFFIX);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ serverDataDir = new File(getServerHomeDir(), ServerConfig.SERVER_DATA_DIR_SUFFIX);
System.setProperty(ServerConfig.SERVER_DATA_DIR, serverDataDir.toString());
}
}
@@ -492,6 +455,7 @@
{
serverHomeURL = new URL(getServerBaseURL(), getServerName() + "/");
}
+ Logger.getLogger("ANOTHER TEST").warn(serverHomeURL.getFile());
System.setProperty(ServerConfig.SERVER_HOME_URL, serverHomeURL.toString());
}
catch (MalformedURLException e)
@@ -801,29 +765,13 @@
* Get a File from configuration.
* @return the CanonicalFile form for the given name.
*/
- private File getFile(final String name)
+ private File getFileFromProperty(final String name)
{
String value = props.getProperty(name, null);
if (value != null)
{
- try
- {
- URL url = new URL(value);
- File f;
- try
- {
- f = new File(url.toURI());
- }
- catch (URISyntaxException e)
- {
- throw new RuntimeException(e);
- }
- return f;
- }
- catch (IOException e)
- {
- throw new RuntimeException("Could not get " + VirtualFile.class.getName() + " for URL: " + name, e);
- }
+ File f = new File(value);
+ return f;
}
return null;
Modified: projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/ServerLoader.java
===================================================================
--- projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/ServerLoader.java 2009-02-27 04:14:35 UTC (rev 84837)
+++ projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/ServerLoader.java 2009-02-27 04:17:54 UTC (rev 84838)
@@ -36,8 +36,6 @@
import org.jboss.bootstrap.spi.Server;
import org.jboss.bootstrap.spi.ServerConfig;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
/**
* A helper class to load a JBoss server instance.
@@ -240,11 +238,11 @@
// Scan the libraryURL using the VFS
else
{
- VirtualFile libraryDir = VFS.getRoot(libraryURL);
- List<VirtualFile> jars = libraryDir.getChildren();
+ File libraryDir = new File(libraryURL.toURI());
+ File[] jars = libraryDir.listFiles();
if(jars != null)
{
- for(VirtualFile jar : jars)
+ for(File jar : jars)
{
URL url = jar.toURL();
list.add(url);
Modified: projects/bootstrap/trunk/src/test/java/org/jboss/bootstrap/test/jboot11/unit/FileFromServerConfigPropertyTestCase.java
===================================================================
--- projects/bootstrap/trunk/src/test/java/org/jboss/bootstrap/test/jboot11/unit/FileFromServerConfigPropertyTestCase.java 2009-02-27 04:14:35 UTC (rev 84837)
+++ projects/bootstrap/trunk/src/test/java/org/jboss/bootstrap/test/jboot11/unit/FileFromServerConfigPropertyTestCase.java 2009-02-27 04:17:54 UTC (rev 84838)
@@ -65,8 +65,7 @@
{
// Create properties (and JBOSS_HOME)
final Properties props = new Properties();
- props.put(ServerConfig.HOME_DIR, ServerConfigUtil.getJBossHomeFromCurrentLocation("jbossas").toURL()
- .toExternalForm());
+ props.put(ServerConfig.HOME_DIR, ServerConfigUtil.getJBossHomeFromCurrentLocation("jbossas").toString());
// Create and perform minimal initialization upon a new server
final Server server = new ServerImpl();
@@ -157,7 +156,7 @@
* Ensures that a File may be constructed from the value of specified
* System Property name, and that it exists
*/
- public void ensureFileFromPropertyExists(final String propertyName) throws Exception
+ private void ensureFileFromPropertyExists(final String propertyName) throws Exception
{
// Get the system property
More information about the jboss-cvs-commits
mailing list