[jboss-cvs] JBossAS SVN: r79316 - in projects/aop/trunk: aop and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 9 18:39:58 EDT 2008
Author: pgier
Date: 2008-10-09 18:39:56 -0400 (Thu, 09 Oct 2008)
New Revision: 79316
Added:
projects/aop/trunk/asintegration-mc/src/resources/tests/log4j.xml
projects/aop/trunk/build/pom.xml
projects/aop/trunk/tools/etc/ant/
projects/aop/trunk/tools/etc/ant/common-tasks.xml
projects/aop/trunk/tools/etc/ant/task.properties
Removed:
projects/aop/trunk/tools/lib/jbossbuild.jar
Modified:
projects/aop/trunk/
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration-mc/build-test.xml
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/aspects/build-test50.xml
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/build/
projects/aop/trunk/build/build.xml
projects/aop/trunk/pom.xml
Log:
[JBBUILD-495] Remove references to buildmagic and libraries.ent from builds.
Property changes on: projects/aop/trunk
___________________________________________________________________
Name: svn:ignore
- .metadata
.mylar
release.properties
+ .metadata
.mylar
release.properties
target
.settings
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
-]>
<!-- ====================================================================== -->
<!-- -->
@@ -21,16 +18,13 @@
<!-- ================================================================== -->
<!--
- | Include the common Buildmagic elements.
- |
- | This defines several different targets, properties and paths.
- | It also sets up the basic extention tasks amoung other things.
+ | Include some common ant tasks and macro definitions.
-->
- &buildmagic;
+ <import file="../tools/etc/ant/common-tasks.xml"/>
+
+ <import file="base-tests.xml"/>
- <import file="base-tests.xml"/>
-
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
@@ -40,203 +34,184 @@
| Other targets should depend on 'init' or things will mysteriously fail.
-->
- <target name="init" unless="init.disable" depends=" _buildmagic:init">
- <!-- Note: tasks in this target will not run because _buildmagic:init
- - sets "init.disable" to true" -->
- </target>
+ <target name="init" depends="init-maven-environment">
-
- <target name="maven-ant-tasks" unless="maven.tasks.complete" xmlns:maven="urn:maven-artifact-ant">
-
- <!-- Maven Ant Tasks Setup -->
- <!-- ================================================================== -->
+ <!-- Defines repository.home -->
+ <property file="local.properties"/>
- <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
- classpathref="maven-ant-tasks.classpath" />
- <maven:pom id="maven.project" file="pom.xml" />
- <maven:remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
- <maven:remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
-
- <!-- Maven dependencies -->
- <maven:dependencies pathId="maven.dependencies.compileClasspath" useScope="compile">
- <pom refid="maven.project"/>
- </maven:dependencies>
- <maven:dependencies pathId="maven.dependencies.testClasspath" useScope="test">
- <pom refid="maven.project"/>
- </maven:dependencies>
- <maven:dependencies pathId="jboss.test.classpath">
- <dependency groupId="jboss" artifactId="jboss-test" version="1.0.3.GA"/>
- </maven:dependencies>
- <maven:dependencies pathId="junit.junit.classpath">
- <dependency groupId="junit" artifactId="junit" version="3.8.1"/>
- </maven:dependencies>
-
- <property name="build.directory" value="${maven.project.build.directory}"/>
- <property name="build.artifact.name" value="${maven.project.build.finalName}.jar"/>
- <property name="build.artifact" value="${build.directory}/${build.artifact.name}"/>
- <path id="jboss.aop.classpath">
- <pathelement location="${build.artifact}"/>
- </path>
-
- <property name="maven.tasks.complete" value="true"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
+ <!-- Bits for building source archives -->
+ <patternset id="source.ignore">
+ <exclude name="**/output/**"/>
+ <exclude name="**/target/**"/>
+ <exclude name="**/.svn/**" />
+ </patternset>
+
+ <!-- Set the version of the release here -->
+ <property name="project.name" value="${maven.project.artifactId}"/>
+ <property name="project.version" value="${maven.project.version}"/>
+ <property name="project.build.name" value="${project.name}-${project.version}"/>
+ <property name="project.title" value="${maven.project.name}"/>
+ <echo message="Project: ${project.build.name}"/>
+ <echo message="Title: ${project.title}"/>
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
+ <!-- Setup the project environment. -->
+ <dirname property="project.root" file="${basedir}"/>
+ <property name="project.build" value="${project.root}/build"/>
+ <property name="project.tools" value="${project.root}/tools"/>
+ <property name="project.output" value="${project.build}/output"/>
+ <property name="project.release" value="${project.output}/${project.build.name}"/>
- <target name="configure" unless="configure.disable" depends="maven-ant-tasks">
- <property name="aop.version" value="jboss-aop-1.5.0.GA"/>
- <property name="aop.title" value="JBoss AOP Framework"/>
+ <!-- Setup the module environment. -->
+ <property name="module.root" value="${basedir}"/>
+ <property file="${module.root}/local.properties"/>
+ <property name="module.source" value="${module.root}/src"/>
+ <property name="module.output" value="${module.root}/output"/>
+ <property name="module.tools" value="${module.root}/tools"/>
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
+ <!-- Include user and project property overrides. -->
+ <property file="${project.build}/local.properties"/>
+ <property file="${user.home}/.buildmagic.properties"/>
+ <property file="${user.home}/.ant.properties"/>
- <!-- Module name(s) & version -->
- <property name="module.name" value="aop"/>
- <property name="module.Name" value="JBoss AOP"/>
- <property name="module.version" value="1.5.0.GA"/>
+ <!-- Setup the build.log -->
+ <property name="buildlog.level" value="info"/>
+ <record name="${basedir}/build.log" append="no" loglevel="${buildlog.level}"/>
+ <property name="init-buildlog.disable" value="true"/>
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
+ <!-- Setup the build timestamp & build identifer properties -->
+ <tstamp>
+ <format property="build.number" pattern="yyyyMMddHHmm"/>
+ <format property="YEAR" pattern="yyyy"/>
+ </tstamp>
+ <property name="build.id" value="${build.number}"/>
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="maven.dependencies.testClasspath"/>
- </path>
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="maven.dependencies.test.classpath"/>
+ </path>
- <!--
- Settable in local.properties:
- -jrockit.home: location of JRockit JVM
- -jdk14.executable: Full path to a JDK 1.4 java.exe (Needed for the JDK 1.4 tests)
- -repository.home: Location of local copy of repository (for the "update-repository" target
- -debug: if set, -Djboss.aop.debug.classes=true for the tests; otherwise it is false
- -->
- <property file="local.properties"/>
+ <path id="jboss.test.classpath">
+ <pathelement location="${jboss:jboss-test:jar}"/>
+ </path>
+ <path id="junit.junit.classpath">
+ <pathelement location="${junit:junit:jar}"/>
+ </path>
+ <property name="build.directory" value="${maven.project.build.directory}"/>
+ <property name="build.artifact.name" value="${maven.project.build.finalName}.jar"/>
+ <property name="build.artifact" value="${build.directory}/${build.artifact.name}"/>
+ <path id="jboss.aop.classpath">
+ <pathelement location="${build.artifact}"/>
+ </path>
+
- <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_API_AVAILABLE" value="managementapi.jar"/>
- <available file="${jrockit.home}/jre/lib/management-agent.jar" property="JROCKIT_API_AVAILABLE" value="rt.jar"/>
- <condition property="jboss.aop.debug.classes" value="true">
- <isset property="debug"/>
- </condition>
- <condition property="jboss.aop.debug.classes" value="false">
- <not>
- <isset property="debug"/>
- </not>
- </condition>
+ <!--
+ Settable in local.properties:
+ -jrockit.home: location of JRockit JVM
+ -jdk14.executable: Full path to a JDK 1.4 java.exe (Needed for the JDK 1.4 tests)
+ -repository.home: Location of local copy of repository (for the "update-repository" target
+ -debug: if set, -Djboss.aop.debug.classes=true for the tests; otherwise it is false
+ -->
+ <property file="local.properties"/>
- <echo>Debug: ${debug}</echo>
+ <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_API_AVAILABLE" value="managementapi.jar"/>
+ <available file="${jrockit.home}/jre/lib/management-agent.jar" property="JROCKIT_API_AVAILABLE" value="rt.jar"/>
+ <condition property="jboss.aop.debug.classes" value="true">
+ <isset property="debug"/>
+ </condition>
+ <condition property="jboss.aop.debug.classes" value="false">
+ <not>
+ <isset property="debug"/>
+ </not>
+ </condition>
- <!-- ======= -->
- <!-- Modules -->
- <!-- ======= -->
+ <!-- Where source files live -->
+ <property name="source.tests.java" value="${module.source}/test"/>
+ <property name="source.etc" value="${module.source}/etc"/>
+ <property name="source.res" value="${module.source}/resources"/>
+ <property name="source.stylesheets" value="src/stylesheets"/>
+ <echo message="${source.tests.java}"/>
+
+ <!-- Where build generated files will go -->
+ <property name="build.reports" value="output/reports"/>
+ <property name="build.stylesheets" value="${module.output}/stylesheets"/>
+ <property name="build.tests.classes" value="${module.output}/tests.classes"/>
+ <property name="build.lib" value="${module.output}/lib"/>
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.classpath">
- </path>
+ <!-- Install/Release structure -->
+ <property name="install.id" value="${module.name}-${module.version}"/>
+ <property name="release.id" value="${install.id}"/>
+ <property name="install.root" value="${module.output}/${install.id}"/>
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
+ <!-- classpath and local.classpath must have a value using with a path -->
+ <property name="classpath" value=""/>
+ <property name="local.classpath" value=""/>
- <!-- Where source files live -->
- <property name="source.tests.java" value="${module.source}/test"/>
- <property name="source.etc" value="${module.source}/etc"/>
- <property name="source.res" value="${module.source}/resources"/>
- <property name="source.stylesheets" value="src/stylesheets"/>
+ <!-- The classpath required to build classes. -->
+ <path id="javac.classpath">
+ <pathelement path="${classpath}"/>
+ <pathelement path="${local.classpath}"/>
+ <path refid="library.classpath"/>
+ <pathelement path="${build.artifact}"/>
+ </path>
- <!-- Where build generated files will go -->
- <property name="build.reports" value="output/reports"/>
- <property name="build.stylesheets" value="${module.output}/stylesheets"/>
- <property name="build.tests.classes" value="${module.output}/tests.classes"/>
- <property name="build.lib" value="${module.output}/lib"/>
+ <path id="javac.jrockit.classpath">
+ <path refid="javac.classpath"/>
+ <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
+ </path>
- <!-- Install/Release structure -->
- <property name="install.id" value="${module.name}-${module.version}"/>
- <property name="release.id" value="${install.id}"/>
- <property name="install.root" value="${module.output}/${install.id}"/>
+ <path id="test.classpath">
+ <path refid="library.classpath"/>
+ <pathelement path="${build.artifact}"/>
+ </path>
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
+ <path id="compatibility15.test.classpath">
+ <pathelement path="1.5.x.lib/concurrent.jar"/>
+ <pathelement path="1.5.x.lib/javassist.jar"/>
+ <pathelement path="1.5.x.lib/jboss-aop-jdk50.jar"/>
+ <pathelement path="1.5.x.lib/jboss-common.jar"/>
+ <pathelement path="1.5.x.lib/qdox.jar"/>
+ <pathelement path="1.5.x.lib/trove.jar"/>
- <!-- classpath and local.classpath must have a value using with a path -->
- <property name="classpath" value=""/>
- <property name="local.classpath" value=""/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ </path>
- <!-- The classpath required to build classes. -->
- <path id="javac.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <path refid="thirdparty.classpath"/>
- <pathelement path="${build.artifact}"/>
- </path>
+ <path id="aopc.task.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ </path>
- <path id="javac.jrockit.classpath">
- <path refid="javac.classpath"/>
- <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
- </path>
+ <path id="test.jrockit.classpath">
+ <path refid="test.classpath"/>
+ <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
+ </path>
- <path id="test.classpath">
- <path refid="thirdparty.classpath"/>
- <pathelement path="${build.artifact}"/>
- </path>
+ <!-- The classpath required to build javadocs. -->
+ <path id="javadoc.classpath">
+ <path refid="javac.classpath"/>
+ </path>
- <path id="compatibility15.test.classpath">
- <pathelement path="1.5.x.lib/concurrent.jar"/>
- <pathelement path="1.5.x.lib/javassist.jar"/>
- <pathelement path="1.5.x.lib/jboss-aop-jdk50.jar"/>
- <pathelement path="1.5.x.lib/jboss-common.jar"/>
- <pathelement path="1.5.x.lib/qdox.jar"/>
- <pathelement path="1.5.x.lib/trove.jar"/>
+ <!-- The temp folder for aopc -->
+ <property name="aopc.tmpdir" value="output/aopctmp"/>
+ <delete dir="${aopc.tmpdir}" failonerror="true" deleteonexit="true"/>
+ <mkdir dir="${aopc.tmpdir}"/>
- <path refid="jboss.test.classpath"/>
- <path refid="junit.junit.classpath"/>
- </path>
+ <!-- Packages to include when generating api documentation -->
+ <property name="javadoc.packages" value="org.jbos.aop.*"/>
- <path id="aopc.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
+ <!-- Override JUnit defaults -->
+ <property name="junit.timeout" value="240000"/> <!-- 4 minutes -->
+ <property name="junit.batchtest.todir" value="${build.reports}"/>
+ <property name="junit.jvm.options" value="-Ddummy"/>
- <path id="test.jrockit.classpath">
- <path refid="test.classpath"/>
- <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
- </path>
+ <!-- Load common task properties -->
+ <property file="${project.tools}/etc/ant/task.properties"/>
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <path refid="javac.classpath"/>
- </path>
+ <!-- Set the default maven.home directory -->
+ <property name="maven.home" value="${basedir}/../tools/maven"/>
+ </target>
- <!-- The temp folder for aopc -->
- <property name="aopc.tmpdir" value="output/aopctmp"/>
- <delete dir="${aopc.tmpdir}" failonerror="true" deleteonexit="true"/>
- <mkdir dir="${aopc.tmpdir}"/>
-
- <!-- Packages to include when generating api documentation -->
- <property name="javadoc.packages" value="org.jbos.aop.*"/>
-
- <!-- Override JUnit defaults -->
- <property name="junit.timeout" value="240000"/> <!-- 4 minutes -->
- <property name="junit.batchtest.todir" value="${build.reports}"/>
- <property name="junit.jvm.options" value="-Ddummy"/>
- </target>
-
-
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
@@ -291,13 +266,6 @@
<delete dir="${build.tests.classes}"/>
</target>
- <!-- Clean up all generated files -->
- <target name="clobber"
- description="Cleans up all generated files."
- depends="_buildmagic:clobber, clean">
- </target>
-
-
<!-- ===============================================================p=== -->
<!-- Misc. -->
<!-- ================================================================== -->
@@ -311,10 +279,6 @@
<target name="most" depends="compile"
description="Builds almost everything."/>
- <target name="help"
- description="Show this help message."
- depends="_buildmagic:help:standard"/>
-
<!-- ==================================================================================== -->
<!-- JDK 5.0 TESTS -->
<!-- ==================================================================================== -->
@@ -1758,7 +1722,7 @@
</junit>
</target>
- <target name="compile-stylesheets" depends="configure">
+ <target name="compile-stylesheets" depends="init">
<mkdir dir="${build.stylesheets}"/>
<copy todir="${build.stylesheets}" filtering="yes">
<fileset dir="${source.stylesheets}">
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/aop/pom.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -17,7 +17,7 @@
<build>
<finalName>${artifactId}</finalName>
<sourceDirectory>src/main/</sourceDirectory>
- <!--<testSourceDirectory>src/test/</testSourceDirectory>-->
+ <testSourceDirectory>src/test/</testSourceDirectory>
<resources>
<resource>
<directory>docs</directory>
@@ -65,6 +65,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
+ <executions>
+ <execution>
+ <id>create-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<archive>
<manifestEntries>
Modified: projects/aop/trunk/asintegration-mc/build-test.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/build-test.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/asintegration-mc/build-test.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -1,10 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
-]>
<!-- ====================================================================== -->
<!-- -->
@@ -23,31 +17,20 @@
<!-- Setup -->
<!-- ================================================================== -->
- <!--
- | Include the common Buildmagic elements.
- |
- | This defines several different targets, properties and paths.
- | It also sets up the basic extention tasks amoung other things.
- -->
+ <import file="../tools/etc/ant/common-tasks.xml" />
- &buildmagic;
-
- <!--
- | Include the normal targets.
- -->
- &targets;
-
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
- <property name="source.java" value="src/tests"/>
- <property name="source.resources" value="src/resources/tests"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
- <property name="build.classes" value="output/classes-tests"/>
- <property name="build.testlog" value="output/log"/>
- <property name="build-bypass.disabled" value="true"/>
+ <property name="source.java" value="src/tests" />
+ <property name="source.resources" value="src/resources/tests" />
+ <property name="javac.target" value="1.5" />
+ <property name="javac.source" value="1.5" />
+ <property name="build.classes" value="target/classes" />
+ <property name="build.test.classes" value="target/test-classes" />
+ <property name="build.testlog" value="output/log" />
+ <property name="build-bypass.disabled" value="true" />
<!--
| Configure the build system.
@@ -56,69 +39,35 @@
| should contain module specific configuration elements.
-->
- <target name="configure" unless="configure.disable">
+ <target name="init" depends="init-maven-environment">
<!-- =================== -->
<!-- Basic Configuration -->
<!-- =================== -->
- <!-- Module name(s) & version -->
- <property name="module.name" value="asintegration tests"/>
- <property name="module.Name" value="JBossAS Integration tests"/>
- <property name="module.version" value="M1"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- &libraries;
-
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="apache.ant.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jbossas.core.libs.classpath"/>
- <path refid="jboss.jboss.vfs.classpath"/>
- <path refid="org.jboss.microcontainer.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="qdox.classpath"/>
- <path refid="trove.classpath"/>
- <path refid="jboss.integration.classpath"/>
+ <!-- this -->
+ <property name="jboss.this.root" value="${module.root}/output" />
+ <property name="jboss.this.lib" value="${jboss.this.root}/lib" />
+ <property name="project.output" value="${maven.project.build.directory}"/>
+ <property name="build.reports" value="${project.output}/reports"/>
+ <property name="build.testlog" value="${build.reports}/tests.log"/>
+ <property name="resources" value="${basedir}/src/resources"/>
+
+ <path id="jboss.this.classpath">
+ <fileset dir="${jboss.this.lib}">
+ <include name="*.jar" />
+ <exclude name="${jar.prefix}.jar" />
+ </fileset>
</path>
-<!-- this -->
-<property name="jboss.this.root" value="${module.root}/output"/>
-<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
-<path id="jboss.this.classpath">
- <fileset dir="${jboss.this.lib}">
- <include name="*.jar"/>
- <exclude name="${jar.prefix}.jar"/>
- </fileset>
-</path>
-
- &modules;
-
- <!-- The combined dependant module classpath -->
- <path id="dependentmodule.classpath">
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.this.classpath"/>
+ <path id="test.classpath">
+ <pathelement location="${maven.project.build.outputDirectory}"/>
+ <pathelement location="${maven.project.build.testOutputDirectory}"/>
+ <path refid="maven.dependencies.test.classpath" />
</path>
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <call target="_default:task-init"/>
-
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
-
+ <!--<pathconvert property="test.classpath.stuff" refid="test.classpath"/>
+ <echo message="${test.classpath.stuff}"/>-->
</target>
<!-- ================================================================== -->
@@ -133,116 +82,92 @@
| documentation compiles.
-->
- <target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes"
- />
+ <target name="compile" description="Compile all source files." />
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
- <!--
- | Build all jar files.
- -->
- <target name="module-jars" depends="init">
-
+ <!-- >
+
<jar destfile="${build.lib}/jbossas-integration-test.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}"/>
+ <fileset dir="${build.classes}" />
<fileset dir="${build.resources}">
- <include name="org/**"/>
+ <include name="org/**" />
</fileset>
</jar>
- </target>
+ </target>-->
<!-- ================================================================== -->
<!-- Tests -->
<!-- ================================================================== -->
- <target name="tests" depends="most"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <target name="tests" depends="init" description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}" />
+ <junit dir="${project.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
- <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="log4j.configuration" value="file:${resources}/tests/log4j.xml" />
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}/tests"/>
- <path refid="javac.classpath"/>
- </classpath>
+ <classpath>
+ <path refid="test.classpath" />
+ </classpath>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
+ <formatter type="plain" usefile="true" />
+ <formatter type="xml" usefile="true" />
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
+ <fileset dir="${build.test.classes}">
+ <include name="org/jboss/test/**/*UnitTestCase.class" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/**/*UnitTestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
+ <target name="one-test" depends="init" description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}" />
- <target name="one-test" depends="init"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}" />
+ <junit dir="${project.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
- <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="log4j.configuration" value="file:${resources}/tests/log4j.xml" />
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}/tests"/>
- <path refid="javac.classpath"/>
- </classpath>
+ <classpath>
+ <pathelement path="${test.classpath}" />
+ </classpath>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
+ <formatter type="plain" usefile="true" />
+ <formatter type="xml" usefile="true" />
- <test todir="${build.reports}" name="${test}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}"/>
- </junit>
- </target>
-
- <target name="memory-test" depends="most" description="Execute MemoryLeakTestCase">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}/tests"/>
- <path refid="thirdparty.classpath"/>
- <path refid="javac.classpath"/>
- <path refid="apache.xerces.classpath"/>
- </classpath>
- <jvmarg value="-agentlib:jbossAgent"/>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
- <test fork="yes" todir="${build.reports}" name="org.jboss.test.memorytests.ClassInfoMemoryTestCase"/>
- </junit>
+ <test todir="${build.reports}" name="${test}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}" />
+ </junit>
+ </target>
- </target>
+ <target name="memory-test" depends="init" description="Execute MemoryLeakTestCase">
+ <mkdir dir="${build.reports}" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="log4j.configuration" value="file:${resources}/tests/log4j.xml" />
+
+ <junit printsummary="yes" fork="yes" haltonfailure="no">
+ <classpath>
+ <pathelement path="${test.classpath}" />
+ </classpath>
+ <jvmarg value="-agentlib:jbossAgent" />
+ <formatter type="plain" usefile="true" />
+ <formatter type="xml" usefile="true" />
+ <test fork="yes" todir="${build.reports}" name="org.jboss.test.memorytests.ClassInfoMemoryTestCase" />
+ </junit>
+
+ </target>
+
+ <target name="main">
+ </target>
+
+
</project>
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -24,7 +24,12 @@
<include>jbossorg-eula.txt</include>
</includes>
</resource>
- </resources>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources/tests</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -59,7 +64,16 @@
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
- <skip>true</skip>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>org/jboss/test/**/*UnitTestCase.class</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>build.testlog</name>
+ <value>target/surefire-reports/tests.log</value>
+ </property>
+ </systemProperties>
</configuration>
</plugin>
</plugins>
Added: projects/aop/trunk/asintegration-mc/src/resources/tests/log4j.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/src/resources/tests/log4j.xml (rev 0)
+++ projects/aop/trunk/asintegration-mc/src/resources/tests/log4j.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${build.testlog}"/>
+ <param name="Append" value="true"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="FATAL"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ====================== -->
+ <!-- More Appender examples -->
+ <!-- ====================== -->
+
+ <!-- Buffer events and log them asynchronously
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ </appender>
+ -->
+
+ <!-- EMail events to an administrator
+ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+ <param name="Threshold" value="ERROR"/>
+ <param name="To" value="admin at myhost.domain.com"/>
+ <param name="From" value="nobody at myhost.domain.com"/>
+ <param name="Subject" value="JBoss Sever Errors"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="BufferSize" value="10"/>
+ </appender>
+ -->
+
+ <!-- Syslog events
+ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+ <param name="Facility" value="LOCAL7"/>
+ <param name="FacilityPrinting" value="true"/>
+ <param name="SyslogHost" value="localhost"/>
+ </appender>
+ -->
+
+ <!-- Log events to JMS (requires a topic to be created)
+ <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+ <param name="Threshold" value="ERROR"/>
+ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+ <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+ </appender>
+ -->
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit JBoss categories to INFO
+ <category name="org.jboss">
+ <priority value="INFO" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- Increase the priority threshold for the DefaultDS category
+ <category name="DefaultDS">
+ <priority value="FATAL"/>
+ </category>
+ -->
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <category name="org.jboss.tm">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: projects/aop/trunk/asintegration-mc/src/resources/tests/log4j.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/aop/trunk/aspects/build-test50.xml
===================================================================
--- projects/aop/trunk/aspects/build-test50.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/aspects/build-test50.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -1,9 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
-]>
<!-- ====================================================================== -->
<!-- -->
@@ -18,175 +13,114 @@
<project default="main" name="JBoss/Aspects Tests">
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
- <!--
- | Include the common Buildmagic elements.
- |
- | This defines several different targets, properties and paths.
- | It also sets up the basic extention tasks amoung other things.
- -->
+ <import file="../tools/etc/ant/common-tasks.xml" />
- &buildmagic;
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <!--
+ <!--
| Initialize the build system. Must depend on '_buildmagic:init'.
| Other targets should depend on 'init' or things will mysteriously fail.
-->
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
+ <target name="init" depends="init-maven-environment">
- <target name="most"/>
+ <!-- Include user and project property overrides. -->
+ <property file="local.properties" />
+ <property file="${user.home}/.buildmagic.properties" />
+ <property file="${user.home}/.ant.properties" />
+ <!-- Setup the project environment. -->
+ <property name="project.root" value="${basedir}"/>
+ <property name="project.tools" value="${project.root}/../tools" />
+ <property name="project.output" value="${project.root}/target" />
+
+ <!-- Setup the build.log -->
+ <property name="buildlog.level" value="info" />
+ <record name="${basedir}/build.log" append="no" loglevel="${buildlog.level}" />
+ <property name="init-buildlog.disable" value="true" />
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
+ <!-- Setup the build timestamp & build identifer properties -->
+ <tstamp>
+ <format property="build.number" pattern="yyyyMMddHHmm" />
+ <format property="YEAR" pattern="yyyy" />
+ </tstamp>
+ <property name="build.id" value="${build.number}" />
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
+ <!-- Load common task properties -->
+ <property file="${project.tools}/etc/ant/task.properties" />
- <target name="configure" unless="configure.disable">
+ <path id="jboss.aspects50.classpath">
+ <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar" />
+ </path>
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
- <!-- Module name(s) & version -->
- <property name="module.name" value="aspects"/>
- <property name="module.Name" value="JBoss Aspects"/>
- <property name="module.version" value="DEV"/>
+ <!-- Where source files live -->
+ <property name="project.source" value="${maven.project.build.sourceDirectory}"/>
+ <property name="source.java" value="${basedir}/src/test" />
+ <property name="source.etc" value="${project.source}/etc" />
+ <property name="resources" value="${basedir}/src/resources" />
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
- &libraries;
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.servlet.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="qdox.classpath"/>
- <path refid="hibernate3.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="trove.classpath"/>
- <path refid="cglib.classpath"/>
- <path refid="xdoclet.xdoclet.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="apache.xerces.classpath"/>
- </path>
+ <!-- Where build generated files will go -->
+ <property name="build.reports" value="${project.output}/reports" />
+ <property name="build.testlog" value="${project.output}/log" />
+ <property name="build.classes" value="${project.output}/classes" />
+ <property name="build.test.classes" value="${project.output}/test-classes" />
+ <property name="build.lib" value="${project.output}/lib" />
+ <property name="build.api" value="${project.output}/api" />
+ <property name="build.etc" value="${project.output}/etc" />
- <!-- ======= -->
- <!-- Modules -->
- <!-- ======= -->
+ <!-- Install/Release structure -->
+ <property name="install.id" value="${module.name}-${module.version}" />
+ <property name="release.id" value="${install.id}" />
+ <!--<property name="install.root" value="${project.output}/${install.id}"/>-->
- &modules;
+ <!-- This module is based on Java 1.2 -->
+ <property name="javac.target" value="1.2" />
- <path id="jboss.aspects50.classpath">
- <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
- </path>
+ <!-- classpath and local.classpath must have a value using with a path -->
+ <property name="classpath" value="" />
+ <property name="local.classpath" value="" />
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
- <path refid="jboss.j2se.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.aspects50.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.jmx.classpath"/>
- <path refid="jboss.naming.classpath"/>
- <path refid="jboss.transaction.classpath"/>
- <path refid="jboss.security.classpath"/>
- <!-- this is for the NonSerializableFactory -->
- <path refid="jboss.server.classpath"/>
- <path refid="jboss.mq.classpath"/>
- <path refid="jboss.test.classpath"/>
- </path>
+ <!-- The classpath required to build classes. -->
+ <path id="javac.classpath">
+ <pathelement path="${classpath}" />
+ <pathelement path="${local.classpath}" />
+ <path refid="maven.dependencies.test.classpath" />
+ </path>
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
+ <!-- The classpath required to build javadocs. -->
+ <path id="javadoc.classpath">
+ <path refid="javac.classpath" />
+ </path>
- <!-- Where source files live -->
- <property name="source.java" value="${module.source}/test50"/>
- <property name="source.etc" value="${module.source}/etc"/>
- <property name="resources" value="${module.source}/resources"/>
+ <!-- Packages to include when generating api documentation -->
+ <property name="javadoc.packages" value="javax.*" />
- <!-- Where build generated files will go -->
- <property name="build.reports" value="${module.output}/reports"/>
- <property name="build.testlog" value="${module.output}/log"/>
- <property name="build.classes" value="${module.output}/classes"/>
- <property name="build.lib" value="${module.output}/lib"/>
- <property name="build.api" value="${module.output}/api"/>
- <property name="build.etc" value="${module.output}/etc"/>
+ <!-- Override JUnit defaults -->
+ <property name="jbosstest.iterationcount" value="10" />
+ <property name="jbosstest.threadcount" value="5" />
+ <property name="jbosstest.beancount" value="5" />
+ <property name="jbosstest.nodeploy" value="false" />
- <!-- Install/Release structure -->
- <property name="install.id" value="${module.name}-${module.version}"/>
- <property name="release.id" value="${install.id}"/>
- <property name="install.root" value="${module.output}/${install.id}"/>
+ </target>
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
+ <target name="most" />
- <!-- This module is based on Java 1.2 -->
- <property name="javac.target" value="1.2"/>
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
- <!-- classpath and local.classpath must have a value using with a path -->
- <property name="classpath" value=""/>
- <property name="local.classpath" value=""/>
-
- <!-- The classpath required to build classes. -->
- <path id="javac.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <path refid="javac.classpath"/>
- </path>
-
- <!-- Packages to include when generating api documentation -->
- <property name="javadoc.packages" value="javax.*"/>
-
- <!-- Override JUnit defaults -->
- <property name="jbosstest.iterationcount" value="10"/>
- <property name="jbosstest.threadcount" value="5"/>
- <property name="jbosstest.beancount" value="5"/>
- <property name="jbosstest.nodeploy" value="false"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
+ <!--
| Compile everything.
|
| This target should depend on other compile-* targets for each
@@ -194,114 +128,92 @@
| documentation compiles.
-->
- <!-- Compile all class files -->
- <target name="compile-classes" depends="init">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- source="1.5"
- target="1.5"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
+ <!-- Compile all class files -->
+ <target name="compile-tests" depends="init">
+ <mkdir dir="${build.test.classes}" />
+ <javac destdir="${build.test.classes}" optimize="${javac.optimize}" debug="${javac.debug}" source="1.5" target="1.5" depend="${javac.depend}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}">
+ <src path="${source.java}" />
+ <classpath refid="javac.classpath" />
+ <exclude name="org/jboss/test/asynch/**"/>
+ <exclude name="org/jboss/test/proxyfactory/**"/>
+ </javac>
+ </target>
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
- <target name="asynch"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="asynch" description="Builds all jar files." depends="compile-tests">
- <mkdir dir="${build.lib}"/>
+ <mkdir dir="${build.lib}" />
- <jar jarfile="${build.lib}/asynch-test.sar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/asynch/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/asynch">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/asynch-test.sar">
+ <fileset dir="${build.test.classes}">
+ <include name="org/jboss/test/asynch/*.class" />
+ </fileset>
+ <fileset dir="${resources}/test/asynch">
+ <include name="META-INF/jboss-service.xml" />
+ </fileset>
+ </jar>
- </target>
+ </target>
- <target name="test" depends="init" if="test"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <target name="test" depends="init, compile-tests" if="test" description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}" />
+ <mkdir dir="${build.testlog}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log" />
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
- <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <junit dir="${project.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
+ <sysproperty key="jbosstest.deploy.dir" value="${build.lib}" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml" />
+ <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}" />
+ <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}" />
+ <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}" />
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- <pathelement location="${resources}/test"/>
- <pathelement location="${resources}"/>
- </classpath>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
+ <classpath>
+ <path refid="javac.classpath" />
+ <pathelement location="${build.classes}" />
+ <pathelement location="${build.test.classes}" />
+ <pathelement location="${resources}/test" />
+ <pathelement location="${resources}" />
+ </classpath>
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <formatter type="plain" usefile="true" />
+ <formatter type="xml" usefile="true" />
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/${test}/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
+ <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
- <target name="jars" depends="asynch"/>
+ <fileset dir="${build.test.classes}">
+ <include name="org/jboss/test/${test}/*TestCase.class" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
- <target name="tests" depends="init" description="Execute all tests">
- <antcall target="test" inheritRefs="true">
- <param name="test" value="asynch"/>
- </antcall>
- </target>
+ <target name="jars" depends="asynch" />
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
+ <target name="tests" depends="test" description="Execute all tests">
+ </target>
- <!-- Clean up all build output -->
- <target name="clean"
- description="Cleans up most generated files." depends="init">
- <delete dir="${build.classes}/org/jboss/test"/>
- </target>
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
+ <!-- Clean up all build output -->
+ <target name="clean" description="Cleans up most generated files." depends="init">
+ <delete dir="${build.test.classes}/org/jboss/test" />
+ </target>
- <target name="main"
- description="Executes the default target (most)."
- depends="jars"/>
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
+ <target name="main" description="Executes the default target (most)." depends="jars" />
+
</project>
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/aspects/pom.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -27,6 +27,11 @@
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Property changes on: projects/aop/trunk/build
___________________________________________________________________
Name: svn:ignore
- output
build.log
local.properties
+ output
build.log
local.properties
target
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/build/build.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -12,61 +12,43 @@
<!-- $Id: build.xml 56876 2006-09-15 00:11:10Z scott.stark at jboss.org $ -->
<project default="main" name="JBossAOP/Build">
-
+
+ <import file="../tools/etc/ant/common-tasks.xml"/>
+
<!-- ================================================================== -->
<!-- Initialization -->
- <!-- ================================================================== -->
-
+ <!-- ================================================================== -->
+
<!--
| Initialize the build system.
| .
-->
- <target name="init" unless="init.disable" >
- <!-- Make sure we have the right version of Ant -->
- <property name="buildmagic.ant15.baseversion" value="1.5"/>
- <property name="buildmagic.ant16.baseversion" value="1.6"/>
+ <target name="init" depends="verify-environment, init-maven-environment">
+ <!-- Defines repository.home -->
+ <property file="local.properties"/>
+
+ <!-- Bits for building source archives -->
+ <patternset id="source.ignore">
+ <exclude name="**/output/**"/>
+ <exclude name="**/target/**"/>
+ <exclude name="**/.svn/**" />
+ </patternset>
+
<!-- Set the version of the release here -->
- <property name="aop.version" value="jboss-aop-2.0.0.CR18"/>
- <property name="aop.title" value="JBoss AOP Framework"/>
- <property name="module.version" value="j${aop.version}"/>
+ <property name="project.name" value="jboss-aop"/>
+ <property name="project.version" value="${maven.project.version}"/>
+ <property name="project.build.name" value="${project.name}-${project.version}"/>
+ <property name="project.title" value="JBoss AOP Framework"/>
- <!--
- | Add new conditions for other supported Ant versions when they
- | become avaialble.
- -->
-
- <condition property="buildmagic.ant.compatible">
- <or>
- <contains string="${ant.version}"
- substring="Ant version ${buildmagic.ant15.baseversion}"/>
- <contains string="${ant.version}"
- substring="Ant version ${buildmagic.ant16.baseversion}"/>
- </or>
- </condition>
-
- <fail unless="buildmagic.ant.compatible">
-
- Unsupported Ant version:
-
- ${ant.version}
-
- Please install a version which is compatible with Ant ${buildmagic.ant15.baseversion} or ${buildmagic.ant16.baseversion}.
-
- </fail>
-
- <!-- JDK Detection -->
- <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
-
<!-- Setup the project environment. -->
<dirname property="project.root" file="${basedir}"/>
<property name="project.build" value="${project.root}/build"/>
<property name="project.tools" value="${project.root}/tools"/>
<property name="project.thirdparty" value="${project.root}/thirdparty"/>
<property name="project.output" value="${project.build}/output"/>
- <property name="project.release" value="${project.output}/${aop.version}"/>
+ <property name="project.release" value="${project.output}/${project.build.name}"/>
<!-- Include user and project property overrides. -->
<property file="${project.build}/local.properties"/>
@@ -85,108 +67,35 @@
</tstamp>
<property name="build.id" value="${build.number}"/>
- <!-- Version identifiers for the server. -->
- <property name="version.major" value="5"/>
- <property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="Beta"/>
- <property name="version.name" value="Morpheus"/>
- <!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="HEAD"/>
-
- <!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <property name="specification.vendor" value="JBoss (http://www.jboss.org/)"/>
-
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://www.jboss.org/"/>
- <property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss.org"/>
- <property name="implementation.vendor.id" value="${implementation.url}"/>
-
- <!-- Invoke the configure task -->
- <antcall target="configure"/>
-
<!-- Load common task properties -->
- <property file="${project.tools}/etc/buildmagic/task.properties"/>
+ <property file="${project.tools}/etc/ant/task.properties"/>
- <!-- Marker to disable build -->
- <!--<property name="build-bypass.marker" value="${module.output}/build-marker"/>-->
+ <!-- Set the default maven.home directory -->
+ <property name="maven.home" value="${basedir}/../tools/maven"/>
- <!-- Marker to disable mbeans -->
- <!--<property name="mbean-bypass.marker" value="${module.output}/mbean-marker"/>-->
-
- <!-- Install filters -->
- <!--<propertyfilter all="${buildmagic.propertyfilter.all}"/>-->
-
- <!--<call target="_buildmagic:init:show-environment" if="init.verbose"/>-->
-
- <!-- Finish up -->
- <property name="init.disable" value="true"/>
</target>
-
<!-- ================================================================== -->
- <!-- Configuration -->
+ <!-- Install & Release -->
<!-- ================================================================== -->
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
-
- <target name="configure" unless="configure.disable">
-
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
-
- <!-- Module name(s) & version -->
- <property name="module.name" value="jboss"/>
- <property name="module.Name" value="JBoss AOP Build"/>
- <property name="module.version" value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
-
- <!-- Defines repository.home -->
- <property file="local.properties"/>
-
- <!-- Bits for building source archives -->
- <patternset id="source.ignore">
- <exclude name="**/output/**"/>
- <exclude name="**/CVS/**" />
- </patternset>
-</target>
-
- <!-- ================================================================== -->
- <!-- Install & Release -->
- <!-- ================================================================== -->
-
- <target name="install"
- description="Install the structure for a release."
- depends="init"
- >
- </target>
-
- <target name="release-output"
+ <target name="release-output"
description="Builds the default release structure."
depends="init, most, release-no-reference-docs"
>
- </target>
+ </target>
- <target name="release"
+ <target name="release"
description="Builds the default release structure."
depends="init, clean, most, maven-site, aop.reference.docs, release-no-reference-docs, release-reference-docs"
>
- <zip destfile="${project.release}.zip">
- <fileset dir="${project.output}">
- <include name="${aop.version}/**"/>
- </fileset>
- </zip>
- <move file="${project.release}.zip" todir="${project.output}/lib"/>
+ <zip destfile="${project.release}.zip">
+ <fileset dir="${project.output}">
+ <include name="${project.build.name}/**"/>
+ </fileset>
+ </zip>
+ <move file="${project.release}.zip" todir="${project.output}/lib"/>
</target>
<target name="release-dryrun"
@@ -194,7 +103,7 @@
depends="init, release-no-reference-docs, release-reference-docs">
</target>
-
+
<!-- ================================================================== -->
<!-- Source Archives -->
<!-- ================================================================== -->
@@ -212,7 +121,7 @@
<!-- Clean up all build output -->
<target name="clean" depends="maven-build-clean"
description="Cleans up most generated files.">
- <delete dir="output"/>
+ <delete dir="output"/>
</target>
<!-- ================================================================== -->
@@ -222,110 +131,84 @@
<target name="main" depends="most"
description="Executes the default target (most)."/>
- <target name="most" depends="maven-build-install, install"
+ <target name="most" depends="maven-build-install"
description="Executes all modules and builds most everything."/>
-
- <!-- Define a macro for calling maven -->
- <macrodef name="maven">
- <attribute name="options" default=""/>
- <attribute name="goal"/>
- <attribute name="basedir" />
- <element name="args" implicit="true" optional="true" />
- <sequential>
- <echo message="Calling mvn command located in ${maven.dir}"/>
- <java classname="org.codehaus.classworlds.Launcher" fork="true"
- dir="@{basedir}" resultproperty="maven.result">
- <classpath>
- <fileset dir="${maven.dir}/boot">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${maven.dir}/lib">
- <include name="*.jar" />
- </fileset>
- </classpath>
- <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
- <sysproperty key="maven.home" value="${maven.dir}" />
- <arg line="--batch-mode @{options} @{goal}" />
- </java>
- </sequential>
- </macrodef>
- <target name="maven-build-install" depends="set-jrockit" description="Call maven install">
-
- <property name="maven.dir" value="${basedir}/../tools/maven"/>
- <property name="build.maven.opts" value=""/>
- <property name="jrockit.build.param" value=""/>
- <echo message="jrockit: ${jrockit.build.param}"/>
- <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}" goal="install"/>
-
- <fail message="Unable to build maven modules. See maven output for details.">
- <condition>
- <not>
- <equals arg1="${maven.result}" arg2="0"/>
- </not>
- </condition>
- </fail>
- </target>
-
- <target name="maven-site" depends="set-jrockit" description="Generate the maven site">
-
- <property name="maven.dir" value="${basedir}/../tools/maven"/>
- <property name="build.maven.opts" value=""/>
- <property name="jrockit.build.param" value=""/>
- <echo message="jrockit: ${jrockit.build.param}"/>
- <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}" goal="site"/>
-
- <fail message="Unable to complete maven build. See maven output for details.">
- <condition>
- <not>
- <equals arg1="${maven.result}" arg2="0"/>
- </not>
- </condition>
- </fail>
- </target>
-
- <!-- Clean the maven part of the build -->
- <target name="maven-build-clean" depends="set-jrockit">
-
- <property name="maven.dir" value="${basedir}/../tools/maven"/>
- <property name="build.maven.opts" value=""/>
- <property name="jrockit.build.param" value=""/>
-
- <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}" goal="clean"/>
-
- <fail message="Unable to clean maven modules. See maven output for details.">
- <condition>
- <not>
- <equals arg1="${maven.result}" arg2="0"/>
- </not>
- </condition>
- </fail>
- </target>
+ <target name="maven-build-install" depends="init, set-jrockit" description="Call maven install">
- <target name="set-jrockit" depends="init" if="jrockit.home">
- <property name="jrockit.build.param" value="-Djrockit.home=${jrockit.home}"/>
- </target>
+ <property name="build.maven.opts" value=""/>
+ <property name="jrockit.build.param" value=""/>
+ <echo message="jrockit: ${jrockit.build.param}"/>
+ <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}"
+ goal="install" resultproperty="maven.install.result"/>
+
+ <fail message="Unable to build maven modules. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.install.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+ </target>
- <!-- TODO: Maybe this can be set up to control offline maven builds. -->
- <target name="check.inhibit.downloads">
- <condition property="inhibit.downloads">
- <istrue value="${nodownload}"/>
+ <target name="maven-site" depends="init, set-jrockit" description="Generate the maven site">
+
+ <property name="build.maven.opts" value=""/>
+ <property name="jrockit.build.param" value=""/>
+ <echo message="jrockit: ${jrockit.build.param}"/>
+ <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}" goal="site"/>
+
+ <fail message="Unable to complete maven build. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+ </target>
+
+ <!-- Clean the maven part of the build -->
+ <target name="maven-build-clean" depends="init, set-jrockit">
+
+ <property name="build.maven.opts" value=""/>
+ <property name="jrockit.build.param" value=""/>
+
+ <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}"
+ goal="clean" resultproperty="maven.clean.result"/>
+
+ <fail message="Unable to clean maven modules. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.clean.result}" arg2="0"/>
+ </not>
</condition>
+ </fail>
</target>
+ <target name="set-jrockit" depends="init" if="jrockit.home">
+ <property name="jrockit.build.param" value="-Djrockit.home=${jrockit.home}"/>
+ </target>
+
+ <!-- TODO: Maybe this can be set up to control offline maven builds. -->
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <istrue value="${nodownload}"/>
+ </condition>
+ </target>
+
<!-- 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>
+ <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>
@@ -336,60 +219,60 @@
</target>
<target name="aop.reference.docs" depends="init" description="Builds the reference manual for JBoss AOP that should be part of ths distribution">
- <ant antfile="build.xml" dir="../aop/docs/reference"/>
+ <ant antfile="build.xml" dir="../aop/docs/reference"/>
</target>
- <target name="update-repository"
+ <target name="update-repository"
description="Copies the jars to the snapshot in the repository. The version can be overridden with the -Dversion=1.2.3 property">
- <property file="local.properties"/>
- <fail unless="repository.home">repository.home must be set in a local.properties file</fail>
+ <property file="local.properties"/>
+ <fail unless="repository.home">repository.home must be set in a local.properties file</fail>
- <condition property="ver" value="snapshot" else="${version}">
- <not>
- <isset property="version"/>
- </not>
- </condition>
- <echo>${ver}</echo>
+ <condition property="ver" value="snapshot" else="${version}">
+ <not>
+ <isset property="version"/>
+ </not>
+ </condition>
+ <echo>${ver}</echo>
- <property name="aop15.dir" value="${repository.home}/jboss/aop/${ver}/lib"/>
- <property name="aop15.resources.dir" value="${repository.home}/jboss/aop/${ver}/resources"/>
- <!--
+ <property name="aop15.dir" value="${repository.home}/jboss/aop/${ver}/lib"/>
+ <property name="aop15.resources.dir" value="${repository.home}/jboss/aop/${ver}/resources"/>
+ <!--
<property name="aop14.dir" value="${repository.home}/jboss/aop14/${ver}/lib"/>
-->
- <mkdir dir="${aop15.dir}"/>
- <mkdir dir="${aop15.resources.dir}"/>
- <!--
+ <mkdir dir="${aop15.dir}"/>
+ <mkdir dir="${aop15.resources.dir}"/>
+ <!--
<mkdir dir="${aop14.dir}"/>
-->
- <copy todir="${aop15.dir}">
- <fileset dir="../aop/output/lib">
- <include name="jboss-aop-jdk50-client.jar"/>
- <include name="jboss-aop-jdk50.jar"/>
- <include name="jboss-aop-src.zip"/>
- <include name="jrockit-pluggable-instrumentor.jar"/>
- <include name="pluggable-instrumentor.jar"/>
- <include name="jboss-aop-src.zip"/>
- </fileset>
- <fileset dir="../asintegration/output/lib">
- <include name="jboss-aop-as4-deployer.jar"/>
- <include name="jboss-aop-deployer-jdk50.jar"/>
- <include name="jboss-aop-jboss4-jdk50.jar"/>
- <include name="jboss-asintegration-src.zip"/>
- </fileset>
- <fileset dir="../aspects/output/lib">
- <include name="jboss-standalone-aspect-library-jdk50.jar"/>
- <include name="jboss-standalone-aspects-src.zip"/>
- </fileset>
- </copy>
- <copy todir="${aop15.resources.dir}">
- <fileset dir="../asintegration/src/resources/META-INF">
- <include name="aspect-deployer-beans.xml"/>
- <include name="jboss-aspect-library-beans.xml"/>
- </fileset>
- </copy>
- <!--
+ <copy todir="${aop15.dir}">
+ <fileset dir="../aop/output/lib">
+ <include name="jboss-aop-jdk50-client.jar"/>
+ <include name="jboss-aop-jdk50.jar"/>
+ <include name="jboss-aop-src.zip"/>
+ <include name="jrockit-pluggable-instrumentor.jar"/>
+ <include name="pluggable-instrumentor.jar"/>
+ <include name="jboss-aop-src.zip"/>
+ </fileset>
+ <fileset dir="../asintegration/output/lib">
+ <include name="jboss-aop-as4-deployer.jar"/>
+ <include name="jboss-aop-deployer-jdk50.jar"/>
+ <include name="jboss-aop-jboss4-jdk50.jar"/>
+ <include name="jboss-asintegration-src.zip"/>
+ </fileset>
+ <fileset dir="../aspects/output/lib">
+ <include name="jboss-standalone-aspect-library-jdk50.jar"/>
+ <include name="jboss-standalone-aspects-src.zip"/>
+ </fileset>
+ </copy>
+ <copy todir="${aop15.resources.dir}">
+ <fileset dir="../asintegration/src/resources/META-INF">
+ <include name="aspect-deployer-beans.xml"/>
+ <include name="jboss-aspect-library-beans.xml"/>
+ </fileset>
+ </copy>
+ <!--
<copy todir="${aop14.dir}">
<fileset dir="../aop/output/lib">
<include name="jboss-aop.jar"/>
@@ -408,255 +291,235 @@
</fileset>
</copy>
-->
- </target>
+ </target>
<target name="release-no-reference-docs"
description="Builds the default release structure, minus the reference documentation"
- depends="init-dependency-properties">
- <delete dir="output/temp"/>
- <mkdir dir="output/temp"/>
+ depends="init">
+ <delete dir="output/temp"/>
+ <mkdir dir="output/temp"/>
- <!-- ================================================== -->
- <!-- Add the files from 'aop' -->
- <!-- ================================================== -->
+ <!-- ================================================== -->
+ <!-- Add the files from 'aop' -->
+ <!-- ================================================== -->
- <!-- build.xml that will compile src/tests and run tests from the dist package -->
- <copy todir="${project.release}" filtering="no">
- <fileset dir="${project.root}/build/build_for_dist">
- <include name="build.xml"/>
- </fileset>
- </copy>
+ <!-- build.xml that will compile src/tests and run tests from the dist package -->
+ <copy todir="${project.release}" filtering="no">
+ <fileset dir="${project.root}/build/build_for_dist">
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
- <copy todir="${project.release}/etc" filtering="no">
- <fileset dir="${project.root}/aop/src/etc">
- <include name="default.mf"/>
- <include name="jbossorg-eula.txt"/>
- <include name="pluggable-instrumentor.mf"/>
- </fileset>
- </copy>
+ <copy todir="${project.release}/etc" filtering="no">
+ <fileset dir="${project.root}/aop/src/etc">
+ <include name="default.mf"/>
+ <include name="jbossorg-eula.txt"/>
+ <include name="pluggable-instrumentor.mf"/>
+ </fileset>
+ </copy>
- <!-- needed to build the source/tests from the dist package -->
- <copy file="${jboss:jboss-test:jar}"
- tofile="${project.release}/lib-test/jboss-test.jar"/>
- <copy file="${junit:junit:jar}"
+ <!-- needed to build the source/tests from the dist package -->
+ <copy file="${jboss:jboss-test:jar}"
+ tofile="${project.release}/lib-test/jboss-test.jar"/>
+ <copy file="${junit:junit:jar}"
tofile="${project.release}/lib-test/junit.jar"/>
- <copy file="${jboss.profiler.jvmti:jboss-profiler-jvmti:jar}"
+ <copy file="${jboss.profiler.jvmti:jboss-profiler-jvmti:jar}"
tofile="${project.release}/lib-test/jboss-profiler-jvmti.jar"/>
-
- <copy todir="${project.release}/bin" filtering="no">
- <fileset dir="${project.root}/aop/src/resources/bin">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${project.release}/docs/aspect-framework" filtering="no">
- <fileset dir="${project.root}/aop/docs">
- <include name="api/**"/>
- <include name="**/*.html"/>
- <include name="**/*.pdf"/>
- <include name="**/*.jpg"/>
- <include name="**/*.pdf"/>
- <include name="**/*.css"/>
- <include name="examples/**"/>
- <exclude name="**/CVS/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/*.wiki"/>
- <exclude name="reference/**"/>
- </fileset>
- </copy>
+ <copy todir="${project.release}/bin" filtering="no">
+ <fileset dir="${project.root}/aop/src/resources/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
- <copy todir="${project.release}/docs/aspect-framework" filtering="no">
- <fileset dir="${project.root}/aop/target/site">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
+ <copy todir="${project.release}/docs/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/docs">
+ <include name="api/**"/>
+ <include name="**/*.html"/>
+ <include name="**/*.pdf"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.pdf"/>
+ <include name="**/*.css"/>
+ <include name="examples/**"/>
+ <exclude name="**/CVS/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/*.wiki"/>
+ <exclude name="reference/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/docs/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/target/site">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
- <copy todir="${project.release}/src/aspect-framework" filtering="no">
- <fileset dir="${project.root}/aop/src">
- <include name="main/**/*.java"/>
- <include name="main/**/*.jjt"/>
- <include name="test/**/*.java"/>
- <include name="resources/test/**/*.xml"/>
- <include name="resources/bin/**/*"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
- <!-- ================================================== -->
- <!-- Add the files from 'asintegration' -->
- <!-- ================================================== -->
+ <copy todir="${project.release}/src/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/src">
+ <include name="main/**/*.java"/>
+ <include name="main/**/*.jjt"/>
+ <include name="test/**/*.java"/>
+ <include name="resources/test/**/*.xml"/>
+ <include name="resources/bin/**/*"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
- <copy todir="${project.release}/docs/asintegration-core" filtering="no">
- <fileset dir="${project.root}/asintegration-core/target/site">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
- <copy todir="${project.release}/docs/asintegration-jmx" filtering="no">
- <fileset dir="${project.root}/asintegration-jmx/target/site">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
- <copy todir="${project.release}/docs/asintegration-mc" filtering="no">
- <fileset dir="${project.root}/asintegration-mc/target/site">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
+ <!-- ================================================== -->
+ <!-- Add the files from 'asintegration' -->
+ <!-- ================================================== -->
- <copy todir="${project.release}/src/asintegration-core" filtering="no">
- <fileset dir="${project.root}/asintegration-core/src">
- <include name="main/**/*.java"/>
- <include name="etc/**"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
- <copy todir="${project.release}/src/asintegration-jmx" filtering="no">
- <fileset dir="${project.root}/asintegration-jmx/src">
- <include name="main/**/*.java"/>
- <include name="etc/**"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
- <copy todir="${project.release}/src/asintegration-mc" filtering="no">
- <fileset dir="${project.root}/asintegration-mc/src">
- <include name="main/**/*.java"/>
- <include name="etc/**"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
+ <copy todir="${project.release}/docs/asintegration-core" filtering="no">
+ <fileset dir="${project.root}/asintegration-core/target/site">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/docs/asintegration-jmx" filtering="no">
+ <fileset dir="${project.root}/asintegration-jmx/target/site">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/docs/asintegration-mc" filtering="no">
+ <fileset dir="${project.root}/asintegration-mc/target/site">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
- <!-- ================================================== -->
- <!-- Add the files from 'aspects' -->
- <!-- ================================================== -->
+ <copy todir="${project.release}/src/asintegration-core" filtering="no">
+ <fileset dir="${project.root}/asintegration-core/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/src/asintegration-jmx" filtering="no">
+ <fileset dir="${project.root}/asintegration-jmx/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/src/asintegration-mc" filtering="no">
+ <fileset dir="${project.root}/asintegration-mc/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
- <copy todir="${project.release}/docs/aspects" filtering="no">
- <fileset dir="${project.root}/aspects/target/site">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
+ <!-- ================================================== -->
+ <!-- Add the files from 'aspects' -->
+ <!-- ================================================== -->
- <copy todir="${project.release}/src/aspects" filtering="no">
- <fileset dir="${project.root}/aspects/src">
- <include name="main/**/*.java"/>
- <include name="test/**/*.java"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
+ <copy todir="${project.release}/docs/aspects" filtering="no">
+ <fileset dir="${project.root}/aspects/target/site">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/src/aspects" filtering="no">
+ <fileset dir="${project.root}/aspects/src">
+ <include name="main/**/*.java"/>
+ <include name="test/**/*.java"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
- <!-- ================================================== -->
- <!-- Now pull everything together -->
- <!-- ================================================== -->
- <property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
- <property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50-single.jar"/>
- <property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
- <property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/target/jboss-aop-asintegration-core.jar"/>
- <property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/target/jboss-aop-asintegration-jmx.jar"/>
- <property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/target/jboss-aop-asintegration-mc.jar"/>
- <property name="aop.jrockit-pluggable-instrumentor.location" value="${project.root}/jrockit-pluggable-instrumentor/target/jrockit-pluggable-instrumentor.jar"/>
- <property name="aop.pluggable-instrumentor.location" value="${project.root}/pluggable-instrumentor/target/pluggable-instrumentor.jar"/>
- <property name="aop.readme-as4.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS4.txt"/>
- <property name="aop.readme-as5.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS5.txt"/>
- <property name="aop.jboss-service.location" value="${project.root}/asintegration-jmx/src/resources/META-INF/jboss-service.xml"/>
+ <!-- ================================================== -->
+ <!-- Now pull everything together -->
+ <!-- ================================================== -->
- <!-- Copy across the eula -->
- <copy todir="${project.release}" file="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
+ <property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
+ <property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50-single.jar"/>
+ <property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
+ <property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/target/jboss-aop-asintegration-core.jar"/>
+ <property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/target/jboss-aop-asintegration-jmx.jar"/>
+ <property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/target/jboss-aop-asintegration-mc.jar"/>
+ <property name="aop.jrockit-pluggable-instrumentor.location" value="${project.root}/jrockit-pluggable-instrumentor/target/jrockit-pluggable-instrumentor.jar"/>
+ <property name="aop.pluggable-instrumentor.location" value="${project.root}/pluggable-instrumentor/target/pluggable-instrumentor.jar"/>
+ <property name="aop.readme-as4.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS4.txt"/>
+ <property name="aop.readme-as5.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS5.txt"/>
+ <property name="aop.jboss-service.location" value="${project.root}/asintegration-jmx/src/resources/META-INF/jboss-service.xml"/>
- <!-- The JDK 5 libs -->
- <copy todir="${project.release}/lib-50" file="${aop.50.location}"/>
- <copy todir="${project.release}/lib-50" file="${aop.50.single.location}"/>
- <copy todir="${project.release}/lib-50" file="${project.root}/aop/output/lib/jboss-aop-jdk50-client.jar"/>
- <copy todir="${project.release}/lib-50" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/lib-50" file="${aop.jrockit-pluggable-instrumentor.location}"/>
- <copy todir="${project.release}/lib-50" file="${aop.pluggable-instrumentor.location}"/>
- <copy tofile="${project.release}/lib-50/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
+ <!-- Copy across the eula -->
+ <copy todir="${project.release}" file="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
- <copy tofile="${project.release}/lib-50/jboss-reflect.jar" file="${org.jboss:jboss-reflect:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
+ <!-- The JDK 5 libs -->
+ <copy todir="${project.release}/lib-50" file="${aop.50.location}"/>
+ <copy todir="${project.release}/lib-50" file="${aop.50.single.location}"/>
+ <copy todir="${project.release}/lib-50" file="${project.root}/aop/output/lib/jboss-aop-jdk50-client.jar"/>
+ <copy todir="${project.release}/lib-50" file="${aop.aspect-library50.location}"/>
+ <copy todir="${project.release}/lib-50" file="${aop.jrockit-pluggable-instrumentor.location}"/>
+ <copy todir="${project.release}/lib-50" file="${aop.pluggable-instrumentor.location}"/>
+ <copy tofile="${project.release}/lib-50/javassist.jar" file="${javassist:javassist:jar}"/>
+ <copy tofile="${project.release}/lib-50/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-logging-log4j.jar" file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
- <copy tofile="${project.release}/lib-50/jboss-logging-spi.jar" file="${org.jboss.logging:jboss-logging-spi:jar}"/>
- <copy tofile="${project.release}/lib-50/log4j.jar" file="${log4j:log4j:jar}"/>
- <copy tofile="${project.release}/lib-50/trove.jar" file="${trove:trove:jar}"/>
+ <copy tofile="${project.release}/lib-50/jboss-reflect.jar" file="${org.jboss:jboss-reflect:jar}"/>
+ <copy tofile="${project.release}/lib-50/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
- <!-- The JBoss 4.0.x and 4.2.x libs for JDK 5 -->
- <copy file="${aop.jboss-service.location}" tofile="output/temp/jboss-service-jdk50.xml" filtering="true">
- <filterset>
- <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
- </filterset>
- </copy>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build_jboss4.0.xml" file="../asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build.xml" file="../asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="../asintegration-core/src/etc/jboss.properties"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.50.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-core.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-jmx.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.readme-as4.location}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-reflect.jar" file="${org.jboss:jboss-reflect:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/trove.jar" file="${trove:trove:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk50.xml"/>
+ <copy tofile="${project.release}/lib-50/jboss-logging-log4j.jar" file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
+ <copy tofile="${project.release}/lib-50/jboss-logging-spi.jar" file="${org.jboss.logging:jboss-logging-spi:jar}"/>
+ <copy tofile="${project.release}/lib-50/log4j.jar" file="${log4j:log4j:jar}"/>
+ <copy tofile="${project.release}/lib-50/trove.jar" file="${trove:trove:jar}"/>
- <!-- The JBoss 5 libs for JDK 5 (JBoss 5 needs JDK 5) -->
- <copy todir="${project.release}/jboss-50-install/lib" file="${aop.50.location}"/>
- <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-core.location}"/>
- <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-mc.location}"/>
- <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-jmx.location}"/>
- <copy todir="${project.release}/jboss-50-install" file="${aop.readme-as5.location}"/>
- <copy tofile="${project.release}/jboss-50-install/lib/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/jboss-50-install/lib/trove.jar" file="${trove:trove:jar}"/>
- <copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer" file="${aop.aspect-library50.location}"/>
+ <!-- The JBoss 4.0.x and 4.2.x libs for JDK 5 -->
+ <copy file="${aop.jboss-service.location}" tofile="output/temp/jboss-service-jdk50.xml" filtering="true">
+ <filterset>
+ <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
+ </filterset>
+ </copy>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build_jboss4.0.xml" file="../asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build.xml" file="../asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="../asintegration-core/src/etc/jboss.properties"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.50.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.aspect-library50.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-core.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-jmx.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.readme-as4.location}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-reflect.jar" file="${org.jboss:jboss-reflect:jar}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/javassist.jar" file="${javassist:javassist:jar}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/trove.jar" file="${trove:trove:jar}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk50.xml"/>
+ <!-- The JBoss 5 libs for JDK 5 (JBoss 5 needs JDK 5) -->
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.50.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-core.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-mc.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-jmx.location}"/>
+ <copy todir="${project.release}/jboss-50-install" file="${aop.readme-as5.location}"/>
+ <copy tofile="${project.release}/jboss-50-install/lib/javassist.jar" file="${javassist:javassist:jar}"/>
+ <copy tofile="${project.release}/jboss-50-install/lib/trove.jar" file="${trove:trove:jar}"/>
+ <copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}" file="RELEASE_NOTES.html"/>
-<!-- <delete dir="output/temp"/> -->
+ <copy todir="${project.release}" file="RELEASE_NOTES.html"/>
- </target>
+ </target>
- <target name="release-reference-docs"
+ <target name="release-reference-docs"
+ depends="init"
description="Builds the default release structure, minus the reference documentation">
- <copy todir="${project.release}/docs/aspect-framework" filtering="no">
- <fileset dir="${project.root}/aop/docs/reference/build">
- <include name="**"/>
- </fileset>
- </copy>
+ <copy todir="${project.release}/docs/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/docs/reference/build">
+ <include name="**"/>
+ </fileset>
+ </copy>
- </target>
+ </target>
- <target name="init-dependency-properties"
- description="Initialize properties for accessing maven dependencies"
- xmlns:maven="urn:maven-artifact-ant">
-
- <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
- classpathref="maven-ant-tasks.classpath"/>
-
- <maven:pom id="aop.framework.pom" file="../aop/pom.xml" />
-
- <!-- This tasks resolves maven dependencies and creates a property of the
- - form groupId:artifactId:type that points to the dependency jar file.
- -->
- <maven:dependencies pathId="dist.dependencies.classpath"
- versionsId="maven.dependency.versions">
- <pom refid="aop.framework.pom"/>
- </maven:dependencies>
-
- </target>
</project>
Added: projects/aop/trunk/build/pom.xml
===================================================================
--- projects/aop/trunk/build/pom.xml (rev 0)
+++ projects/aop/trunk/build/pom.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-dist</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss AOP Distribution Build</name>
+ <description>JBoss AOP Distribution Build</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jrockit-pluggable-instrumentor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Property changes on: projects/aop/trunk/build/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2008-10-09 22:32:32 UTC (rev 79315)
+++ projects/aop/trunk/pom.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -72,6 +72,7 @@
<module>asintegration-core</module>
<module>asintegration-jmx</module>
<module>asintegration-mc</module>
+ <module>build</module>
</modules>
<dependencyManagement>
@@ -277,8 +278,7 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
@@ -287,6 +287,11 @@
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
+ <artifactId>jrockit-pluggable-instrumentor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-asintegration-core</artifactId>
<version>${project.version}</version>
</dependency>
Added: projects/aop/trunk/tools/etc/ant/common-tasks.xml
===================================================================
--- projects/aop/trunk/tools/etc/ant/common-tasks.xml (rev 0)
+++ projects/aop/trunk/tools/etc/ant/common-tasks.xml 2008-10-09 22:39:56 UTC (rev 79316)
@@ -0,0 +1,110 @@
+
+<!-- ================================================================== -->
+<!-- Common ant tasks and macros shared by the builds -->
+<!-- ================================================================== -->
+<project name="common-tasks">
+
+ <target name="init-maven-environment" unless="maven.init.complete"
+ description="Initialize properties for accessing maven configuration" xmlns:maven="urn:maven-artifact-ant">
+
+ <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+
+ <maven:pom id="maven.project" file="pom.xml" />
+
+ <!-- This tasks resolves maven dependencies and creates a property of the
+ - form groupId:artifactId:type that points to the dependency jar file.
+ -->
+ <maven:dependencies pathId="maven.dependencies.compile.classpath" useScope="compile">
+ <pom refid="maven.project" />
+ </maven:dependencies>
+
+ <maven:dependencies pathId="maven.dependencies.test.classpath" useScope="test">
+ <pom refid="maven.project" />
+ </maven:dependencies>
+
+ <property name="maven.init.complete" value="true"/>
+
+ </target>
+
+ <target name="verify-environment" description="Check that the build environment is set up correctly">
+ <verify-ant />
+ <verify-java supported-versions="1.5, 1.6" />
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Define ant macros used in the build -->
+ <!-- ================================================================== -->
+
+ <macrodef name="verify-ant">
+ <attribute name="supported-versions" default="1.6" />
+ <sequential>
+
+ <echo message="${ant.version}" />
+
+ <!-- Make sure we have the right version of Ant -->
+ <property name="ant16.baseversion" value="1.6" />
+ <property name="ant17.baseversion" value="1.7" />
+
+ <!--
+ | Add new conditions for other supported Ant versions when they
+ | become avaialble.
+ -->
+
+ <condition property="ant.version.ok">
+ <or>
+ <contains string="${ant.version}" substring="Ant version ${ant16.baseversion}" />
+ <contains string="${ant.version}" substring="Ant version ${ant17.baseversion}" />
+ </or>
+ </condition>
+
+ <fail unless="ant.version.ok">
+
+ Unsupported Ant version: ${ant.version}. Please install a version which is compatible with Ant ${ant16.baseversion} or ${ant17.baseversion}.
+
+ </fail>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="verify-java">
+ <attribute name="supported-versions" default="1.5" />
+ <sequential>
+ <echo message="Java version ${ant.java.version}" />
+ <condition property="java.version.ok">
+ <contains string="@{supported-versions}" substring="${ant.java.version}" />
+ </condition>
+
+ <fail unless="java.version.ok">
+
+ Unsupported Java version: ${ant.java.version}. Please install a version which is compatible with @{supported-versions}.
+
+ </fail>
+ </sequential>
+ </macrodef>
+
+ <!-- Define a macro for calling maven -->
+ <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>
+ <echo message="Calling mvn command located in ${maven.home}" />
+ <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" resultproperty="@{resultproperty}">
+ <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>
+
+</project>
\ No newline at end of file
Property changes on: projects/aop/trunk/tools/etc/ant/common-tasks.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/tools/etc/ant/task.properties
===================================================================
--- projects/aop/trunk/tools/etc/ant/task.properties (rev 0)
+++ projects/aop/trunk/tools/etc/ant/task.properties 2008-10-09 22:39:56 UTC (rev 79316)
@@ -0,0 +1,91 @@
+### ====================================================================== ###
+## ##
+## Default Task Properties ##
+## ##
+### ====================================================================== ###
+
+### $Id$ ###
+
+### Javac Defaults ###
+
+javac.includes=**/*.java
+javac.excludes=
+javac.defaultexcludes=yes
+
+javac.boot.classpath=${sun.boot.classpath}
+javac.classpath=${classpath}
+
+javac.debug=on
+javac.optimize=on
+javac.deprecation=on
+javac.target=1.5
+javac.verbose=off
+javac.depend=off
+javac.source=1.5
+
+javac.include.ant.runtime=no
+javac.include.java.runtime=no
+javac.fail.onerror=true
+
+classpath=
+classpath.local=
+classpath.thirdparty=
+
+### Javadoc Defaults ###
+
+javadoc.classpath=${javac.classpath}
+javadoc.sourcepath=
+javadoc.source.path=
+javadoc.source.files=
+
+javadoc.public=false
+javadoc.package=false
+javadoc.protected=true
+javadoc.private=false
+javadoc.version=true
+javadoc.author=true
+javadoc.use=true
+javadoc.verbose=false
+
+javadoc.windowtitle=${module.Name} API
+javadoc.doctitle=${module.Name}
+javadoc.splitindex=no
+
+### MBean Defaults ###
+mbean.includes=
+mbean.excludes=
+
+### Jar Defaults ###
+jar.server.includes=
+jar.client.includes=
+
+### RMIC Defaults ###
+
+rmic.base=${build.classes}
+rmic.stubVersion=${javac.target}
+rmic.verify=true
+rmic.sourcebase=
+rmic.debug=false
+rmic.iiop=false
+rmic.iiopopts=
+rmic.idl=false
+rmic.idlopts=
+rmic.includes=
+rmic.excludes=
+
+### JUnit Defaults ###
+
+junit.printsummary=true
+junit.haltonerror=false
+junit.haltonfailure=false
+junit.fork=true
+junit.timeout=300000
+junit.jvm=java
+junit.jvm.options=-Dnone
+
+junit.formatter.type=xml
+junit.formatter.usefile=true
+
+junit.batchtest.fork=${junit.fork}
+junit.batchtest.haltonerror=${junit.haltonerror}
+junit.batchtest.haltonfailure=${junit.haltonfailure}
Property changes on: projects/aop/trunk/tools/etc/ant/task.properties
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: projects/aop/trunk/tools/lib/jbossbuild.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list