diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java b/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java index 3c48ece631..b8817fb85a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java @@ -35,8 +35,6 @@ public interface Version int getMicroVersion(); - String getVersionSuffix(); - int getIncrementingVersion(); boolean isCompatible(int v); diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java index 658696badd..4ee690d10d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java @@ -40,8 +40,6 @@ public class VersionImpl implements Version, Serializable private final int incrementingVersion; - private final String versionSuffix; - private final int[] compatibleVersionList; // Constructors -------------------------------------------------- @@ -51,7 +49,6 @@ public class VersionImpl implements Version, Serializable final int minorVersion, final int microVersion, final int incrementingVersion, - final String versionSuffix, final int[] compatibleVersionList) { this.versionName = versionName; @@ -64,8 +61,6 @@ public class VersionImpl implements Version, Serializable this.incrementingVersion = incrementingVersion; - this.versionSuffix = versionSuffix; - this.compatibleVersionList = Arrays.copyOf(compatibleVersionList, compatibleVersionList.length); } @@ -73,17 +68,7 @@ public class VersionImpl implements Version, Serializable public String getFullVersion() { - return majorVersion + "." + - minorVersion + - "." + - microVersion + - "." + - versionSuffix + - " (" + - versionName + - ", " + - incrementingVersion + - ")"; + return versionName; } public String getVersionName() @@ -106,11 +91,6 @@ public class VersionImpl implements Version, Serializable return microVersion; } - public String getVersionSuffix() - { - return versionSuffix; - } - public int getIncrementingVersion() { return incrementingVersion; @@ -139,7 +119,6 @@ public class VersionImpl implements Version, Serializable result = prime * result + microVersion; result = prime * result + minorVersion; result = prime * result + ((versionName == null) ? 0 : versionName.hashCode()); - result = prime * result + ((versionSuffix == null) ? 0 : versionSuffix.hashCode()); return result; } @@ -190,17 +169,6 @@ public class VersionImpl implements Version, Serializable { return false; } - if (versionSuffix == null) - { - if (other.versionSuffix != null) - { - return false; - } - } - else if (!versionSuffix.equals(other.versionSuffix)) - { - return false; - } return true; } } diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java index 69fd3cf72e..b24a00a7d5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java @@ -138,7 +138,6 @@ public final class VersionLoader int minorVersion = Integer.valueOf(versionProps.getProperty("activemq.version.minorVersion")); int microVersion = Integer.valueOf(versionProps.getProperty("activemq.version.microVersion")); int[] incrementingVersions = parseCompatibleVersionList(versionProps.getProperty("activemq.version.incrementingVersion")); - String versionSuffix = versionProps.getProperty("activemq.version.versionSuffix"); int[] compatibleVersionArray = parseCompatibleVersionList(versionProps.getProperty("activemq.version.compatibleVersionList")); List definedVersions = new ArrayList(incrementingVersions.length); for (int incrementingVersion : incrementingVersions) @@ -148,7 +147,6 @@ public final class VersionLoader minorVersion, microVersion, incrementingVersion, - versionSuffix, compatibleVersionArray)); } //We want the higher version to be the first diff --git a/activemq-core-client/src/main/resources/activemq-version.properties b/activemq-core-client/src/main/resources/activemq-version.properties index 8dc05e58a4..4144bf050b 100644 --- a/activemq-core-client/src/main/resources/activemq-version.properties +++ b/activemq-core-client/src/main/resources/activemq-version.properties @@ -19,6 +19,5 @@ activemq.version.majorVersion=${activemq.version.majorVersion} activemq.version.minorVersion=${activemq.version.minorVersion} activemq.version.microVersion=${activemq.version.microVersion} activemq.version.incrementingVersion=${activemq.version.incrementingVersion} -activemq.version.versionSuffix=${activemq.version.versionSuffix} activemq.version.versionTag=${activemq.version.versionTag} activemq.version.compatibleVersionList=121,122,123,124,125,126 diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml index 4b730d89a7..55fdc7d6f9 100644 --- a/activemq-native/pom.xml +++ b/activemq-native/pom.xml @@ -40,6 +40,49 @@ ${basedir}/target/output/ + + + maven-resources-plugin + + + copy-resources-32 + validate + + copy-resources + + + ${basedir}/target/output/lib/linux-i686/ + + + bin/ + + libactivemqAIO32.so + + + + + + + copy-resources-64 + validate + + copy-resources + + + ${basedir}/target/output/lib/linux-x86_64/ + + + bin/ + + libactivemqAIO64.so + + + + + + + + diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java index 47f64c0755..5e237d79cd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java @@ -482,7 +482,7 @@ public class NettyAcceptor implements Acceptor TimeUnit.MILLISECONDS); } - ActiveMQServerLogger.LOGGER.startedNettyAcceptor(TransportConstants.NETTY_VERSION, host, port, protocolsString); + ActiveMQServerLogger.LOGGER.startedAcceptor(host, port, protocolsString); } } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServerLogger.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServerLogger.java index bb6a269fbd..69f612b8db 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServerLogger.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServerLogger.java @@ -80,15 +80,15 @@ public interface ActiveMQServerLogger extends BasicLogger ActiveMQServerLogger LOGGER = Logger.getMessageLogger(ActiveMQServerLogger.class, ActiveMQServerLogger.class.getPackage().getName()); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221000, value = "{0} server is starting with configuration {1}", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 221000, value = "{0} Message Broker is starting with configuration {1}", format = Message.Format.MESSAGE_FORMAT) void serverStarting(String type, Configuration configuration); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221001, value = "ActiveMQ Server version {0} [{1}] {2}", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 221001, value = "Apache ActiveMQ Message Broker version {0} [nodeID={1}] {2}", format = Message.Format.MESSAGE_FORMAT) void serverStarted(String fullVersion, SimpleString nodeId, String identity); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221002, value = "ActiveMQ Server version {0} [{1}] stopped", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 221002, value = "Apache ActiveMQ Message Broker version {0} [{1}] stopped", format = Message.Format.MESSAGE_FORMAT) void serverStopped(String version, SimpleString nodeId); @LogMessage(level = Logger.Level.INFO) @@ -117,7 +117,7 @@ public interface ActiveMQServerLogger extends BasicLogger void awaitFailBack(); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221109, value = "ActiveMQ Backup Server version {0} [{1}] started, waiting live to fail before it gets active", + @Message(id = 221109, value = "Apache ActiveMQ Backup Server version {0} [{1}] started, waiting live to fail before it gets active", format = Message.Format.MESSAGE_FORMAT) void backupServerStarted(String version, SimpleString nodeID); @@ -167,8 +167,8 @@ public interface ActiveMQServerLogger extends BasicLogger void journalUnreferencedMessage(Long messageID); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221020, value = "Started Netty Acceptor version {0} {1}:{2,number,#} for protocols [{3}]", format = Message.Format.MESSAGE_FORMAT) - void startedNettyAcceptor(String id, String host, Integer port, String enabledProtocols); + @Message(id = 221020, value = "Started Acceptor at {0}:{1,number,#} for protocols [{2}]", format = Message.Format.MESSAGE_FORMAT) + void startedAcceptor(String host, Integer port, String enabledProtocols); @LogMessage(level = Logger.Level.INFO) @Message(id = 221021, value = "failed to remove connection", format = Message.Format.MESSAGE_FORMAT) @@ -325,7 +325,7 @@ public interface ActiveMQServerLogger extends BasicLogger void divertBindingNotExists(SimpleString bindingName); @LogMessage(level = Logger.Level.WARN) - @Message(id = 222007, value = "Security risk! ActiveMQ is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 222007, value = "Security risk! Apache ActiveMQ is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT) void clusterSecurityRisk(); @LogMessage(level = Logger.Level.WARN) @@ -986,7 +986,7 @@ public interface ActiveMQServerLogger extends BasicLogger void backupMovingDataAway(String oldPath, String newPath); @LogMessage(level = Logger.Level.WARN) - @Message(id = 222163, value = "Server is being completely stopped, since this was a replicated backup there may be journal files that need cleaning up. The ActiveMQ server will have to be manually restarted.", + @Message(id = 222163, value = "Server is being completely stopped, since this was a replicated backup there may be journal files that need cleaning up. The Apache ActiveMQ broker will have to be manually restarted.", format = Message.Format.MESSAGE_FORMAT) void stopReplicatedBackupAfterFailback(); @@ -994,14 +994,6 @@ public interface ActiveMQServerLogger extends BasicLogger @Message(id = 222164, value = "Error when trying to start replication {0}", format = Message.Format.MESSAGE_FORMAT) void errorStartingReplication(BackupReplicationStartFailedMessage.BackupRegistrationProblem problem); - @LogMessage(level = Logger.Level.WARN) - @Message(id = 222165, value = "Error starting naming server", format = Message.Format.MESSAGE_FORMAT) - void unableToStartNamingServer(@Cause Exception e); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 222166, value = "Error stopping naming server", format = Message.Format.MESSAGE_FORMAT) - void unableToStopNamingServer(@Cause Exception e); - @LogMessage(level = Logger.Level.WARN) @Message(id = 222167, value = "Group Binding not available so deleting {0} groups from {1}, groups will be bound to another node", format = Message.Format.MESSAGE_FORMAT) diff --git a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java index c639cee3c3..4927404845 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java @@ -52,14 +52,12 @@ public class VersionImplTest extends Assert int minorVersion = 0; int microVersion = 1; int incrementingVersion = 10; - String versionSuffix = "suffix"; int[] compatibleVersionList = {7,8,9,10}; VersionImpl version = new VersionImpl(versionName, majorVersion, minorVersion, microVersion, incrementingVersion, - versionSuffix, compatibleVersionList); Assert.assertEquals(versionName, version.getVersionName()); @@ -67,15 +65,14 @@ public class VersionImplTest extends Assert Assert.assertEquals(minorVersion, version.getMinorVersion()); Assert.assertEquals(microVersion, version.getMicroVersion()); Assert.assertEquals(incrementingVersion, version.getIncrementingVersion()); - Assert.assertEquals(versionSuffix, version.getVersionSuffix()); } @Test public void testEquals() throws Exception { - VersionImpl version = new VersionImpl("ACTIVEMQ", 2, 0, 1, 10, "suffix", new int[]{7,8,9,10}); - VersionImpl sameVersion = new VersionImpl("ACTIVEMQ", 2, 0, 1, 10, "suffix", new int[]{7,8,9,10}); - VersionImpl differentVersion = new VersionImpl("ACTIVEMQ", 2, 0, 1, 11, "suffix", new int[]{7,8,9,10,11}); + VersionImpl version = new VersionImpl("ACTIVEMQ", 2, 0, 1, 10, new int[]{7,8,9,10}); + VersionImpl sameVersion = new VersionImpl("ACTIVEMQ", 2, 0, 1, 10, new int[]{7,8,9,10}); + VersionImpl differentVersion = new VersionImpl("ACTIVEMQ", 2, 0, 1, 11, new int[]{7,8,9,10,11}); Assert.assertFalse(version.equals(new Object())); @@ -87,7 +84,7 @@ public class VersionImplTest extends Assert @Test public void testSerialize() throws Exception { - VersionImpl version = new VersionImpl("uyiuy", 3, 7, 6, 12, "uhuhuh", new int[]{9,10,11,12}); + VersionImpl version = new VersionImpl("uyiuy", 3, 7, 6, 12, new int[]{9,10,11,12}); ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(baos); oos.writeObject(version); diff --git a/activemq-web/src/main/java/org/apache/activemq/component/WebServerComponent.java b/activemq-web/src/main/java/org/apache/activemq/component/WebServerComponent.java index 95f58b4ace..310bf1b1aa 100644 --- a/activemq-web/src/main/java/org/apache/activemq/component/WebServerComponent.java +++ b/activemq-web/src/main/java/org/apache/activemq/component/WebServerComponent.java @@ -82,7 +82,7 @@ public class WebServerComponent implements ExternalComponent { server.start(); - System.out.println("Server started at " + webServerConfig.bind); + System.out.println("HTTP Server started at " + webServerConfig.bind); } public void stop() throws Exception diff --git a/pom.xml b/pom.xml index f77a7c548b..c54af26089 100644 --- a/pom.xml +++ b/pom.xml @@ -51,16 +51,14 @@ scp://people.apache.org/x1/www/activemq.apache.org 4.0.20.Final - Active Hornet + ${project.version} 6 0 0 126,125,124,123,122 - SNAPSHOT - SNAPSHOT + ${project.version} - ${activemq.version.majorVersion}.${activemq.version.minorVersion}.${activemq.version.microVersion}.${activemq.version.versionSuffix} - (${activemq.version.versionName}, ${activemq.version.incrementingVersion}) + ${project.version}(${activemq.version.incrementingVersion}) 3.0.9.Final true diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java index 348683e2d6..3c82ccd7c6 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java @@ -48,7 +48,6 @@ public class VersionLoaderTest extends UnitTestCase props.load(ClassLoader.getSystemResourceAsStream(VersionLoader.DEFAULT_PROP_FILE_NAME)); Assert.assertEquals(props.get("activemq.version.versionName"), version.getVersionName()); - Assert.assertEquals(props.get("activemq.version.versionSuffix"), version.getVersionSuffix()); Assert.assertEquals(Integer.parseInt(props.getProperty("activemq.version.majorVersion")), version.getMajorVersion());