Author: david.lloyd(a)jboss.com
Date: 2008-12-18 11:49:46 -0500 (Thu, 18 Dec 2008)
New Revision: 4760
Modified:
remoting3/trunk/build.properties
remoting3/trunk/build.xml
remoting3/trunk/testing-support/src/main/resources/testing.policy
Log:
Use Maven ant tasks to fetch deps; update tests
Modified: remoting3/trunk/build.properties
===================================================================
--- remoting3/trunk/build.properties 2008-12-17 00:09:33 UTC (rev 4759)
+++ remoting3/trunk/build.properties 2008-12-18 16:49:46 UTC (rev 4760)
@@ -1,198 +1,4 @@
javac.source=1.5
javac.target=1.5
-local.repository=${user.home}/.jboss/repository
-remote.repository=http://repository.jboss.org
-remote.license.dir=${remote.repository}/licenses
-
-# ===================================================
-# Dependencies - keep in alpha order by property name
-# ===================================================
-
-lib.apiviz.version=1.2.3.GA
-lib.apiviz.name=apiviz-${lib.apiviz.version}.jar
-lib.apiviz.license=lgpl
-lib.apiviz.dir=apiviz/${lib.apiviz.version}/lib
-lib.apiviz.path=${lib.apiviz.dir}/${lib.apiviz.name}
-lib.apiviz.local=${local.repository}/${lib.apiviz.path}
-lib.apiviz.remote=${remote.repository}/${lib.apiviz.path}
lib.apiviz.doclet=net.gleamynode.apiviz.APIviz
-
-lib.jaxb-api.version=2.0.5
-lib.jaxb-api.name=jaxb-api.jar
-lib.jaxb-api.license=cddl
-lib.jaxb-api.dir=sun-jaxb/${lib.jaxb-api.version}/lib
-lib.jaxb-api.path=${lib.jaxb-api.dir}/${lib.jaxb-api.name}
-lib.jaxb-api.local=${local.repository}/${lib.jaxb-api.path}
-lib.jaxb-api.remote=${remote.repository}/${lib.jaxb-api.path}
-
-lib.jboss-common-logging-spi.version=2.0.4.GA
-lib.jboss-common-logging-spi.name=jboss-common-logging-spi-${lib.jboss-common-logging-spi.version}.jar
-lib.jboss-common-logging-spi.license=lgpl
-lib.jboss-common-logging-spi.local-dir=jboss-common-logging-spi/${lib.jboss-common-logging-spi.version}/lib
-lib.jboss-common-logging-spi.remote-dir=maven2/jboss/jboss-common-logging-spi/${lib.jboss-common-logging-spi.version}
-lib.jboss-common-logging-spi.local-path=${lib.jboss-common-logging-spi.local-dir}/${lib.jboss-common-logging-spi.name}
-lib.jboss-common-logging-spi.remote-path=${lib.jboss-common-logging-spi.remote-dir}/${lib.jboss-common-logging-spi.name}
-lib.jboss-common-logging-spi.local=${local.repository}/${lib.jboss-common-logging-spi.local-path}
-lib.jboss-common-logging-spi.remote=${remote.repository}/${lib.jboss-common-logging-spi.remote-path}
-
-lib.jboss-common-core.version=2.2.0.GA
-lib.jboss-common-core.name=jboss-common-core-${lib.jboss-common-core.version}.jar
-lib.jboss-common-core.license=lgpl
-lib.jboss-common-core.local-dir=jboss-common-core/${lib.jboss-common-core.version}/lib
-lib.jboss-common-core.remote-dir=maven2/jboss/jboss-common-core/${lib.jboss-common-core.version}
-lib.jboss-common-core.local-path=${lib.jboss-common-core.local-dir}/${lib.jboss-common-core.name}
-lib.jboss-common-core.remote-path=${lib.jboss-common-core.remote-dir}/${lib.jboss-common-core.name}
-lib.jboss-common-core.local=${local.repository}/${lib.jboss-common-core.local-path}
-lib.jboss-common-core.remote=${remote.repository}/${lib.jboss-common-core.remote-path}
-
-lib.jboss-deployers.version=2.0.0.Beta11
-lib.jboss-deployers.license=lgpl
-lib.jboss-deployers.local-dir=jboss-deployers/${lib.jboss-deployers.version}/lib
-lib.jboss-deployers.remote-dir=jboss/jboss-deployers/${lib.jboss-deployers.version}/lib
-
-lib.jboss-deployers-client.name=jboss-deployers-client.jar
-lib.jboss-deployers-client.license=${lib.jboss-deployers.license}
-lib.jboss-deployers-client.local-path=${lib.jboss-deployers.local-dir}/${lib.jboss-deployers-client.name}
-lib.jboss-deployers-client.remote-path=${lib.jboss-deployers.remote-dir}/${lib.jboss-deployers-client.name}
-lib.jboss-deployers-client.local=${local.repository}/${lib.jboss-deployers-client.local-path}
-lib.jboss-deployers-client.remote=${remote.repository}/${lib.jboss-deployers-client.remote-path}
-
-lib.jboss-deployers-client-spi.name=jboss-deployers-client-spi.jar
-lib.jboss-deployers-client-spi.license=${lib.jboss-deployers.license}
-lib.jboss-deployers-client-spi.local-path=${lib.jboss-deployers.local-dir}/${lib.jboss-deployers-client-spi.name}
-lib.jboss-deployers-client-spi.remote-path=${lib.jboss-deployers.remote-dir}/${lib.jboss-deployers-client-spi.name}
-lib.jboss-deployers-client-spi.local=${local.repository}/${lib.jboss-deployers-client-spi.local-path}
-lib.jboss-deployers-client-spi.remote=${remote.repository}/${lib.jboss-deployers-client-spi.remote-path}
-
-lib.jboss-deployers-core-spi.name=jboss-deployers-core-spi.jar
-lib.jboss-deployers-core-spi.license=${lib.jboss-deployers.license}
-lib.jboss-deployers-core-spi.local-path=${lib.jboss-deployers.local-dir}/${lib.jboss-deployers-core-spi.name}
-lib.jboss-deployers-core-spi.remote-path=${lib.jboss-deployers.remote-dir}/${lib.jboss-deployers-core-spi.name}
-lib.jboss-deployers-core-spi.local=${local.repository}/${lib.jboss-deployers-core-spi.local-path}
-lib.jboss-deployers-core-spi.remote=${remote.repository}/${lib.jboss-deployers-core-spi.remote-path}
-
-lib.jboss-deployers-spi.name=jboss-deployers-spi.jar
-lib.jboss-deployers-spi.license=${lib.jboss-deployers.license}
-lib.jboss-deployers-spi.local-path=${lib.jboss-deployers.local-dir}/${lib.jboss-deployers-spi.name}
-lib.jboss-deployers-spi.remote-path=${lib.jboss-deployers.remote-dir}/${lib.jboss-deployers-spi.name}
-lib.jboss-deployers-spi.local=${local.repository}/${lib.jboss-deployers-spi.local-path}
-lib.jboss-deployers-spi.remote=${remote.repository}/${lib.jboss-deployers-spi.remote-path}
-
-lib.jboss-deployers-structure-spi.name=jboss-deployers-structure-spi.jar
-lib.jboss-deployers-structure-spi.license=${lib.jboss-deployers.license}
-lib.jboss-deployers-structure-spi.local-path=${lib.jboss-deployers.local-dir}/${lib.jboss-deployers-structure-spi.name}
-lib.jboss-deployers-structure-spi.remote-path=${lib.jboss-deployers.remote-dir}/${lib.jboss-deployers-structure-spi.name}
-lib.jboss-deployers-structure-spi.local=${local.repository}/${lib.jboss-deployers-structure-spi.local-path}
-lib.jboss-deployers-structure-spi.remote=${remote.repository}/${lib.jboss-deployers-structure-spi.remote-path}
-
-lib.jbossmc.version=2.0.0.Beta11
-lib.jbossmc.license=lgpl
-lib.jbossmc.local-dir=jboss-microcontainer/${lib.jbossmc.version}/lib
-lib.jbossmc.remote-dir=jboss/microcontainer/${lib.jbossmc.version}/lib
-
-lib.jbossmc-kernel.name=jboss-kernel.jar
-lib.jbossmc-kernel.license=${lib.jbossmc.license}
-lib.jbossmc-kernel.local-path=${lib.jbossmc.local-dir}/${lib.jbossmc-kernel.name}
-lib.jbossmc-kernel.remote-path=${lib.jbossmc.remote-dir}/${lib.jbossmc-kernel.name}
-lib.jbossmc-kernel.local=${local.repository}/${lib.jbossmc-kernel.local-path}
-lib.jbossmc-kernel.remote=${remote.repository}/${lib.jbossmc-kernel.remote-path}
-
-lib.jbossmc-dependency.name=jboss-dependency.jar
-lib.jbossmc-dependency.license=${lib.jbossmc.license}
-lib.jbossmc-dependency.local-path=${lib.jbossmc.local-dir}/${lib.jbossmc-dependency.name}
-lib.jbossmc-dependency.remote-path=${lib.jbossmc.remote-dir}/${lib.jbossmc-dependency.name}
-lib.jbossmc-dependency.local=${local.repository}/${lib.jbossmc-dependency.local-path}
-lib.jbossmc-dependency.remote=${remote.repository}/${lib.jbossmc-dependency.remote-path}
-
-lib.jboss-managed.name=jboss-managed.jar
-lib.jboss-managed.version=2.0.0.Beta10.1
-lib.jboss-managed.license=lgpl
-lib.jboss-managed.local-dir=jboss-managed/${lib.jboss-managed.version}/lib
-lib.jboss-managed.remote-dir=jboss/jboss-managed/${lib.jboss-managed.version}/lib
-lib.jboss-managed.local-path=${lib.jboss-managed.local-dir}/${lib.jboss-managed.name}
-lib.jboss-managed.remote-path=${lib.jboss-managed.remote-dir}/${lib.jboss-managed.name}
-lib.jboss-managed.local=${local.repository}/${lib.jboss-managed.local-path}
-lib.jboss-managed.remote=${remote.repository}/${lib.jboss-managed.remote-path}
-
-lib.marshalling-api.version=1.0.0.GA
-lib.marshalling-api.name=marshalling-api.jar
-lib.marshalling-api.license=lgpl
-lib.marshalling-api.dir=jboss/marshalling/${lib.marshalling-api.version}/lib
-lib.marshalling-api.path=${lib.marshalling-api.dir}/${lib.marshalling-api.name}
-lib.marshalling-api.local=${local.repository}/${lib.marshalling-api.path}
-lib.marshalling-api.remote=${remote.repository}/${lib.marshalling-api.path}
-
-lib.river.version=${lib.marshalling-api.version}
-lib.river.name=river.jar
-lib.river.license=${lib.marshalling-api.license}
-lib.river.dir=${lib.marshalling-api.dir}
-lib.river.path=${lib.river.dir}/${lib.river.name}
-lib.river.local=${local.repository}/${lib.river.path}
-lib.river.remote=${remote.repository}/${lib.river.path}
-
-lib.jbossxb.version=2.0.0.CR5
-lib.jbossxb.name=jboss-xml-binding.jar
-lib.jbossxb.license=lgpl
-lib.jbossxb.dir=jbossxb/${lib.jbossxb.version}/lib
-lib.jbossxb.path=${lib.jbossxb.dir}/${lib.jbossxb.name}
-lib.jbossxb.local=${local.repository}/${lib.jbossxb.path}
-lib.jbossxb.remote=${remote.repository}/jboss/${lib.jbossxb.path}
-
-lib.junit.version=3.8.1
-lib.junit.name=junit.jar
-lib.junit.license=cpl-1.0
-lib.junit.dir=junit/${lib.junit.version}/lib
-lib.junit.path=${lib.junit.dir}/${lib.junit.name}
-lib.junit.local=${local.repository}/${lib.junit.path}
-lib.junit.remote=${remote.repository}/${lib.junit.path}
-
-lib.mina.version=2.0.0-M1-20071228.043505-111
-lib.mina.name=mina-core-${lib.mina.version}.jar
-lib.mina.license=apache-2.0
-lib.mina.dir=apache-mina/${lib.mina.version}/lib
-lib.mina.path=${lib.mina.dir}/${lib.mina.name}
-lib.mina.local=${local.repository}/${lib.mina.path}
-lib.mina.remote=${remote.repository}/${lib.mina.path}
-
-lib.servlet.version=2.4
-lib.servlet.name=servlet-api.jar
-lib.servlet.license=apache-2.0
-lib.servlet.dir=sun-servlet/${lib.servlet.version}/lib
-lib.servlet.path=${lib.servlet.dir}/${lib.servlet.name}
-lib.servlet.local=${local.repository}/${lib.servlet.path}
-lib.servlet.remote=${remote.repository}/${lib.servlet.path}
-
-lib.sun-httpserver.version=20070405
-lib.sun-httpserver.name=http-${lib.sun-httpserver.version}.jar
-lib.sun-httpserver.license=gpl
-lib.sun-httpserver.dir=sun-httpserver/${lib.sun-httpserver.version}/lib
-lib.sun-httpserver.path=${lib.sun-httpserver.dir}/${lib.sun-httpserver.name}
-lib.sun-httpserver.local=${local.repository}/${lib.sun-httpserver.path}
-lib.sun-httpserver.remote=${remote.repository}/${lib.sun-httpserver.path}
-
-lib.trove.version=2.1.1
-lib.trove.name=trove.jar
-lib.trove.license=lgpl
-lib.trove.dir=trove/${lib.trove.version}/lib
-lib.trove.path=${lib.trove.dir}/${lib.trove.name}
-lib.trove.local=${local.repository}/${lib.trove.path}
-lib.trove.remote=${remote.repository}/${lib.trove.path}
-
-lib.xnio.version=1.2.0.CR1
-lib.xnio.version-javadoc=1.2.0.CR1
-
-lib.xnio-api.name=xnio-api-${lib.xnio.version}.jar
-lib.xnio-api.license=lgpl
-lib.xnio-api.dir=maven2/org/jboss/xnio/xnio-api/${lib.xnio.version}
-lib.xnio-api.path=${lib.xnio-api.dir}/${lib.xnio-api.name}
-lib.xnio-api.local=${local.repository}/${lib.xnio-api.path}
-lib.xnio-api.remote=${remote.repository}/${lib.xnio-api.path}
-
-lib.xnio-nio.name=xnio-nio-${lib.xnio.version}.jar
-lib.xnio-nio.license=lgpl
-lib.xnio-nio.dir=maven2/org/jboss/xnio/xnio-nio/${lib.xnio.version}
-lib.xnio-nio.path=${lib.xnio-nio.dir}/${lib.xnio-nio.name}
-lib.xnio-nio.local=${local.repository}/${lib.xnio-nio.path}
-lib.xnio-nio.remote=${remote.repository}/${lib.xnio-nio.path}
-
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2008-12-17 00:09:33 UTC (rev 4759)
+++ remoting3/trunk/build.xml 2008-12-18 16:49:46 UTC (rev 4760)
@@ -1,4 +1,4 @@
-<project name="JBoss Remoting 3" default="all">
+<project name="JBoss Remoting 3" default="all"
xmlns:mvn="urn:maven-artifact-ant">
<property file="build.properties.local"/>
<property file="build.properties"/>
@@ -7,222 +7,114 @@
<!-- LIBRARIES - Keep in alpha order by target name -->
<!-- ============================================== -->
- <!-- External library: apiviz -->
+ <property name="maven.ant.file"
value="maven-ant-tasks.jar"/>
- <target name="lib.apiviz-check">
- <available property="lib.apiviz.exists"
file="${lib.apiviz.local}"/>
+ <target name="jboss.repository" depends="maven-ant">
+ <mvn:remoteRepository id="jboss.repository"
url="http://repository.jboss.org/maven2"/>
</target>
- <target name="lib.apiviz" depends="lib.apiviz-check"
unless="lib.apiviz.exists">
- <mkdir dir="${local.repository}/${lib.apiviz.dir}"/>
- <get src="${lib.apiviz.remote}" dest="${lib.apiviz.local}"
usetimestamp="true" ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.apiviz.license}.txt"
dest="${lib.apiviz.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
+ <target name="maven-ant.check">
+ <available property="maven-ant.exists"
file="${maven.ant.file}"/>
</target>
- <!-- External library: JAXB API -->
-
- <target name="lib.jaxb-api-check">
- <available property="lib.jaxb-api.exists"
file="${lib.jaxb-api.local}"/>
+ <target name="maven-ant.fetch" depends="maven-ant.check"
unless="maven-ant.exists">
+ <get
src="http://repository.jboss.org/maven2/org/apache/maven/maven-ant-t...
dest="${maven.ant.file}"/>
</target>
- <target name="lib.jaxb-api" depends="lib.jaxb-api-check"
unless="lib.jaxb-api.exists">
- <mkdir dir="${local.repository}/${lib.jaxb-api.dir}"/>
- <get src="${lib.jaxb-api.remote}"
dest="${lib.jaxb-api.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.jaxb-api.license}.txt"
dest="${lib.jaxb-api.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
+ <target name="maven-ant" depends="maven-ant.fetch">
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant">
+ <classpath>
+ <pathelement location="${maven.ant.file}"/>
+ </classpath>
+ </typedef>
</target>
- <!-- External library: JBoss Common Core -->
+ <!-- External library: apiviz -->
- <target name="lib.jboss-common-core-check">
- <available property="lib.jboss-common-core.exists"
file="${lib.jboss-common-core.local}"/>
+ <target name="lib.apiviz" depends="jboss.repository">
+ <mvn:dependencies pathId="lib.apiviz.classpath">
+ <mvn:remoteRepository refid="jboss.repository"/>
+ <mvn:dependency groupId="org.jboss.apiviz"
artifactId="apiviz" version="1.2.5.GA"/>
+ </mvn:dependencies>
</target>
- <target name="lib.jboss-common-core"
depends="lib.jboss-common-core-check"
unless="lib.jboss-common-core.exists">
- <mkdir
dir="${local.repository}/${lib.jboss-common-core.local-dir}"/>
- <get src="${lib.jboss-common-core.remote}"
dest="${lib.jboss-common-core.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get
src="${remote.license.dir}/${lib.jboss-common-core.license}.txt"
dest="${lib.jboss-common-core.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
+ <!-- External library: JAXB API -->
- <!-- External library: JBoss Common Logging SPI -->
-
- <target name="lib.jboss-common-logging-spi-check">
- <available property="lib.jboss-common-logging-spi.exists"
file="${lib.jboss-common-logging-spi.local}"/>
+ <target name="lib.jaxb-api" depends="jboss.repository">
+ <mvn:dependencies pathId="lib.jaxb-api.classpath">
+ <mvn:remoteRepository refid="jboss.repository"/>
+ <mvn:dependency groupId="sun-jaxb"
artifactId="jaxb-api" version="2.1.9"/>
+ </mvn:dependencies>
</target>
- <target name="lib.jboss-common-logging-spi"
depends="lib.jboss-common-logging-spi-check"
unless="lib.jboss-common-logging-spi.exists">
- <mkdir
dir="${local.repository}/${lib.jboss-common-logging-spi.local-dir}"/>
- <get src="${lib.jboss-common-logging-spi.remote}"
dest="${lib.jboss-common-logging-spi.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get
src="${remote.license.dir}/${lib.jboss-common-logging-spi.license}.txt"
dest="${lib.jboss-common-logging-spi.local}.license.txt"
usetimestamp="true" ignoreerrors="false"/>
- </target>
-
- <!-- External library: JBoss Microcontainer deployers SPI -->
-
- <target name="lib.jboss-deployers-spi-check">
- <available property="lib.jboss-deployers-spi.exists"
file="${lib.jboss-deployers-spi.local}"/>
- </target>
-
- <target name="lib.jboss-deployers-spi"
depends="lib.jboss-deployers-spi-check"
unless="lib.jboss-deployers-spi.exists">
- <mkdir
dir="${local.repository}/${lib.jboss-deployers.local-dir}"/>
- <get src="${lib.jboss-deployers-spi.remote}"
dest="${lib.jboss-deployers-spi.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get
src="${remote.license.dir}/${lib.jboss-deployers-spi.license}.txt"
dest="${lib.jboss-deployers-spi.local}.license.txt"
usetimestamp="true" ignoreerrors="false"/>
- </target>
-
- <!-- External library: JBoss Microcontainer deployers structure SPI -->
-
- <target name="lib.jboss-deployers-structure-spi-check">
- <available property="lib.jboss-deployers-structure-spi.exists"
file="${lib.jboss-deployers-structure-spi.local}"/>
- </target>
-
- <target name="lib.jboss-deployers-structure-spi"
depends="lib.jboss-deployers-structure-spi-check"
unless="lib.jboss-deployers-structure-spi.exists">
- <mkdir
dir="${local.repository}/${lib.jboss-deployers.local-dir}"/>
- <get src="${lib.jboss-deployers-structure-spi.remote}"
dest="${lib.jboss-deployers-structure-spi.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get
src="${remote.license.dir}/${lib.jboss-deployers-structure-spi.license}.txt"
dest="${lib.jboss-deployers-structure-spi.local}.license.txt"
usetimestamp="true" ignoreerrors="false"/>
- </target>
-
- <!-- External library: JBoss Microcontainer deployers core SPI -->
-
- <target name="lib.jboss-deployers-core-spi-check">
- <available property="lib.jboss-deployers-core-spi.exists"
file="${lib.jboss-deployers-core-spi.local}"/>
- </target>
-
- <target name="lib.jboss-deployers-core-spi"
depends="lib.jboss-deployers-core-spi-check"
unless="lib.jboss-deployers-core-spi.exists">
- <mkdir
dir="${local.repository}/${lib.jboss-deployers.local-dir}"/>
- <get src="${lib.jboss-deployers-core-spi.remote}"
dest="${lib.jboss-deployers-core-spi.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get
src="${remote.license.dir}/${lib.jboss-deployers-core-spi.license}.txt"
dest="${lib.jboss-deployers-core-spi.local}.license.txt"
usetimestamp="true" ignoreerrors="false"/>
- </target>
-
<!-- External library: JBoss Microcontainer kernel -->
- <target name="lib.jbossmc-kernel-check">
- <available property="lib.jbossmc-kernel.exists"
file="${lib.jbossmc-kernel.local}"/>
+ <target name="lib.jbossmc-kernel"
depends="jboss.repository">
+ <mvn:dependencies pathId="lib.jbossmc-kernel.classpath">
+ <mvn:remoteRepository refid="jboss.repository"/>
+ <mvn:dependency groupId="org.jboss.microcontainer"
artifactId="jboss-kernel" version="2.0.1.GA"/>
+ </mvn:dependencies>
</target>
- <target name="lib.jbossmc-kernel"
depends="lib.jbossmc-kernel-check"
unless="lib.jbossmc-kernel.exists">
- <mkdir dir="${local.repository}/${lib.jbossmc.local-dir}"/>
- <get src="${lib.jbossmc-kernel.remote}"
dest="${lib.jbossmc-kernel.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.jbossmc-kernel.license}.txt"
dest="${lib.jbossmc-kernel.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
- <!-- External library: JBoss Microcontainer dependency -->
-
- <target name="lib.jbossmc-dependency-check">
- <available property="lib.jbossmc-dependency.exists"
file="${lib.jbossmc-dependency.local}"/>
- </target>
-
- <target name="lib.jbossmc-dependency"
depends="lib.jbossmc-dependency-check"
unless="lib.jbossmc-dependency.exists">
- <mkdir dir="${local.repository}/${lib.jbossmc.local-dir}"/>
- <get src="${lib.jbossmc-dependency.remote}"
dest="${lib.jbossmc-dependency.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get
src="${remote.license.dir}/${lib.jbossmc-dependency.license}.txt"
dest="${lib.jbossmc-dependency.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
- <!-- External library: JBoss Microcontainer managed -->
-
- <target name="lib.jboss-managed-check">
- <available property="lib.jboss-managed.exists"
file="${lib.jboss-managed.local}"/>
- </target>
-
- <target name="lib.jboss-managed"
depends="lib.jboss-managed-check"
unless="lib.jboss-managed.exists">
- <mkdir
dir="${local.repository}/${lib.jboss-managed.local-dir}"/>
- <get src="${lib.jboss-managed.remote}"
dest="${lib.jboss-managed.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.jboss-managed.license}.txt"
dest="${lib.jboss-managed.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
<!-- External library: JBossXB -->
- <target name="lib.jbossxb-check">
- <available property="lib.jbossxb.exists"
file="${lib.jbossxb.local}"/>
+ <target name="lib.jbossxb" depends="jboss.repository">
+ <mvn:dependencies pathId="lib.jbossxb.classpath">
+ <mvn:remoteRepository refid="jboss.repository"/>
+ <mvn:dependency groupId="org.jboss"
artifactId="jbossxb" version="2.0.0.GA"/>
+ </mvn:dependencies>
</target>
- <target name="lib.jbossxb" depends="lib.jbossxb-check"
unless="lib.jbossxb.exists">
- <mkdir dir="${local.repository}/${lib.jbossxb.dir}"/>
- <get src="${lib.jbossxb.remote}"
dest="${lib.jbossxb.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.jbossxb.license}.txt"
dest="${lib.jbossxb.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
<!-- External library: JUnit -->
- <target name="lib.junit-check">
- <available property="lib.junit.exists"
file="${lib.junit.local}"/>
+ <target name="lib.junit" depends="jboss.repository">
+ <mvn:dependencies pathId="lib.junit.classpath">
+ <mvn:remoteRepository refid="jboss.repository"/>
+ <mvn:dependency groupId="junit" artifactId="junit"
version="3.8.2"/>
+ </mvn:dependencies>
+ <property name="lib.junit.local"
refid="lib.junit.classpath"/>
</target>
- <target name="lib.junit" depends="lib.junit-check"
unless="lib.junit.exists">
- <mkdir dir="${local.repository}/${lib.junit.dir}"/>
- <get src="${lib.junit.remote}" dest="${lib.junit.local}"
usetimestamp="true" ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.junit.license}.txt"
dest="${lib.junit.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
<!-- External library: Marshalling API -->
- <target name="lib.marshalling-api-check">
- <available property="lib.marshalling-api.exists"
file="${lib.marshalling-api.local}"/>
+ <target name="lib.marshalling-api"
depends="jboss.repository">
+ <mvn:dependencies pathId="lib.marshalling-api.classpath">
+ <remoteRepository refid="jboss.repository"/>
+ <dependency groupId="org.jboss.marshalling"
artifactId="marshalling-api" version="1.0.0.GA"/>
+ </mvn:dependencies>
+ <property name="lib.marshalling-api.local"
refid="lib.marshalling-api.classpath"/>
</target>
- <target name="lib.marshalling-api"
depends="lib.marshalling-api-check"
unless="lib.marshalling-api.exists">
- <mkdir dir="${local.repository}/${lib.marshalling-api.dir}"/>
- <get src="${lib.marshalling-api.remote}"
dest="${lib.marshalling-api.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.marshalling-api.license}.txt"
dest="${lib.marshalling-api.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
<!-- External library: River -->
- <target name="lib.river-check">
- <available property="lib.river.exists"
file="${lib.river.local}"/>
+ <target name="lib.river" depends="jboss.repository">
+ <mvn:dependencies pathId="lib.river.classpath">
+ <remoteRepository refid="jboss.repository"/>
+ <dependency groupId="org.jboss.marshalling"
artifactId="river" version="1.0.0.GA"/>
+ </mvn:dependencies>
+ <property name="lib.river.local"
refid="lib.river.classpath"/>
</target>
- <target name="lib.river" depends="lib.river-check"
unless="lib.river.exists">
- <mkdir dir="${local.repository}/${lib.river.dir}"/>
- <get src="${lib.river.remote}" dest="${lib.river.local}"
usetimestamp="true" ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.river.license}.txt"
dest="${lib.river.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
- <!-- External library: Servlet API 2.4 -->
-
- <target name="lib.servlet-check">
- <available property="lib.servlet.exists"
file="${lib.servlet.local}"/>
- </target>
-
- <target name="lib.servlet" depends="lib.servlet-check"
unless="lib.servlet.exists">
- <mkdir dir="${local.repository}/${lib.servlet.dir}"/>
- <get src="${lib.servlet.remote}"
dest="${lib.servlet.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.servlet.license}.txt"
dest="${lib.servlet.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
- <!-- External library: Sun embedded HTTP server -->
-
- <target name="lib.sun-httpserver-check">
- <available property="lib.sun-httpserver.exists"
file="${lib.sun-httpserver.local}"/>
- </target>
-
- <target name="lib.sun-httpserver"
depends="lib.sun-httpserver-check"
unless="lib.sun-httpserver.exists">
- <mkdir dir="${local.repository}/${lib.sun-httpserver.dir}"/>
- <get src="${lib.sun-httpserver.remote}"
dest="${lib.sun-httpserver.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.sun-httpserver.license}.txt"
dest="${lib.sun-httpserver.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
<!-- External library: XNIO api -->
- <target name="lib.xnio-api-check">
- <available property="lib.xnio-api.exists"
file="${lib.xnio-api.local}"/>
+ <target name="lib.xnio-api" depends="jboss.repository">
+ <mvn:dependencies pathId="lib.xnio-api.classpath">
+ <remoteRepository refid="jboss.repository"/>
+ <dependency groupId="org.jboss.xnio"
artifactId="xnio-api" version="1.2.0.CR1"/>
+ </mvn:dependencies>
+ <property name="lib.xnio-api.local"
refid="lib.xnio-api.classpath"/>
</target>
- <target name="lib.xnio-api" depends="lib.xnio-api-check"
unless="lib.xnio-api.exists">
- <mkdir dir="${local.repository}/${lib.xnio-api.dir}"/>
- <get src="${lib.xnio-api.remote}"
dest="${lib.xnio-api.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.xnio-api.license}.txt"
dest="${lib.xnio-api.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
<!-- External library: XNIO nio -->
- <target name="lib.xnio-nio-check">
- <available property="lib.xnio-nio.exists"
file="${lib.xnio-nio.local}"/>
+ <target name="lib.xnio-nio" depends="jboss.repository">
+ <mvn:dependencies pathId="lib.xnio-nio.classpath">
+ <remoteRepository refid="jboss.repository"/>
+ <dependency groupId="org.jboss.xnio"
artifactId="xnio-nio" version="1.2.0.CR1"/>
+ </mvn:dependencies>
+ <property name="lib.xnio-nio.local"
refid="lib.xnio-nio.classpath"/>
</target>
- <target name="lib.xnio-nio" depends="lib.xnio-nio-check"
unless="lib.xnio-nio.exists">
- <mkdir dir="${local.repository}/${lib.xnio-nio.dir}"/>
- <get src="${lib.xnio-nio.remote}"
dest="${lib.xnio-nio.local}" usetimestamp="true"
ignoreerrors="false"/>
- <get src="${remote.license.dir}/${lib.xnio-nio.license}.txt"
dest="${lib.xnio-nio.local}.license.txt" usetimestamp="true"
ignoreerrors="false"/>
- </target>
-
<!-- ============================================== -->
<!-- MODULES - Keep in alpha order by target name -->
<!-- ============================================== -->
@@ -250,8 +142,8 @@
debug="true">
<compilerarg value="-Xlint:unchecked"/>
<classpath>
- <pathelement location="${lib.marshalling-api.local}"/>
- <pathelement location="${lib.xnio-api.local}"/>
+ <path refid="lib.marshalling-api.classpath"/>
+ <path refid="lib.xnio-api.classpath"/>
</classpath>
</javac>
<touch file="api/target/main/.lastcompile"
verbose="false"/>
@@ -280,7 +172,7 @@
<classpath>
<path refid="api.classpath"/>
<path refid="testing-support.classpath"/>
- <pathelement location="${lib.junit.local}"/>
+ <path refid="lib.junit.classpath"/>
</classpath>
</javac>
<touch file="api/target/test/.lastcompile"
verbose="false"/>
@@ -303,7 +195,7 @@
<path refid="api.classpath"/>
<path refid="testing-support.classpath"/>
<pathelement location="api/target/test/classes"/>
- <pathelement location="${lib.junit.local}"/>
+ <path refid="lib.junit.classpath"/>
</classpath>
<batchtest fork="yes" todir="api/target/test-results"
haltonfailure="no">
@@ -334,8 +226,8 @@
<target name="api" description="Build the API module"
depends="lib.marshalling-api,lib.xnio-api,api.compile">
<path id="api.classpath">
<pathelement location="api/target/main/classes"/>
- <pathelement location="${lib.xnio-api.local}"/>
- <pathelement location="${lib.marshalling-api.local}"/>
+ <path refid="lib.xnio-api.classpath"/>
+ <path refid="lib.marshalling-api.classpath"/>
</path>
</target>
@@ -455,7 +347,7 @@
<path refid="core.classpath"/>
<path refid="testing-support.classpath"/>
<pathelement location="core/target/test/classes"/>
- <pathelement location="${lib.junit.local}"/>
+ <path refid="lib.junit.classpath"/>
</classpath>
<batchtest fork="yes"
todir="core/target/test-results"
haltonfailure="no">
@@ -514,16 +406,9 @@
<classpath>
<path refid="api.classpath"/>
<path refid="core.classpath"/>
- <pathelement location="${lib.jaxb-api.local}"/>
- <pathelement
location="${lib.jboss-common-logging-spi.local}"/>
- <pathelement location="${lib.jboss-common-core.local}"/>
- <pathelement
location="${lib.jboss-deployers-core-spi.local}"/>
- <pathelement
location="${lib.jboss-deployers-spi.local}"/>
- <pathelement
location="${lib.jboss-deployers-structure-spi.local}"/>
- <pathelement location="${lib.jbossmc-kernel.local}"/>
- <pathelement
location="${lib.jbossmc-dependency.local}"/>
- <pathelement location="${lib.jboss-managed.local}"/>
- <pathelement location="${lib.jbossxb.local}"/>
+ <path refid="lib.jaxb-api.classpath"/>
+ <path refid="lib.jbossmc-kernel.classpath"/>
+ <path refid="lib.jbossxb.classpath"/>
</classpath>
</javac>
<touch file="mc-deployers/target/main/.lastcompile"
verbose="false"/>
@@ -533,7 +418,7 @@
<delete dir="mc-deployers/target"/>
</target>
- <target name="mc-deployers" description="Build the mc-deployers
module"
depends="lib.jaxb-api,lib.jboss-common-core,lib.jboss-common-logging-spi,lib.jboss-deployers-core-spi,lib.jboss-deployers-spi,lib.jboss-deployers-structure-spi,lib.jbossmc-kernel,lib.jbossmc-dependency,lib.jboss-managed,lib.jbossxb,api,core,mc-deployers.compile">
+ <target name="mc-deployers" description="Build the mc-deployers
module"
depends="lib.jaxb-api,lib.jbossmc-kernel,lib.jbossxb,api,core,mc-deployers.compile">
<path id="mc-deployers.classpath">
<pathelement location="mc-deployers/target/main/classes"/>
</path>
@@ -594,9 +479,9 @@
<path refid="core.classpath"/>
<path refid="protocol.multiplex.classpath"/>
<path refid="testing-support.classpath"/>
- <pathelement location="${lib.junit.local}"/>
- <pathelement location="${lib.river.local}"/>
- <pathelement location="${lib.xnio-nio.local}"/>
+ <path refid="lib.junit.classpath"/>
+ <path refid="lib.river.classpath"/>
+ <path refid="lib.xnio-nio.classpath"/>
</classpath>
</javac>
<touch file="protocol/multiplex/target/test/.lastcompile"
verbose="false"/>
@@ -623,9 +508,9 @@
<path refid="protocol.multiplex.classpath"/>
<path refid="testing-support.classpath"/>
<pathelement
location="protocol/multiplex/target/test/classes"/>
- <pathelement location="${lib.junit.local}"/>
- <pathelement location="${lib.river.local}"/>
- <pathelement location="${lib.xnio-nio.local}"/>
+ <path refid="lib.junit.classpath"/>
+ <path refid="lib.river.classpath"/>
+ <path refid="lib.xnio-nio.classpath"/>
</classpath>
<batchtest fork="yes"
todir="protocol/multiplex/target/test-results"
haltonfailure="no">
@@ -715,9 +600,9 @@
<path refid="protocol.basic.classpath"/>
<path refid="standalone.classpath"/>
<path refid="testing-support.classpath"/>
- <pathelement location="${lib.junit.local}"/>
- <pathelement location="${lib.river.local}"/>
- <pathelement location="${lib.xnio-nio.local}"/>
+ <path refid="lib.junit.classpath"/>
+ <path refid="lib.river.classpath"/>
+ <path refid="lib.xnio-nio.classpath"/>
</classpath>
</javac>
<touch file="protocol/basic/target/test/.lastcompile"
verbose="false"/>
@@ -745,9 +630,9 @@
<path refid="standalone.classpath"/>
<path refid="testing-support.classpath"/>
<pathelement
location="protocol/basic/target/test/classes"/>
- <pathelement location="${lib.junit.local}"/>
- <pathelement location="${lib.river.local}"/>
- <pathelement location="${lib.xnio-nio.local}"/>
+ <path refid="lib.junit.classpath"/>
+ <path refid="lib.river.classpath"/>
+ <path refid="lib.xnio-nio.classpath"/>
</classpath>
<batchtest fork="yes"
todir="protocol/basic/target/test-results"
haltonfailure="no">
@@ -804,11 +689,10 @@
debug="true">
<compilerarg value="-Xlint:unchecked"/>
<classpath>
- <pathelement location="${lib.marshalling-api.local}"/>
- <pathelement location="${lib.river.local}"/>
<path refid="api.classpath"/>
<path refid="protocol.multiplex.classpath"/>
<path refid="standalone.classpath"/>
+ <path refid="lib.river.classpath"/>
</classpath>
</javac>
<touch file="samples/target/main/.lastcompile"
verbose="false"/>
@@ -887,8 +771,8 @@
debug="true">
<compilerarg value="-Xlint:unchecked"/>
<classpath>
- <pathelement location="${lib.junit.local}"/>
- <pathelement location="${lib.xnio-api.local}"/>
+ <path refid="lib.junit.classpath"/>
+ <path refid="lib.xnio-api.classpath"/>
</classpath>
</javac>
<touch file="testing-support/target/main/.lastcompile"
verbose="false"/>
@@ -1149,7 +1033,7 @@
<delete dir="api/target/main/docs"/>
<mkdir dir="api/target/main/docs"/>
<javadoc destdir="api/target/main/docs" author="false"
version="false" use="false" windowtitle="JBoss Remoting
API">
- <doclet name="${lib.apiviz.doclet}"
path="${lib.apiviz.local}"/>
+ <doclet name="${lib.apiviz.doclet}"
pathref="lib.apiviz.classpath"/>
<packageset dir="api/src/main/java"/>
<packageset dir="standalone/src/main/java"/>
<packageset dir="transporter/src/main/java"/>
@@ -1158,8 +1042,8 @@
<footer><![CDATA[JBoss Remoting ${version}]]></footer>
<bottom><![CDATA[<i>Copyright © 2008 JBoss, a
division of Red Hat, Inc.</i>]]></bottom>
<link
href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- <link
href="http://docs.jboss.org/xnio/${lib.xnio.version-javadoc}/api/&qu...
- <link
href="http://docs.jboss.org/river/${lib.marshalling-api.version}/api...
+ <link
href="http://docs.jboss.org/xnio/1.2.0.CR1/api/"/>
+ <link
href="http://docs.jboss.org/river/1.0.0.GA/api/"/>
<classpath>
<path refid="core.classpath"/>
<path refid="api.classpath"/>
@@ -1216,7 +1100,7 @@
<!-- fetch: These should be the second-to-last targets in the file -->
- <target name="all-fetch" description="Pre-fetch all external
libraries"
depends="lib.jboss-common-core,lib.jboss-common-logging-spi,lib.jboss-deployers-core-spi,lib.jboss-deployers-spi,lib.jboss-deployers-structure-spi,lib.jbossmc-kernel,lib.jboss-managed,lib.jbossxb,lib.marshalling-api,lib.servlet"/>
+ <!--<target name="all-fetch" description="Pre-fetch all external
libraries"
depends="lib.jboss-common-core,lib.jboss-common-logging-spi,lib.jboss-deployers-core-spi,lib.jboss-deployers-spi,lib.jboss-deployers-structure-spi,lib.jbossmc-kernel,lib.jboss-managed,lib.jbossxb,lib.marshalling-api,lib.servlet"/>-->
<!-- all: These should be the last targets in the file -->
Modified: remoting3/trunk/testing-support/src/main/resources/testing.policy
===================================================================
--- remoting3/trunk/testing-support/src/main/resources/testing.policy 2008-12-17 00:09:33
UTC (rev 4759)
+++ remoting3/trunk/testing-support/src/main/resources/testing.policy 2008-12-18 16:49:46
UTC (rev 4760)
@@ -9,6 +9,7 @@
grant codeBase "file:${build.home}/core/target/test/classes/-"
{
permission java.lang.RuntimePermission "modifyThread"; // for executor
control
+ permission org.jboss.remoting.EndpointPermission "createEndpoint";
permission org.jboss.remoting.EndpointPermission "createRequestHandler";
permission org.jboss.remoting.EndpointPermission "createClient";
};
@@ -16,6 +17,7 @@
grant codeBase "file:${build.home}/protocol/basic/target/test/classes/-"
{
permission java.lang.RuntimePermission "modifyThread"; // for executor
control
+ permission org.jboss.remoting.EndpointPermission "createEndpoint";
permission org.jboss.remoting.EndpointPermission "createRequestHandler";
permission org.jboss.remoting.EndpointPermission "createClient";
};
@@ -23,6 +25,7 @@
grant codeBase "file:${build.home}/protocol/multiplex/target/test/classes/-"
{
permission java.lang.RuntimePermission "modifyThread"; // for executor
control
+ permission org.jboss.remoting.EndpointPermission "createEndpoint";
permission org.jboss.remoting.EndpointPermission "createRequestHandler";
permission org.jboss.remoting.EndpointPermission "createClient";
permission org.jboss.remoting.EndpointPermission "createClientSource";
@@ -47,6 +50,10 @@
permission java.util.PropertyPermission "jboss.remoting.*",
"read";
};
+grant codeBase "file:${build.home}/standalone/target/main/classes/-"
+{
+ permission org.jboss.remoting.EndpointPermission "createEndpoint";
+};
// Support classes