Author: ataylor Date: 2009-09-10 05:11:37 -0400 (Thu, 10 Sep 2009) New Revision: 7949 Modified: trunk/build-hornetq.xml trunk/build-thirdparty.xml trunk/examples/javaee/hornetq-javaee-examples.iml trunk/hornetq.iml trunk/hornetq.ipr trunk/pom.xml trunk/src/config/common/hornetq-version.properties trunk/src/main/org/hornetq/core/version/Version.java trunk/src/main/org/hornetq/core/version/impl/VersionImpl.java trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java trunk/src/main/org/hornetq/utils/VersionLoader.java trunk/tests/src/org/hornetq/tests/unit/core/version/impl/VersionImplTest.java Log: updated netty version and added netty version logging Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/build-hornetq.xml 2009-09-10 09:11:37 UTC (rev 7949) @@ -268,8 +268,6 @@ </path> <path id="jms.test.execution.classpath"> - <pathelement location="${test.dir}/config"/> - <pathelement location="${src.config.dir}/common"/> <pathelement location="${src.schema.dir}"/> <pathelement location="${test.jms.dir}/config"/> <pathelement location="${test.jms.classes.dir}"/> @@ -282,6 +280,8 @@ <path refid="apache.xerces.classpath"/> <path refid="apache.logging.classpath"/> <path refid="log4j.log4j.classpath"/> + <pathelement location="${test.dir}/config"/> + <pathelement location="${src.config.dir}/common"/> </path> <path id="joram.test.execution.classpath"> @@ -378,8 +378,15 @@ <javah class="org.hornetq.core.asyncio.impl.AsynchronousFileImpl" classpath="${build.core.classes.dir}" destdir="./native/src"/> + <java classname="org.jboss.netty.util.Version" classpathref="org.jboss.netty.classpath" + outputproperty="netty.version" fork="true"/> + <echo>setting netty version ${netty.version}</echo> <copy file="${src.config.dir}/common/hornetq-version.properties" - tofile="${build.core.classes.dir}/hornetq-version.properties"/> + tofile="${build.core.classes.dir}/hornetq-version.properties" overwrite="true"> + <filterset> + <filter token="NETTY.VERSION" value="${netty.version}"/> + </filterset> + </copy> </target> Modified: trunk/build-thirdparty.xml =================================================================== --- trunk/build-thirdparty.xml 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/build-thirdparty.xml 2009-09-10 09:11:37 UTC (rev 7949) @@ -98,7 +98,7 @@ <maven basedir="${basedir}" options="${maven.install.opts}" - goal="install" + goal="initialize" resultproperty="maven.install.result"/> <fail message="Unable to build maven modules. See maven output for details."> Modified: trunk/examples/javaee/hornetq-javaee-examples.iml =================================================================== --- trunk/examples/javaee/hornetq-javaee-examples.iml 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/examples/javaee/hornetq-javaee-examples.iml 2009-09-10 09:11:37 UTC (rev 7949) @@ -1,90 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="web" name="Web"> - <configuration> - <descriptors> - <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/servlet-transport/config/WEB-INF/web.xml" optional="false" version="2.5" /> - </descriptors> - <webroots> - <root url="file://$MODULE_DIR$/servlet-transport/config/jms-servlet.war" relative="/" /> - </webroots> - <sourceRoots> - <root url="file://$MODULE_DIR$/ejb-jms-transaction/src" /> - <root url="file://$MODULE_DIR$/hajndi/src" /> - <root url="file://$MODULE_DIR$/jca-config/src" /> - <root url="file://$MODULE_DIR$/jms-bridge/src" /> - <root url="file://$MODULE_DIR$/mdb/src" /> - <root url="file://$MODULE_DIR$/servlet-transport/src" /> - <root url="file://$MODULE_DIR$/xarecovery/src" /> - </sourceRoots> - <building> - <setting name="EXPLODED_URL" value="file://" /> - <setting name="EXPLODED_ENABLED" value="false" /> - <setting name="JAR_URL" value="file://" /> - <setting name="JAR_ENABLED" value="false" /> - <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> - </building> - <packaging> - <containerElement type="module" name="messaging-javaee-examples"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> - </packaging> - </configuration> - </facet> - <facet type="javaeeApplication" name="javaEEApplication"> - <configuration> - <descriptors> - <deploymentDescriptor name="application.xml" url="file://$MODULE_DIR$/servlet-transport/config/META-INF/application.xml" optional="false" version="5" /> - </descriptors> - <building> - <setting name="EXPLODED_URL" value="file://" /> - <setting name="EXPLODED_ENABLED" value="false" /> - <setting name="JAR_URL" value="file://" /> - <setting name="JAR_ENABLED" value="false" /> - <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> - </building> - </configuration> - </facet> - <facet type="javaeeApplication" name="javaEEApplication2"> - <configuration> - <descriptors> - <deploymentDescriptor name="application.xml" url="file://$MODULE_DIR$/servlet-ssl-example/config/META-INF/application.xml" optional="false" version="5" /> - </descriptors> - <building> - <setting name="EXPLODED_URL" value="file://" /> - <setting name="EXPLODED_ENABLED" value="false" /> - <setting name="JAR_URL" value="file://" /> - <setting name="JAR_ENABLED" value="false" /> - <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> - </building> - </configuration> - </facet> - <facet type="web" name="Web2"> - <configuration> - <descriptors> - <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/servlet-ssl-example/config/WEB-INF/web.xml" optional="false" version="2.5" /> - </descriptors> - <webroots> - <root url="file://$MODULE_DIR$/servlet-ssl-example/config" relative="/" /> - </webroots> - <building> - <setting name="EXPLODED_URL" value="file://" /> - <setting name="EXPLODED_ENABLED" value="false" /> - <setting name="JAR_URL" value="file://" /> - <setting name="JAR_ENABLED" value="false" /> - <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> - </building> - <packaging> - <containerElement type="module" name="messaging-javaee-examples"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> - </packaging> - </configuration> - </facet> - </component> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/output/classes" /> <exclude-output /> Modified: trunk/hornetq.iml =================================================================== --- trunk/hornetq.iml 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/hornetq.iml 2009-09-10 09:11:37 UTC (rev 7949) @@ -42,6 +42,7 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="messaging" level="project" /> <orderEntry type="library" name="messaging_jars" level="project" /> + <orderEntry type="library" name="ant 1.7.1" level="project" /> </component> <component name="VcsManagerConfiguration"> <option name="ACTIVE_VCS_NAME" value="svn" /> Modified: trunk/hornetq.ipr =================================================================== --- trunk/hornetq.ipr 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/hornetq.ipr 2009-09-10 09:11:37 UTC (rev 7949) @@ -336,11 +336,21 @@ <facet-type id="javaeeApplication"> <modules> <module name="messaging" /> + <module name="hornetq-javaee-examples"> + <files> + <file url="file://$PROJECT_DIR$/examples/javaee/servlet-transport/config/META-INF/application.xml" /> + </files> + </module> </modules> </facet-type> <facet-type id="web"> <modules> <module name="messaging" /> + <module name="hornetq-javaee-examples"> + <files> + <file url="file://$PROJECT_DIR$/examples/javaee/servlet-transport/config/WEB-INF/web.xml" /> + </files> + </module> </modules> </facet-type> </autodetection-disabled> @@ -725,6 +735,45 @@ <JAVADOC /> <SOURCES /> </library> + <library name="ant 1.7.1"> + <CLASSES> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/commons-logging-1.0.4.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-commons-logging.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-contrib/ant-contrib-1.0b3.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-jai.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-apache-log4j.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-javamail.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-trax.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-antlr.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-jmf.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-apache-resolver.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-jdepend.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-nodeps.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-contrib.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-starteam.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-apache-bsf.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-stylebook.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-apache-oro.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/commons-httpclient-3.0.1.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-jsch.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-commons-net.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/xml-apis.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-junit.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/ivy-1.3.1.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-swing.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-launcher.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-testutil.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/bcel-5.1.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-apache-regexp.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-weblogic.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/xercesImpl.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-apache-bcel.jar!/" /> + <root url="jar:///home/andy/devtools/apache-ant-1.7.1/lib/ant-netrexx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> </component> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/pom.xml 2009-09-10 09:11:37 UTC (rev 7949) @@ -45,6 +45,7 @@ <executions> <execution> <id>build-thirdparty</id> + <phase>initialize</phase> <goals> <goal>build-thirdparty</goal> </goals> @@ -70,6 +71,92 @@ </mappedDependencies> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>clean</id> + <phase>pre-clean</phase> + <configuration> + <tasks name="distro"/> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>distro</id> + <phase>package</phase> + <configuration> + <tasks> + <property name="maven.build" value="true"/> + <ant target="distro"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>sun.jdk</groupId> + <artifactId>tools</artifactId> + <version>1.5</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + <dependency> + <groupId>net.java.dev.javacc</groupId> + <artifactId>javacc</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>resolver</artifactId> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + <version>2.9.1</version> + </dependency> + </dependencies> + </plugin> + </plugins> </build> @@ -135,7 +222,7 @@ <dependency> <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> - <version>3.1.0.GA</version> + <version>3.1.3.GA</version> </dependency> <!--needed to compile the logging jar--> <dependency> Modified: trunk/src/config/common/hornetq-version.properties =================================================================== --- trunk/src/config/common/hornetq-version.properties 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/src/config/common/hornetq-version.properties 2009-09-10 09:11:37 UTC (rev 7949) @@ -5,3 +5,4 @@ hornetq.version.incrementingVersion=108 hornetq.version.versionSuffix=BETA5 hornetq.version.versionTag=beta5 +hornetq.netty.version=(a)NETTY.VERSION@ Modified: trunk/src/main/org/hornetq/core/version/Version.java =================================================================== --- trunk/src/main/org/hornetq/core/version/Version.java 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/src/main/org/hornetq/core/version/Version.java 2009-09-10 09:11:37 UTC (rev 7949) @@ -35,4 +35,6 @@ String getVersionSuffix(); int getIncrementingVersion(); + + String getNettyVersion(); } Modified: trunk/src/main/org/hornetq/core/version/impl/VersionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/version/impl/VersionImpl.java 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/src/main/org/hornetq/core/version/impl/VersionImpl.java 2009-09-10 09:11:37 UTC (rev 7949) @@ -47,11 +47,13 @@ private String versionSuffix; + private String nettyVersion; + // Constructors -------------------------------------------------- public VersionImpl(final String versionName, final int majorVersion, final int minorVersion, - final int microVersion, final int incrementingVersion, final String versionSuffix) + final int microVersion, final int incrementingVersion, final String versionSuffix, String nettyVersion) { this.versionName = versionName; @@ -64,6 +66,8 @@ this.incrementingVersion = incrementingVersion; this.versionSuffix = versionSuffix; + + this.nettyVersion = nettyVersion; } // Version implementation ------------------------------------------ @@ -104,6 +108,11 @@ return incrementingVersion; } + public String getNettyVersion() + { + return nettyVersion; + } + // Public ------------------------------------------------------- public boolean equals(Object other) Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2009-09-10 09:11:37 UTC (rev 7949) @@ -37,6 +37,7 @@ import org.hornetq.core.remoting.spi.Connection; import org.hornetq.core.remoting.spi.ConnectionLifeCycleListener; import org.hornetq.utils.ConfigurationHelper; +import org.hornetq.utils.VersionLoader; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelFactory; @@ -57,6 +58,7 @@ import org.jboss.netty.handler.codec.http.HttpRequestDecoder; import org.jboss.netty.handler.codec.http.HttpResponseEncoder; import org.jboss.netty.handler.ssl.SslHandler; +import org.jboss.netty.util.Version; /** * A Netty TCP Acceptor that supports SSL @@ -295,6 +297,13 @@ startServerChannels(); paused = false; + + if(!Version.ID.equals(VersionLoader.getVersion().getNettyVersion())) + { + log.warn("Unexpected Netty Version was expecting " + VersionLoader.getVersion().getNettyVersion() + " using " + Version.ID); + } + + log.info("Started Netty Acceptor version " + Version.ID); } private void startServerChannels() Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2009-09-10 09:11:37 UTC (rev 7949) @@ -40,6 +40,7 @@ import org.hornetq.core.remoting.spi.Connector; import org.hornetq.utils.ConfigurationHelper; import org.hornetq.utils.Future; +import org.hornetq.utils.VersionLoader; import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; @@ -70,6 +71,7 @@ import org.jboss.netty.handler.codec.http.HttpResponseDecoder; import org.jboss.netty.handler.codec.http.HttpVersion; import org.jboss.netty.handler.ssl.SslHandler; +import org.jboss.netty.util.Version; /** * A NettyConnector @@ -310,6 +312,11 @@ return pipeline; } }); + if(!Version.ID.equals(VersionLoader.getVersion().getNettyVersion())) + { + log.warn("Unexpected Netty Version was expecting " + VersionLoader.getVersion().getNettyVersion() + " using " + Version.ID); + } + log.debug("Started Netty Connector version " + Version.ID); } public synchronized void close() Modified: trunk/src/main/org/hornetq/utils/VersionLoader.java =================================================================== --- trunk/src/main/org/hornetq/utils/VersionLoader.java 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/src/main/org/hornetq/utils/VersionLoader.java 2009-09-10 09:11:37 UTC (rev 7949) @@ -80,12 +80,14 @@ int microVersion = Integer.valueOf(versionProps.getProperty("hornetq.version.microVersion")); int incrementingVersion = Integer.valueOf(versionProps.getProperty("hornetq.version.incrementingVersion")); String versionSuffix = versionProps.getProperty("hornetq.version.versionSuffix"); + String nettyVersion=versionProps.getProperty("hornetq.netty.version"); return new VersionImpl(versionName, majorVersion, minorVersion, microVersion, incrementingVersion, - versionSuffix); + versionSuffix, + nettyVersion); } catch (IOException e) { Modified: trunk/tests/src/org/hornetq/tests/unit/core/version/impl/VersionImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/version/impl/VersionImplTest.java 2009-09-10 03:14:38 UTC (rev 7948) +++ trunk/tests/src/org/hornetq/tests/unit/core/version/impl/VersionImplTest.java 2009-09-10 09:11:37 UTC (rev 7949) @@ -48,7 +48,7 @@ int microVersion = 1; int incrementingVersion = 10; String versionSuffix = "suffix"; - VersionImpl version = new VersionImpl(versionName, majorVersion, minorVersion, microVersion, incrementingVersion, versionSuffix); + VersionImpl version = new VersionImpl(versionName, majorVersion, minorVersion, microVersion, incrementingVersion, versionSuffix, nettyVersion); assertEquals(versionName, version.getVersionName()); assertEquals(majorVersion, version.getMajorVersion()); @@ -60,9 +60,9 @@ public void testEquals() throws Exception { - VersionImpl version = new VersionImpl("HORNETQ", 2, 0, 1, 10, "suffix"); - VersionImpl sameVersion = new VersionImpl("HORNETQ", 2, 0, 1, 10, "suffix"); - VersionImpl differentVersion = new VersionImpl("HORNETQ", 2, 0, 1, 11, "suffix"); + VersionImpl version = new VersionImpl("HORNETQ", 2, 0, 1, 10, "suffix", nettyVersion); + VersionImpl sameVersion = new VersionImpl("HORNETQ", 2, 0, 1, 10, "suffix", nettyVersion); + VersionImpl differentVersion = new VersionImpl("HORNETQ", 2, 0, 1, 11, "suffix", nettyVersion); assertFalse(version.equals(new Object())); @@ -73,7 +73,7 @@ public void testSerialize() throws Exception { - VersionImpl version = new VersionImpl("uyiuy", 3, 7, 6, 12, "uhuhuh"); + VersionImpl version = new VersionImpl("uyiuy", 3, 7, 6, 12, "uhuhuh", nettyVersion); ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(baos); oos.writeObject(version);