Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 681375 Details for
Bug 899455
Update version strings to reflect JBoss EAP 6
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
0001-JBPAPP-6831-Update-project-name-and-version-strings-.patch
0001-JBPAPP-6831-Update-project-name-and-version-strings-.patch (text/x-patch), 9.32 KB, created by
Paul Gier
on 2011-08-24 20:12:17 UTC
(
hide
)
Description:
0001-JBPAPP-6831-Update-project-name-and-version-strings-.patch
Filename:
MIME Type:
Creator:
Paul Gier
Created:
2011-08-24 20:12:17 UTC
Size:
9.32 KB
patch
obsolete
>From 9cfe247457f9ccfca8f35e5f2331df286e632097 Mon Sep 17 00:00:00 2001 >From: Paul Gier <pgier@redhat.com> >Date: Wed, 24 Aug 2011 15:00:02 -0500 >Subject: [PATCH] [JBPAPP-6831] Update project name and version strings to reflect EAP 6 > >--- > pom.xml | 2 ++ > .../src/main/java/org/jboss/as/process/Main.java | 4 ++-- > .../main/java/org/jboss/as/version/Version.java | 4 ++++ > .../jboss/as/server/ApplicationServerService.java | 7 ++++--- > .../org/jboss/as/server/BootstrapListener.java | 4 ++-- > server/src/main/java/org/jboss/as/server/Main.java | 2 +- > 6 files changed, 15 insertions(+), 8 deletions(-) > >diff --git a/pom.xml b/pom.xml >index a5dfd99..bdd82e1 100644 >--- a/pom.xml >+++ b/pom.xml >@@ -51,6 +51,7 @@ > <properties> > <!-- Release Info --> > <jboss.as.release.version>${project.version}</jboss.as.release.version> >+ <jboss.eap.release.version>6.0.0.Alpha1</jboss.eap.release.version> > <jboss.as.release.codename>Zap</jboss.as.release.codename> > <jboss.as.scm.url>https://github.com/jbossas/jboss-as</jboss.as.scm.url> > <jboss.as.scm.connection>git@github.com:jbossas/jboss-as.git</jboss.as.scm.connection> >@@ -320,6 +321,7 @@ > <Implementation-URL>${project.url}</Implementation-URL> > <JBossAS-Release-Version>${jboss.as.release.version}</JBossAS-Release-Version> > <JBossAS-Release-Codename>${jboss.as.release.codename}</JBossAS-Release-Codename> >+ <JBossEAP-Release-Version>${jboss.eap.release.version}</JBossEAP-Release-Version> > </manifestEntries> > <manifestSections> > <manifestSection> >diff --git a/process-controller/src/main/java/org/jboss/as/process/Main.java b/process-controller/src/main/java/org/jboss/as/process/Main.java >index b0acd4b..a198631 100644 >--- a/process-controller/src/main/java/org/jboss/as/process/Main.java >+++ b/process-controller/src/main/java/org/jboss/as/process/Main.java >@@ -52,7 +52,7 @@ import org.jboss.threads.JBossThreadFactory; > public final class Main { > > public static String getVersionString() { >- return Version.AS_VERSION; >+ return Version.EAP_VERSION; > } > > public static void usage() { >@@ -165,7 +165,7 @@ public final class Main { > return null; > } else if (CommandLineConstants.VERSION.equals(arg) || CommandLineConstants.SHORT_VERSION.equals(arg) > || CommandLineConstants.OLD_VERSION.equals(arg)) { >- System.out.println("\nJBoss Application Server " + getVersionString()); >+ System.out.println("\nJBoss Enterprise Application Platform " + getVersionString()); > return null; > } > smOptions.add(arg); >diff --git a/process-controller/src/main/java/org/jboss/as/version/Version.java b/process-controller/src/main/java/org/jboss/as/version/Version.java >index 150787a..a4352f4 100644 >--- a/process-controller/src/main/java/org/jboss/as/version/Version.java >+++ b/process-controller/src/main/java/org/jboss/as/version/Version.java >@@ -34,6 +34,7 @@ import java.util.jar.Manifest; > public class Version { > public static final String AS_VERSION; > public static final String AS_RELEASE_CODENAME; >+ public static final String EAP_VERSION; > > static { > InputStream stream = Version.class.getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF"); >@@ -45,12 +46,15 @@ public class Version { > } > > String version = "Unknown", code = version; >+ String eapVersion = "Unknown"; > if (manifest != null) { > version = manifest.getMainAttributes().getValue("JBossAS-Release-Version"); > code = manifest.getMainAttributes().getValue("JBossAS-Release-Codename"); >+ eapVersion = manifest.getMainAttributes().getValue("JBossEAP-Release-Version"); > } > > AS_VERSION = version; > AS_RELEASE_CODENAME = code; >+ EAP_VERSION = eapVersion; > } > } >diff --git a/server/src/main/java/org/jboss/as/server/ApplicationServerService.java b/server/src/main/java/org/jboss/as/server/ApplicationServerService.java >index d91890d..37c67b4 100644 >--- a/server/src/main/java/org/jboss/as/server/ApplicationServerService.java >+++ b/server/src/main/java/org/jboss/as/server/ApplicationServerService.java >@@ -79,7 +79,8 @@ final class ApplicationServerService implements Service<AsyncFuture<ServiceConta > // Install the environment before doing anything > serverEnvironment.install(); > >- log.infof("JBoss AS %s \"%s\" starting", Version.AS_VERSION, Version.AS_RELEASE_CODENAME); >+ log.infof("JBoss EAP %s (AS %s) starting", Version.EAP_VERSION, Version.AS_VERSION); >+ > if (configLog.isDebugEnabled()) { > final Properties properties = System.getProperties(); > final StringBuilder b = new StringBuilder(8192); >@@ -163,7 +164,7 @@ final class ApplicationServerService implements Service<AsyncFuture<ServiceConta > > if (log.isDebugEnabled()) { > final long nanos = context.getElapsedTime(); >- log.debugf("JBoss AS root service started in %d.%06d ms", Long.valueOf(nanos / 1000000L), Long.valueOf(nanos % 1000000L)); >+ log.debugf("JBoss EAP root service started in %d.%06d ms", Long.valueOf(nanos / 1000000L), Long.valueOf(nanos % 1000000L)); > } > } > >@@ -171,7 +172,7 @@ final class ApplicationServerService implements Service<AsyncFuture<ServiceConta > public synchronized void stop(final StopContext context) { > processState.setStopping(); > CurrentServiceContainer.setServiceContainer(null); >- log.infof("JBoss AS %s \"%s\" stopped in %dms", Version.AS_VERSION, Version.AS_RELEASE_CODENAME, Integer.valueOf((int) (context.getElapsedTime() / 1000000L))); >+ log.infof("JBoss EAP %s (AS %s) stopped in %dms", Version.EAP_VERSION, Version.AS_VERSION, Integer.valueOf((int) (context.getElapsedTime() / 1000000L))); > } > > @Override >diff --git a/server/src/main/java/org/jboss/as/server/BootstrapListener.java b/server/src/main/java/org/jboss/as/server/BootstrapListener.java >index 4297286..9bf88e3 100644 >--- a/server/src/main/java/org/jboss/as/server/BootstrapListener.java >+++ b/server/src/main/java/org/jboss/as/server/BootstrapListener.java >@@ -154,14 +154,14 @@ class BootstrapListener extends AbstractServiceListener<Object> { > final int onDemand = map.get(ServiceController.Mode.ON_DEMAND).get(); > final int never = map.get(ServiceController.Mode.NEVER).get(); > if (failed == 0) { >- log.infof("JBoss AS %s \"%s\" started in %dms - Started %d of %d services (%d services are passive or on-demand)", Version.AS_VERSION, Version.AS_RELEASE_CODENAME, Long.valueOf(elapsedTime), Integer.valueOf(started), Integer.valueOf(active + passive + onDemand + never), Integer.valueOf(onDemand + passive)); >+ log.infof("JBoss EAP %s (AS %s) started in %dms - Started %d of %d services (%d services are passive or on-demand)", Version.EAP_VERSION, Version.AS_VERSION, Long.valueOf(elapsedTime), Integer.valueOf(started), Integer.valueOf(active + passive + onDemand + never), Integer.valueOf(onDemand + passive)); > try { > configuration.getConfigurationPersister().successfulBoot(); > } catch (ConfigurationPersistenceException e) { > log.error(e); > } > } else { >- log.errorf("JBoss AS %s \"%s\" started (with errors) in %dms - Started %d of %d services (%d services failed or missing dependencies, %d services are passive or on-demand)", Version.AS_VERSION, Version.AS_RELEASE_CODENAME, Long.valueOf(elapsedTime), Integer.valueOf(started), Integer.valueOf(active + passive + onDemand + never), Integer.valueOf(failed), Integer.valueOf(onDemand + passive)); >+ log.errorf("JBoss EAP %s (AS %s) started (with errors) in %dms - Started %d of %d services (%d services failed or missing dependencies, %d services are passive or on-demand)", Version.EAP_VERSION, Version.AS_VERSION, Long.valueOf(elapsedTime), Integer.valueOf(started), Integer.valueOf(active + passive + onDemand + never), Integer.valueOf(failed), Integer.valueOf(onDemand + passive)); > } > } > } >diff --git a/server/src/main/java/org/jboss/as/server/Main.java b/server/src/main/java/org/jboss/as/server/Main.java >index d089b4b..d2e25cb 100644 >--- a/server/src/main/java/org/jboss/as/server/Main.java >+++ b/server/src/main/java/org/jboss/as/server/Main.java >@@ -124,7 +124,7 @@ public final class Main { > final String arg = args[i]; > try { > if (CommandLineConstants.VERSION.equals(arg) || CommandLineConstants.SHORT_VERSION.equals(arg) || CommandLineConstants.OLD_VERSION.equals(arg)) { >- System.out.println("JBoss Application Server " + getVersionString()); >+ System.out.println("JBoss Enterprise Application Platform " + getVersionString()); > return null; > } else if (CommandLineConstants.HELP.equals(arg) || CommandLineConstants.SHORT_HELP.equals(arg) || CommandLineConstants.OLD_HELP.equals(arg)) { > usage(); >-- >1.7.3.4 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=681375">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 899455
: 681375