[jboss-cvs] JBossAS SVN: r86520 - in projects/embedded/trunk: build and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 31 06:31:02 EDT 2009
Author: ALRubinger
Date: 2009-03-31 06:31:01 -0400 (Tue, 31 Mar 2009)
New Revision: 86520
Modified:
projects/embedded/trunk/assembly/
projects/embedded/trunk/build/
projects/embedded/trunk/core/
projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/BasicServerConfiguration.java
projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/JBossEmbeddedAS.java
projects/embedded/trunk/testsuite/
projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/test/server/ServerUnitTestCase.java
Log:
[EMB-22] Some source cleanup
Property changes on: projects/embedded/trunk/assembly
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse
eclipse-target
.project
.classpath
.settings
+ target
target-eclipse
eclipse-target
.project
.classpath
.settings
bin
Property changes on: projects/embedded/trunk/build
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse
eclipse-target
.project
.classpath
.settings
+ target
target-eclipse
eclipse-target
.project
.classpath
.settings
bin
Property changes on: projects/embedded/trunk/core
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse
eclipse-target
.project
.classpath
.settings
+ target
target-eclipse
eclipse-target
.project
.classpath
.settings
bin
Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/BasicServerConfiguration.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/BasicServerConfiguration.java 2009-03-31 10:15:49 UTC (rev 86519)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/BasicServerConfiguration.java 2009-03-31 10:31:01 UTC (rev 86520)
@@ -123,7 +123,7 @@
/* (non-Javadoc)
* @see org.jboss.embedded.spi.JBossServerConfig#setBindAddress(java.lang.String)
*/
- public JBossServerConfig setBindAddress(String bindAddress) throws IllegalArgumentException
+ public JBossServerConfig setBindAddress(final String bindAddress) throws IllegalArgumentException
{
// Ensure specified
if (bindAddress == null || bindAddress.length() == 0)
@@ -149,7 +149,7 @@
/* (non-Javadoc)
* @see org.jboss.embedded.spi.JBossServerConfig#setBindAddress(java.net.InetAddress)
*/
- public JBossServerConfig setBindAddress(InetAddress bindAddress) throws IllegalArgumentException
+ public JBossServerConfig setBindAddress(final InetAddress bindAddress) throws IllegalArgumentException
{
// Ensure specified
if (bindAddress == null)
@@ -167,7 +167,7 @@
/* (non-Javadoc)
* @see org.jboss.embedded.spi.JBossServerConfig#setJBossHome(java.lang.String)
*/
- public JBossServerConfig setJBossHome(String jbossHome) throws IllegalArgumentException
+ public JBossServerConfig setJBossHome(final String jbossHome) throws IllegalArgumentException
{
// Ensure specified
if (jbossHome == null || jbossHome.length() == 0)
@@ -216,7 +216,7 @@
/* (non-Javadoc)
* @see org.jboss.embedded.spi.JBossServerConfig#setJBossHome(java.net.URL)
*/
- public JBossServerConfig setJBossHome(URL jbossHome) throws IllegalArgumentException
+ public JBossServerConfig setJBossHome(final URL jbossHome) throws IllegalArgumentException
{
// Ensure specified
if (jbossHome == null)
@@ -234,7 +234,7 @@
/* (non-Javadoc)
* @see org.jboss.embedded.spi.JBossServerConfig#setServerName(java.lang.String)
*/
- public JBossServerConfig setServerName(String serverName) throws IllegalArgumentException
+ public JBossServerConfig setServerName(final String serverName) throws IllegalArgumentException
{
// Ensure specified
if (serverName == null || serverName.length() == 0)
@@ -263,7 +263,7 @@
/* (non-Javadoc)
* @see org.jboss.embedded.spi.JBossServerConfig#setProperty(java.lang.String, java.lang.String)
*/
- public JBossServerConfig setProperty(String property, String value) throws IllegalArgumentException
+ public JBossServerConfig setProperty(final String property, final String value) throws IllegalArgumentException
{
// Ensure specified property
if (property == null || property.length() == 0)
Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/JBossEmbeddedAS.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/JBossEmbeddedAS.java 2009-03-31 10:15:49 UTC (rev 86519)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/server/JBossEmbeddedAS.java 2009-03-31 10:31:01 UTC (rev 86520)
@@ -49,6 +49,7 @@
private static final Logger log = Logger.getLogger(JBossEmbeddedAS.class);
+ @Deprecated
private static String concurrentLib = "concurrent.jar";
@Deprecated
@@ -120,7 +121,7 @@
{
// Get the Server and Config
Server server = this.server;
- JBossServerConfig config = this.config;
+ final JBossServerConfig config = this.config;
// Precondition check
assert config != null : "Configuration should not be null";
@@ -132,26 +133,26 @@
}
// Get the default properties from the System
- Properties props = System.getProperties();
+ final Properties props = System.getProperties();
// Set JBOSS_HOME
- String configuredJBossHome = config.getJBossHome();
- File jbossHomeFile = new File(configuredJBossHome);
- String jbossHomeUrl = jbossHomeFile.toURL().toExternalForm();
+ final String configuredJBossHome = config.getJBossHome();
+ final File jbossHomeFile = new File(configuredJBossHome);
+ final String jbossHomeUrl = jbossHomeFile.toURL().toExternalForm();
props.setProperty(ServerConfig.HOME_URL, jbossHomeUrl);
props.setProperty(ServerConfig.HOME_DIR, jbossHomeFile.getAbsolutePath());
// Set Bind Address
- String bindAddress = config.getBindAddress();
+ final String bindAddress = config.getBindAddress();
props.setProperty(ServerConfig.SERVER_BIND_ADDRESS, bindAddress);
// Set Server Name
- String serverName = config.getServerName();
+ final String serverName = config.getServerName();
props.setProperty(ServerConfig.SERVER_NAME, serverName);
//FIXME Doesn't really belong here?
// Initialize the JDK logmanager
- String name = System.getProperty("java.util.logging.manager");
+ final String name = System.getProperty("java.util.logging.manager");
if (name == null)
{
System.setProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager");
@@ -178,7 +179,7 @@
loader.addLibrary(concurrentLib);
// Get the Server, initialize, and set
- ClassLoader tccl = SecurityActions.getTccl();
+ final ClassLoader tccl = SecurityActions.getTccl();
server = loader.load(tccl);
server.init(props);
this.server = server;
@@ -222,7 +223,7 @@
synchronized (this)
{
// Get Server
- Server server = this.server;
+ final Server server = this.server;
// Ensure Server is Available
if (server == null)
@@ -260,10 +261,10 @@
/**
* Creates and returns a new ServerLoader
*/
- private ServerLoader createServerLoader(Properties props) throws Exception
+ private ServerLoader createServerLoader(final Properties props) throws Exception
{
// Create new Loader from Props
- ServerLoader loader = new ServerLoader(props);
+ final ServerLoader loader = new ServerLoader(props);
// Return
return loader;
Property changes on: projects/embedded/trunk/testsuite
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse
eclipse-target
.project
.classpath
.settings
+ target
target-eclipse
eclipse-target
.project
.classpath
.settings
bin
Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/test/server/ServerUnitTestCase.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/test/server/ServerUnitTestCase.java 2009-03-31 10:15:49 UTC (rev 86519)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/test/server/ServerUnitTestCase.java 2009-03-31 10:31:01 UTC (rev 86520)
@@ -62,7 +62,7 @@
@Test
public void testServerStart() throws Throwable
{
- boolean isStarted = server.isStarted();
+ final boolean isStarted = server.isStarted();
TestCase.assertTrue("The server is not reporting as started", isStarted);
}
@@ -79,7 +79,7 @@
public static void startServer() throws Throwable
{
// Create Server Config
- JBossServerConfig config = new BasicServerConfiguration();
+ final JBossServerConfig config = new BasicServerConfiguration();
// Make Server
server = JBossEmbeddedAS.create(config);
More information about the jboss-cvs-commits
mailing list