[jboss-cvs] JBoss Messaging SVN: r7420 - in trunk: examples/common and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 22 05:01:54 EDT 2009
Author: ataylor
Date: 2009-06-22 05:01:54 -0400 (Mon, 22 Jun 2009)
New Revision: 7420
Modified:
trunk/
trunk/build-messaging.xml
trunk/build-thirdparty.xml
trunk/build.xml
trunk/examples/common/build.xml
trunk/examples/jms/embedded/build.xml
trunk/pom.xml
trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java
trunk/tests/jms-tests/config/jbm-jboss-beans.xml
Log:
maven dependency integration
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- junit*.properties
coverage.ec
output
thirdparty
messaging.iws
bin
ObjectStore
build
data
data-backup
eclipse-output
logs
tags
tmp
+ tags
junit*.properties
logs
data-backup
data
build
tmp
coverage.ec
messaging.iws
bin
output
eclipse-output
ObjectStore
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/build-messaging.xml 2009-06-22 09:01:54 UTC (rev 7420)
@@ -58,7 +58,6 @@
<property name="core.jar.name" value="jbm-core.jar"/>
<property name="jms.jar.name" value="jbm-jms.jar"/>
- <property name="jms.api.jar.name" value="jbm-jms-api.jar"/>
<property name="jms.client.jar.name" value="jbm-jms-client.jar"/>
<property name="jnp.client.jar.name" value="jnp-client.jar"/>
<property name="transports.jar.name" value="jbm-transports.jar"/>
@@ -68,7 +67,7 @@
<property name="core.client.jar.name" value="jbm-core-client.jar"/>
<property name="ra.jar.name" value="jbm-ra.jar"/>
<property name="ra.rar.name" value="jbm-ra.rar"/>
- <property name="netty.jar.name" value="netty-3.1.0.BETA3.jar"/>
+ <property name="netty.jar.name" value="netty.jar"/>
<property name="mc.jar.name" value="jboss-mc.jar"/>
<property name="resources.jar.name" value="jbm-resources.jar"/>
@@ -128,7 +127,7 @@
<!-- ======================================================================================== -->
<property name="project.thirdparty" value="thirdparty"/>
- <property name="sun.javacc.lib" value="${project.thirdparty}/sun-javacc/lib/"/>
+ <property name="sun.javacc.lib" value="${project.thirdparty}/net/java/dev/javacc/lib/"/>
&libraries;
<!--
@@ -146,6 +145,7 @@
<!-- ======================================================================================== -->
<property name="test.dir" value="tests"/>
+ <property name="thirdparty.dir" value="thirdparty"/>
<property name="test.build.dir" value="${test.dir}/build"/>
<property name="test.src.dir" value="${test.dir}/src"/>
<property name="test-mask" value="*Test"/>
@@ -170,34 +170,31 @@
<path id="jms.compilation.classpath">
<path location="${build.core.classes.dir}"/>
- <path refid="jboss.jboss.javaee.classpath"/>
+ <path refid="org.jboss.javaee.classpath"/>
+ <path refid="org.jboss.integration.classpath"/>
<path refid="jboss.jbossts.classpath"/>
- <path refid="jboss.integration.classpath"/>
</path>
<path id="transports.compilation.classpath">
<path location="${build.core.classes.dir}"/>
- <path refid="jboss.jboss.javaee.classpath"/>
- <path refid="netty.netty.classpath"/>
+ <path refid="org.jboss.javaee.classpath"/>
+ <path refid="org.jboss.netty.classpath"/>
</path>
<path id="security.compilation.classpath">
<path location="${build.core.classes.dir}"/>
- <path refid="jboss.integration.classpath"/>
- <path refid="jboss.jbosssx.client.classpath"/>
- <path refid="jboss.jboss.security.spi.classpath"/>
- <path refid="jboss.jboss.jaspi.api.classpath"/>
+ <path refid="org.jboss.security.classpath"/>
</path>
<path id="bootstrap.compilation.classpath">
<path location="${build.core.classes.dir}"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.common.core.classpath"/>
+ <path refid="org.jboss.microcontainer.classpath"/>
+ <path refid="org.jboss.classpath"/>
</path>
<path id="logging.compilation.classpath">
- <path refid="apache.log4j.classpath"/>
- <path refid="jboss.jboss.common.logging.spi.classpath"/>
+ <path refid="log4j.log4j.classpath"/>
+ <path refid="org.jboss.logging.classpath"/>
</path>
<path id="javadoc.classpath">
@@ -211,9 +208,6 @@
<path refid="security.compilation.classpath"/>
<path refid="bootstrap.compilation.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="jboss.jboss.reflect.classpath"/>
- <path refid="jboss.jboss.common.logging.spi.classpath"/>
- <path refid="jboss.jboss.mdr.classpath"/>
<path location="${build.jars.dir}/${ra.jar.name}"/>
<path location="${build.jars.dir}/${jms.jar.name}"/>
<path location="${build.jars.dir}/${transports.jar.name}"/>
@@ -228,10 +222,7 @@
<path refid="bootstrap.compilation.classpath"/>
<path refid="jms.compilation.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss.jboss.reflect.classpath"/>
- <path refid="jboss.jboss.common.logging.spi.classpath"/>
- <path refid="jboss.jboss.mdr.classpath"/>
+ <path refid="org.jboss.security.classpath"/>
<path location="${build.jars.dir}/${core.jar.name}"/>
<path location="${build.jars.dir}/${jms.jar.name}"/>
<path location="${build.jars.dir}/${transports.jar.name}"/>
@@ -244,15 +235,14 @@
<path refid="jms.test.compilation.classpath"/>
<path location="${test.jms.classes.dir}" />
<path location="${test.classes.dir}" />
- <path refid="jboss.jnpserver.classpath"/>
+ <path refid="org.jboss.naming.classpath"/>
+ <path refid="org.jboss.logging.classpath"/>
</path>
<path id="findbugs.classpath">
<path refid="jms.compilation.classpath"/>
<path location="${build.jars.dir}/jboss-${module.name}.jar"/>
<path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
</path>
<path id="unit.test.execution.classpath">
@@ -270,15 +260,11 @@
<pathelement location="${src.schema.dir}"/>
<path refid="test.compilation.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="trove.trove.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
+ <path refid="org.jboss.logging.classpath"/>
+ <path refid="jboss.jbossts.classpath"/>
<path refid="apache.xerces.classpath"/>
<path refid="apache.logging.classpath"/>
- <path refid="jboss.jboss.common.logging.log4j.classpath"/>
+ <path refid="log4j.log4j.classpath"/>
</path>
<path id="emma.unit.test.execution.classpath">
@@ -288,14 +274,7 @@
<pathelement location="${src.config.dir}/common"/>
<pathelement location="${src.schema.dir}"/>
<path refid="test.compilation.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="trove.trove.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
<path refid="apache.xerces.classpath"/>
- <path refid="apache.logging.classpath"/>
</path>
<path id="jms.test.execution.classpath">
@@ -307,16 +286,12 @@
<path location="${build.jars.dir}/${transports.jar.name}"/>
<path refid="jms.test.compilation.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="trove.trove.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
+ <path refid="org.jboss.logging.classpath"/>
+ <path refid="org.jboss.naming.classpath"/>
+ <path refid="jboss.jbossts.classpath"/>
<path refid="apache.xerces.classpath"/>
<path refid="apache.logging.classpath"/>
- <path refid="jboss.jnpserver.classpath"/>
- <path refid="jboss.jboss.common.logging.log4j.classpath"/>
- <path refid="apache.log4j.classpath"/>
+ <path refid="log4j.log4j.classpath"/>
</path>
<path id="joram.test.execution.classpath">
@@ -330,12 +305,11 @@
<pathelement location="${src.schema.dir}"/>
<path location="${build.jars.dir}/${transports.jar.name}"/>
<path refid="jms.test.execution.classpath"/>
-
- <path refid="jboss.jnpserver.classpath"/>
- <path refid="jboss.jboss.reflect.classpath"/>
+ <path refid="org.jboss.naming.classpath"/>
+ <!--<path refid="jboss.jboss.reflect.classpath"/>
<path refid="jboss.jboss.mdr.classpath"/>
<path refid="jboss.jboss.common.logging.spi.classpath"/>
- <path refid="jboss.jboss.common.logging.log4j.classpath"/>
+ <path refid="jboss.jboss.common.logging.log4j.classpath"/>-->
</path>
<target name="clean">
@@ -344,6 +318,7 @@
<delete dir="${test.output.dir}"/>
<delete dir="${test.jms.build.dir}"/>
<delete dir="${test.joram.build.dir}"/>
+ <delete dir="${thirdparty.dir}"/>
<ant antfile="${examples.dir}/build.xml" target="clean" inheritall="false"/>
</target>
@@ -363,7 +338,7 @@
<target name="createthirdparty" unless="inhibit.downloads" depends="check.inhibit.downloads">
- <ant antfile="build-thirdparty.xml" target="generate-libraries-ent"/>
+ <ant antfile="build-thirdparty.xml" target="maven-install"/>
</target>
<target name="check.inhibit.downloads">
@@ -584,12 +559,6 @@
<schema namespace="urn:jboss:messaging"
file="${src.schema.dir}/jbm-jms.xsd"/>
</schemavalidate>
- <!--
- <schemavalidate file="${conf.dir}/jbm-queues.xml">
- <schema namespace="urn:jboss:messaging"
- file="${src.schema.dir}/jbm-queues.xsd"/>
- </schemavalidate>
- -->
</target>
<!-- ======================================================================================== -->
@@ -597,25 +566,16 @@
<!-- ======================================================================================== -->
<target name="jar"
- depends="jar-core, jar-core-client, jar-jms, jar-jms-client, jar-transports, jar-security, jar-bootstrap, jar-logging, jar-ra, jar-mc, jar-jms-api, jar-jnp-client">
+ depends="jar-core, jar-core-client, jar-jms, jar-jms-client, jar-transports, jar-security, jar-bootstrap, jar-logging, jar-ra, jar-mc, jar-jnp-client">
</target>
-
- <target name="jar-jms-api" depends="init">
- <jar jarfile="${build.jars.dir}/${jms.api.jar.name}">
- <zipfileset src="${jboss.jboss.javaee.lib}/jboss-javaee.jar">
- <include name="javax/jms/**/*.class"/>
- </zipfileset>
- </jar>
- </target>
-
<target name="jar-jnp-client" depends="init">
<jar jarfile="${build.jars.dir}/${jnp.client.jar.name}">
- <zipfileset src="${jboss.jnpserver.lib}/jnpserver.jar">
+ <zipfileset src="${org.jboss.naming.lib}/jnpserver.jar">
<include name="org/jnp/interfaces/**/*.class"/>
<include name="org/jboss/naming/**/*.class"/>
<include name="org/jnp/server/NamingServer_Stub.class"/>
</zipfileset>
- <zipfileset src="${jboss.jboss.common.logging.spi.lib}/jboss-common-logging-spi.jar">
+ <zipfileset src="${org.jboss.logging.lib}/jboss-logging-spi.jar">
<include name="org/jboss/logging/**/*.class"/>
</zipfileset>
</jar>
@@ -623,18 +583,13 @@
<target name="jar-mc" depends="init">
<jar jarfile="${build.jars.dir}/${mc.jar.name}">
- <zipfileset src="./thirdparty/jboss/jboss-common-logging-spi/lib/jboss-common-logging-spi.jar"/>
- <zipfileset src="./thirdparty/jboss/jboss-reflect/lib/jboss-reflect.jar"/>
- <zipfileset src="./thirdparty/jboss/jboss-common-logging-spi/lib/jboss-common-logging-spi.jar"/>
- <zipfileset src="./thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
- <zipfileset src="./thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar"/>
- <zipfileset src="./thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
- <zipfileset src="./thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
- <zipfileset src="./thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <zipfileset src="./thirdparty/trove/lib/trove.jar"/>
- <zipfileset src="./thirdparty/javassist/lib/javassist.jar"/>
- <zipfileset src="./thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
- <zipfileset src="./thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <zipfileset src="./thirdparty/org/jboss/logging/lib/jboss-logging-spi.jar"/>
+ <zipfileset src="./thirdparty/org/jboss/microcontainer/lib/jboss-kernel.jar"/>
+ <zipfileset src="./thirdparty/org/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <zipfileset src="./thirdparty/org/jboss/lib/jboss-reflect.jar"/>
+ <zipfileset src="./thirdparty/org/jboss/lib/jboss-common-core.jar"/>
+ <zipfileset src="./thirdparty/org/jboss/lib/jboss-mdr.jar"/>
+ <zipfileset src="./thirdparty/org/jboss/lib/jbossxb.jar"/>
</jar>
</target>
@@ -794,13 +749,15 @@
<include name="${logging.jar.name}"/>
<include name="${mc.jar.name}"/>
<include name="${ra.rar.name}"/>
- <include name="${jms.api.jar.name}"/>
</fileset>
- <fileset dir="${jboss.jnpserver.lib}">
+ <fileset dir="${org.jboss.naming.lib}">
<include name="jnpserver.jar"/>
- </fileset>
+ </fileset>
+ <fileset dir="${org.jboss.javaee.lib}">
+ <include name="jboss-jms-api.jar"/>
+ </fileset>
</copy>
- <copy file="${netty.netty.lib}/${netty.jar.name}" tofile="${build.distro.lib.dir}/netty.jar"/>
+ <copy file="${org.jboss.netty.lib}/${netty.jar.name}" tofile="${build.distro.lib.dir}/netty.jar"/>
<copy todir="${build.distro.client.dir}">
<fileset dir="${build.jars.dir}">
<include name="${core.client.jar.name}"/>
Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/build-thirdparty.xml 2009-06-22 09:01:54 UTC (rev 7420)
@@ -31,137 +31,134 @@
<!-- -->
<!-- =========================================================================================== -->
-<project name="main.build" default="synchronize">
+<project name="main.build" default="maven-install">
<!-- ======================================================================================== -->
<!-- Configuration -->
<!-- ======================================================================================== -->
- <property file="local.properties"/>
- <property file="synchronize.properties"/>
- <property name="librariesEntFile" value="./thirdparty/libraries.ent"/>
- <property environment="ENV"/>
+ <!--maven targets-->
+ <!-- Define a macro for calling maven -->
+ <!--<target name="createthirdparty" unless="inhibit.downloads"
+ depends="maven-init, init, check.inhibit.downloads, set.proxy">
- <!--
- | Allow jbossbuild.repository to be set from (in order or priority)
- | 1) Command line -Djbossbuild.repository=...
- | 2) synchronize.properties jbossbuild.repository setting
- | 3) JBOSS_REPOSITORY environment variable
- -->
- <condition property="jbossbuild.repository" value="${ENV.JBOSS_REPOSITORY}">
- <isset property="ENV.JBOSS_REPOSITORY"/>
- </condition>
+ <property name="maven.opts" value=""/>
+ <property name="thirdparty.maven.opts" value="${maven.opts}"/>
- <!--
- | Fall back to default.
- -->
- <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+ <maven basedir="${basedir}/thirdparty"
+ options="${thirdparty.maven.opts}"
+ goal="generate-resources"
+ resultproperty="maven.thirdparty.result"/>
- <import file="./tools/config/jbossbuild/tasks.xml"/>
+ <fail message="Unable to build thirdparty directory. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.thirdparty.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
- <!--
- | This is where JBoss Messaging external dependencies are declared. The repository is in CVS
- | under the module repository.jboss.com whose contents are pushed to the
- | http://repository.jboss.com site.
- -->
- <build id="jboss-messaging"
- impltitle="JBoss Messaging"
- implversion="undefined"
- implvendor="JBoss Inc."
- implurl="http://www.jboss.org"
- description="JBoss Messaging"
- cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
- thirdpartypath="./thirdparty/"
- location="${jbossbuild.repository}"
- targetdefs="targets">
+ </target>-->
- <!--
- needed for the filters
- -->
- <componentref name="sun-javacc" version="3.2"/>
- <!--
- Dependencies required to build the transport jar
- -->
+ <macrodef name="maven">
+ <attribute name="options" default="" />
+ <attribute name="goal" />
+ <attribute name="basedir" />
+ <attribute name="resultproperty" default="maven.result" />
+ <element name="args" implicit="true" optional="true" />
+ <sequential>
+ <java classname="org.codehaus.classworlds.Launcher" fork="true"
+ dir="@{basedir}" resultproperty="@{resultproperty}">
+ <jvmarg value="-Xmx512m"/>
+ <classpath>
+ <fileset dir="${maven.home}/boot">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${maven.home}/lib">
+ <include name="*.jar" />
+ </fileset>
+ </classpath>
+ <sysproperty key="classworlds.conf" value="${maven.home}/bin/m2.conf" />
+ <sysproperty key="maven.home" value="${maven.home}" />
+ <arg line="--batch-mode @{options} @{goal}" />
+ </java>
+ </sequential>
+ </macrodef>
- <componentref name="netty" version="3.1.0.BETA3"/>
+ <target name="maven-init">
+ <property name="maven.home" location="${basedir}/tools/maven"/>
+ <echo message="Maven Home set to ${maven.home}"/>
+ </target>
- <!--
- Dependencies needed to build the security.jar
- -->
+ <!--<target name="checkthirdparty">
+ <if>
+ <not>
+ <available file="${basedir}/thirdparty/libraries.ent"/>
+ </not>
+ <then>
+ <antcall target="createthirdparty"/>
+ </then>
+ </if>
+ </target>-->
- <componentref name="jboss/integration" version="5.1.0.CR2"/>
- <componentref name="jboss/jboss-security-spi" version="2.0.3.SP1"/>
- <componentref name="jboss/jbosssx-client" version="2.0.3.SP1"/>
- <componentref name="jboss/jboss-jaspi-api" version="1.0.0.GA"/>
+ <target name="maven-install" description="Run the install goal against the maven build"
+ depends="maven-init">
- <!--
- Dependencies required to build the bootstrap.jar
- -->
+ <property name="maven.opts" value=""/>
+ <property name="maven.install.opts" value="-Dintegrated-build ${maven.opts}"/>
- <componentref name="jboss/microcontainer" version="2.0.4.GA"/>
- <componentref name="jboss/common-core" version="2.2.11.GA"/>
+ <maven basedir="${basedir}"
+ options="${maven.install.opts}"
+ goal="install"
+ resultproperty="maven.install.result"/>
- <!--
- Dependencies required to build logging.jar
- -->
+ <fail message="Unable to build maven modules. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.install.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
- <componentref name="apache-log4j" version="1.2.14"/>
- <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
- <componentref name="jboss/jboss-common-logging-log4j" version="2.0.4.GA"/>
+ </target>
- <!--
- Dependencies required to build jms.jar
- -->
+ <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
- <componentref name="jboss/jboss-javaee" version="5.0.1.GA"/>
+ <!-- set proxy settings without auth -->
+ <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
+ <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ </target>
- <!--
- Dependencied required by the Bridge and JCA Adapter
- -->
- <componentref name="jboss/jbossts" version="4.6.1.GA"/>
+ <!-- set proxy settings using auth -->
+ <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
+ <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
+ </target>
-
- <!--
- Added Dependencies required by the microcontainer to run the server standalone.
- -->
-
- <componentref name="jboss/jnpserver" version="5.0.1.GA"/>
- <componentref name="jboss/jboss-reflect" version="2.0.2.GA"/>
- <componentref name="jboss/jboss-mdr" version="2.0.1.GA"/>
- <componentref name="jboss/aop" version="2.1.0.CR2"/>
- <componentref name="javassist" version="3.9.0.GA/"/>
- <componentref name="jboss/jbossxb" version="2.0.0.GA"/>
- <componentref name="apache-xerces" version="2.9.1"/>
- <componentref name="sun-jaxb" version="2.1.9"/>
-
- <!--
- Dependencies required to run the unit tests
- -->
-
- <componentref name="junit" version="3.8.2-brew"/>
- <componentref name="trove" version="1.0.2-brew"/>
- <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
-
- <!--
- Dependencies required to run the jms tests
- -->
-
- <componentref name="apache-logging" version="1.1.0.jboss"/>
-
- </build>
-
- <synchronizeinfo/>
-
- <!--
- | Generate the targets.
- -->
- <generate generate="jboss-messaging"/>
-
- <target name="generate-libraries-ent" depends="synchronize">
- <gen-lib-file path="tools/config/buildmagic" filename="${librariesEntFile}"/>
- <visit-componentref-graph componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
+ <!-- check if the the user has specied proxy settings -->
+ <target name="check.proxy">
+ <condition property="hasproxy">
+ <and>
+ <isset property="proxy.host"/>
+ <isset property="proxy.port"/>
+ <not>
+ <equals arg1="" arg2="${proxy.host}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.port}" trim="true"/>
+ </not>
+ </and>
+ </condition>
</target>
+ <!-- check if thirdparty libraries are to be downloaded -->
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <istrue value="${nodownload}"/>
+ </condition>
+ </target>
+
</project>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/build.xml 2009-06-22 09:01:54 UTC (rev 7420)
@@ -48,14 +48,14 @@
<property name="nodownload" value="false"/>
<target name="createthirdparty" unless="inhibit.downloads" depends="check.inhibit.downloads">
- <ant antfile="build-thirdparty.xml" target="generate-libraries-ent"/>
+ <ant antfile="build-thirdparty.xml" target="maven-install"/>
</target>
<target name="check.inhibit.downloads">
<condition property="inhibit.downloads">
<or>
<uptodate property="dependencies.current"
- srcfile="build-thirdparty.xml"
+ srcfile="pom.xml"
targetfile="./thirdparty/libraries.ent"/>
<istrue value="${nodownload}"/>
</or>
Modified: trunk/examples/common/build.xml
===================================================================
--- trunk/examples/common/build.xml 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/examples/common/build.xml 2009-06-22 09:01:54 UTC (rev 7420)
@@ -65,14 +65,20 @@
<fileset dir="${jbm.jars.dir}">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${jars.dir}">
+ <include name="**/jboss-jms-api.jar"/>
+ </fileset>
<path refid="extra.classpath"/>
</path>
<path id="client.compilation.classpath">
<fileset dir="${jbm.jars.dir}">
<include name="**/*client*.jar"/>
- <include name="**/jbm-jms-api.jar"/>
+ <include name="**/jboss-jms-api.jar"/>
</fileset>
+ <fileset dir="${jars.dir}">
+ <include name="**/jboss-jms-api.jar"/>
+ </fileset>
<path refid="extra.classpath"/>
</path>
@@ -98,8 +104,8 @@
<pathelement location="${example.config.dir}"/>
<pathelement location="${classes.dir}"/>
<fileset dir="${jars.dir}">
- <include name="jboss/jnpserver/lib/jnpserver.jar"/>
- <include name="netty/lib/netty*.jar"/>
+ <include name="org/jboss/naming/lib/jnpserver.jar"/>
+ <include name="org/jboss/netty/lib/netty*.jar"/>
</fileset>
</path>
Modified: trunk/examples/jms/embedded/build.xml
===================================================================
--- trunk/examples/jms/embedded/build.xml 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/examples/jms/embedded/build.xml 2009-06-22 09:01:54 UTC (rev 7420)
@@ -40,8 +40,7 @@
</fileset>
<fileset dir="${jars.dir}">
- <include name="**/jboss-javaee.jar"/>
- <include name="**/jbm-jms-api.jar"/>
+ <include name="**/jboss-jms-api.jar"/>
</fileset>
<pathelement location="${classes.dir}"/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/pom.xml 2009-06-22 09:01:54 UTC (rev 7420)
@@ -1,17 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
- <artifactId>webdav-loader</artifactId>
- <version>1</version>
- <name>JBoss Webdav Extension pom</name>
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- </extension>
- </extensions>
- </build>
- </project>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.messaging</groupId>
+ <artifactId>messaging</artifactId>
+ <packaging>pom</packaging>
+ <version>2.0.0.BETA3-SNAPSHOT</version>
+
+ <name>The JBoss Messaging Project</name>
+ <url>http://www.jboss.org/jbossmessaging</url>
+ <description>
+ JBoss Messaging enables high performance, clustered messaging for Java.
+ </description>
+
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://www.jboss.org/</url>
+ </organization>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/messaging/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/messaging/trunk</developerConnection>
+ </scm>
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-buildmagic-thirdparty-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-thirdparty</id>
+ <goals>
+ <goal>build-thirdparty</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>thirdparty</outputDirectory>
+ <librariesEnt>thirdparty/libraries.ent</librariesEnt>
+ <includedScopes>
+ <scope>compile</scope>
+ </includedScopes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <!--without this dummy entry we get a npe, just ignore-->
+ <mappedDependencies>
+ <dependency>
+ <groupId>id</groupId>
+ <artifactId>art-id</artifactId>
+ <mapping>
+ <artifactId>1.0.0</artifactId>
+ </mapping>
+ </dependency>
+ </mappedDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+ <dependencies>
+ <!--needed for the filters-->
+ <dependency>
+ <groupId>net.java.dev.javacc</groupId>
+ <artifactId>javacc</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <!-- needed to compile JMS-->
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ <version>1.1.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ <version>1.0.1.GA</version>
+ </dependency>
+ <!--this specifically for the JMS Bridge-->
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>5.1.0.GA</version>
+ </dependency>
+ <!--this for xa recovery-->
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ <version>4.6.1.GA</version>
+ </dependency>
+ <!--needed to compile security-->
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <version>2.0.3.SP1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>2.0.3.SP1</version>
+ </dependency>
+ <!--needed to compile the bootstrap jar-->
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.6.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.14.GA</version>
+ </dependency>
+ <!--needed to compile transport jar-->
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.1.0.BETA3</version>
+ </dependency>
+ <!--needed to compile the logging jar-->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.1.0.GA</version>
+ </dependency>
+ <!-- needed to compile the tests-->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <!--needed to compile the jms tests-->
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ <version>1.0.0.GA</version>
+ </dependency>
+
+ <!--needed to run the jms tests-->
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>5.0.3.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>4.6.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.0.jboss</version>
+ </dependency>
+ </dependencies>
+
+
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>interval:10080</updatePolicy>
+ </releases>
+ <id>jboss.release</id>
+ <name>JBoss releases</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>interval:10080</updatePolicy>
+ </releases>
+ <id>jboss.release</id>
+ <name>JBoss releases</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <!--<profiles>
+ --><!-- This profile is used by the ant/buildmagic build --><!--
+ <profile>
+ <id>integrated-build</id>
+ <activation>
+ <property>
+ <name>integrated-build</name>
+ </property>
+ </activation>
+ <modules>
+ <module>thirdparty</module>
+ </modules>
+ </profile>
+
+ </profiles>-->
+
+ <distributionManagement>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss.org Release Distribution Repository</name>
+ <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss.org Development Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+
+</project>
+
Modified: trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java 2009-06-22 09:01:54 UTC (rev 7420)
@@ -55,6 +55,11 @@
logger.log(Level.FINEST, o.toString(), throwable);
}
+ public void trace(String s, Object o, Throwable throwable)
+ {
+ logger.log(Level.FINEST, s + o, throwable);
+ }
+
public boolean isDebugEnabled()
{
return logger.isLoggable(Level.FINE);
@@ -70,6 +75,11 @@
logger.log(Level.FINE, o.toString(), throwable);
}
+ public void debug(String s, Object o, Throwable throwable)
+ {
+ logger.log(Level.FINE, s + o, throwable);
+ }
+
public boolean isInfoEnabled()
{
return logger.isLoggable(Level.INFO);
@@ -85,6 +95,11 @@
logger.log(Level.INFO, o.toString(), throwable);
}
+ public void info(String s, Object o, Throwable throwable)
+ {
+ logger.log(Level.INFO, s + o, throwable);
+ }
+
public void warn(Object o)
{
logger.log(Level.WARNING, o.toString());
@@ -95,6 +110,11 @@
logger.log(Level.WARNING, o.toString(), throwable);
}
+ public void warn(String s, Object o, Throwable throwable)
+ {
+ logger.log(Level.WARNING, s + o, throwable);
+ }
+
public void error(Object o)
{
logger.log(Level.SEVERE, o.toString());
@@ -105,6 +125,11 @@
logger.log(Level.SEVERE, o.toString(), throwable);
}
+ public void error(String s, Object o, Throwable throwable)
+ {
+ logger.log(Level.SEVERE, s + o, throwable);
+ }
+
public void fatal(Object o)
{
logger.log(Level.SEVERE, o.toString());
@@ -114,4 +139,9 @@
{
logger.log(Level.SEVERE, o.toString(), throwable);
}
+
+ public void fatal(String s, Object o, Throwable throwable)
+ {
+ logger.log(Level.SEVERE, s + o, throwable);
+ }
}
Modified: trunk/tests/jms-tests/config/jbm-jboss-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-jboss-beans.xml 2009-06-22 04:30:36 UTC (rev 7419)
+++ trunk/tests/jms-tests/config/jbm-jboss-beans.xml 2009-06-22 09:01:54 UTC (rev 7420)
@@ -33,6 +33,8 @@
<!-- The core server -->
<bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -44,7 +46,7 @@
<inject bean="JBMSecurityManager"/>
</parameter>
</constructor>
- <start ignored="true"/>
+ <start ignored="true"/>
<stop ignored="true"/>
</bean>
More information about the jboss-cvs-commits
mailing list