[jboss-cvs] JBossAS SVN: r92335 - in projects/bootstrap/trunk: impl-as/src/test/java/org/jboss/bootstrap/impl/as/server and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 14 01:36:32 EDT 2009
Author: johnbailey
Date: 2009-08-14 01:36:32 -0400 (Fri, 14 Aug 2009)
New Revision: 92335
Modified:
projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/ASVersion.java
projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerOperationsTestCase.java
projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java
projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java
projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/deployer/TempBasicXMLDeployer.java
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/MCVersion.java
Log:
[JBBOOT-89] Some code format cleaning
Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/ASVersion.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/ASVersion.java 2009-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/ASVersion.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -31,12 +31,12 @@
*/
public final class ASVersion extends AbstractVersion
{
-
+
/**
* The single instance.
*/
private static ASVersion instance = null;
-
+
/**
* Get the single <tt>ASVersion</tt> instance.
*
@@ -50,22 +50,24 @@
}
return instance;
}
-
+
/**
* Do not allow direct public construction.
*/
private ASVersion()
{
}
-
+
@Override
- protected Class<?> getImplClass() {
- return ASVersion.class;
- }
+ protected Class<?> getImplClass()
+ {
+ return ASVersion.class;
+ }
- @Override
- protected String getVersionResourceLocation() {
- return "/org/jboss/version.properties";
- }
+ @Override
+ protected String getVersionResourceLocation()
+ {
+ return "/org/jboss/version.properties";
+ }
}
Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerOperationsTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerOperationsTestCase.java 2009-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerOperationsTestCase.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -106,9 +106,9 @@
{
// Log
log.info("testIsStarted");
-
+
// Cast to get the SPI View
- final JBossASServerProvider serverProviderSpiView = (JBossASServerProvider)server;
+ final JBossASServerProvider serverProviderSpiView = (JBossASServerProvider) server;
// Test not started
final boolean startedBefore = serverProviderSpiView.isStarted();
Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java 2009-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerVersionInformationTestCase.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -65,8 +65,8 @@
private static final String EXPECTED_VERSION_TAG = "VersionTag";
private static final String EXPECTED_VERSION_NUMBER = EXPECTED_VERSION_MAJOR + ASVersion.DELIMITER_VERSION
- + EXPECTED_VERSION_MINOR + ASVersion.DELIMITER_VERSION + EXPECTED_VERSION_REVISION + ASVersion.DELIMITER_VERSION
- + EXPECTED_VERSION_TAG;
+ + EXPECTED_VERSION_MINOR + ASVersion.DELIMITER_VERSION + EXPECTED_VERSION_REVISION
+ + ASVersion.DELIMITER_VERSION + EXPECTED_VERSION_TAG;
private static final String EXPECTED_VERSION_NAME = "VersionName";
Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java 2009-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -297,7 +297,7 @@
log.info("Stopping: " + this);
final StopWatch watch = new StopWatch(true);
this.setState(LifecycleState.STOPPING);
-
+
// Send JMX Notification
this.sendStopJmxNotification();
Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java 2009-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -38,21 +38,33 @@
public abstract class AbstractVersion
{
public final static String VERSION_MAJOR = "version.major";
+
public final static String VERSION_MINOR = "version.minor";
+
public final static String VERSION_REVISION = "version.revision";
+
public final static String VERSION_TAG = "version.tag";
+
public final static String VERSION_NAME = "version.name";
+
public final static String VERSION_CVSTAG = "version.cvstag";
public final static String BUILD_NUMBER = "build.number";
+
public final static String BUILD_ID = "build.id";
+
public final static String BUILD_DATE = "build.date";
+
public final static String BUILD_JVM_VERSION = "java.vm.version";
+
public final static String BUILD_JVM_VENDOR = "java.vendor";
+
public final static String BUILD_OS = "os.name";
+
public final static String BUILD_OS_ARCH = "os.arch";
+
public final static String BUILD_OS_VERSION = "os.version";
-
+
public static final char DELIMITER_VERSION = '.';
/**
@@ -128,6 +140,7 @@
{
return props.getProperty(VERSION_TAG);
}
+
/**
* Returns the CVS tag of the version.
*
@@ -181,7 +194,7 @@
/** Returns the BUILD_JVM_VERSION (BUILD_JVM_VENDOR) which should look like:
* 1.4.2_05-b04 (Sun Microsystems Inc.).
* @return the jvm
- */
+ */
public String getBuildJVM()
{
String vm = props.getProperty(BUILD_JVM_VERSION);
@@ -194,13 +207,13 @@
* Windows XP (x86,5.1)
* Linux (i386,2.4.21-4.ELsmp)
* @return the OS
- */
+ */
public String getBuildOS()
{
String os = props.getProperty(BUILD_OS);
String arch = props.getProperty(BUILD_OS_ARCH);
String version = props.getProperty(BUILD_OS_VERSION);
- return os + '(' + arch +',' + version + ')';
+ return os + '(' + arch + ',' + version + ')';
}
/**
@@ -211,15 +224,15 @@
public String getVersionNumber()
{
StringBuffer buff = new StringBuffer();
-
+
buff.append(getMajor()).append(DELIMITER_VERSION);
buff.append(getMinor()).append(DELIMITER_VERSION);
buff.append(getRevision()).append(DELIMITER_VERSION);
buff.append(getTag());
-
- return buff.toString();
+
+ return buff.toString();
}
-
+
/**
* Returns the version information as a string.
*
@@ -230,14 +243,14 @@
public String toString()
{
StringBuffer buff = new StringBuffer();
-
+
buff.append(getVersionNumber());
buff.append(" (build: SVNTag=");
buff.append(getCvsTag());
buff.append(" date=");
buff.append(getBuildID());
buff.append(")");
-
+
return buff.toString();
}
@@ -265,13 +278,13 @@
* @return String resource path to version properties file
*/
protected abstract String getVersionResourceLocation();
-
+
/**
* Provides the Class to use to use as the classloading base to load the version properties resource from
* @return Class concrete version class
*/
protected abstract Class<?> getImplClass();
-
+
/**
* Load the version properties from a resource.
*/
@@ -282,7 +295,7 @@
try
{
InputStream in = getImplClass().getResourceAsStream(getVersionResourceLocation());
- if( in != null )
+ if (in != null)
{
props.load(in);
in.close();
Modified: projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/deployer/TempBasicXMLDeployer.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/deployer/TempBasicXMLDeployer.java 2009-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/deployer/TempBasicXMLDeployer.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -55,7 +55,8 @@
private static final UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
/** The resolver */
- private static final SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+ private static final SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance()
+ .getSchemaBindingResolver();
/** The deployments by url or name */
private Map<String, KernelDeployment> deploymentsByName = new ConcurrentHashMap<String, KernelDeployment>();
@@ -85,7 +86,7 @@
{
return deploymentsByName.keySet();
}
-
+
public void deploy(KernelDeployment deployment) throws Throwable
{
super.deploy(deployment);
@@ -155,7 +156,7 @@
if (trace)
{
long now = System.currentTimeMillis();
- log.trace("Parsing " + url + " took " + (now-start) + " milliseconds");
+ log.trace("Parsing " + url + " took " + (now - start) + " milliseconds");
}
deploy(deployment);
@@ -163,7 +164,7 @@
if (trace)
{
long now = System.currentTimeMillis();
- log.trace("Deploying " + url + " took " + (now-start) + " milliseconds");
+ log.trace("Deploying " + url + " took " + (now - start) + " milliseconds");
}
return deployment;
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-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -79,7 +79,7 @@
* The XML Deployer
*/
private TempBasicXMLDeployer kernelDeployer;
-
+
/**
* Container for version information.
*/
@@ -354,11 +354,8 @@
}
@Override
- public String toString() {
- return new StringBuilder()
- .append("MCServer [")
- .append(this.version.toString())
- .append("]")
- .toString();
+ public String toString()
+ {
+ return new StringBuilder().append("MCServer [").append(this.version.toString()).append("]").toString();
}
}
Modified: projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/MCVersion.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/MCVersion.java 2009-08-14 05:12:41 UTC (rev 92334)
+++ projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/MCVersion.java 2009-08-14 05:36:32 UTC (rev 92335)
@@ -31,12 +31,12 @@
*/
public final class MCVersion extends AbstractVersion
{
-
+
/**
* The single instance.
*/
private static MCVersion instance = null;
-
+
/**
* Get the single <tt>MCVersion</tt> instance.
*
@@ -50,22 +50,24 @@
}
return instance;
}
-
+
/**
* Do not allow direct public construction.
*/
private MCVersion()
{
}
-
+
@Override
- protected Class<?> getImplClass() {
- return MCVersion.class;
- }
+ protected Class<?> getImplClass()
+ {
+ return MCVersion.class;
+ }
- @Override
- protected String getVersionResourceLocation() {
- return "/org/jboss/mc-version.properties";
- }
+ @Override
+ protected String getVersionResourceLocation()
+ {
+ return "/org/jboss/mc-version.properties";
+ }
}
More information about the jboss-cvs-commits
mailing list