[jboss-svn-commits] JBL Code SVN: r31362 - in labs/jbosstm/trunk: ArjunaCore/tsmx and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 2 11:08:33 EST 2010
Author: jhalliday
Date: 2010-02-02 11:08:33 -0500 (Tue, 02 Feb 2010)
New Revision: 31362
Removed:
labs/jbosstm/trunk/ArjunaCore/tsmx/lib/
Modified:
labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
labs/jbosstm/trunk/Build.txt
labs/jbosstm/trunk/build-release-pkgs.xml
labs/jbosstm/trunk/build.xml
labs/jbosstm/trunk/maven/build.xml
labs/jbosstm/trunk/maven/pom-template.xml
labs/jbosstm/trunk/sharedbuild.xml
Log:
Remove use of JBOSS_HOME in build scripts in favor of maven. JBTM-687
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2010-02-02 15:22:46 UTC (rev 31361)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2010-02-02 16:08:33 UTC (rev 31362)
@@ -22,6 +22,8 @@
<property name="modulename" value="tsmx"/>
+ <property name="global.ext.libs" value="jcommon.jar,jfreechart.jar"/>
+
<import file="../../sharedbuild.xml"/>
<target name="init" depends="sharedbuild.init">
Modified: labs/jbosstm/trunk/Build.txt
===================================================================
--- labs/jbosstm/trunk/Build.txt 2010-02-02 15:22:46 UTC (rev 31361)
+++ labs/jbosstm/trunk/Build.txt 2010-02-02 16:08:33 UTC (rev 31362)
@@ -44,12 +44,14 @@
config files and other ancillaries. These call each other in some cases, as JTS is largely a superset of
JTA and JTA in turn a superset of Core.
-The build system does not currently employ a dependency management framework such as maven or ivy. Instead the
-necessary 3rd part pre-req .jars are either present in svn (ext/ and ArjunaJTS/jacorb/ for example) or pulled
-in from a JBossAS installation found at build time via the JBOSS_HOME environment variable.
+3rd party dependency management is currently done via maven. The top level build invokes the maven/build.xml which
+calls maven to resolve the dependencies and populate build/extlib which other ant build scripts then reference
+in the classpath. Note that versions of most 3rd party components are resolved via the JBossAS component-matix
+pom.xml, even when building standalone releases. The version of JBossAS to use is determined by the pom-template.xml
-The build currently requires Java 6 and ant 1.7.1. Although it's no longer tried and tested, it may remain possible
-for a time to build on Java 5 by editing ArjunaJTA/jdbc/build.xml and changing the excluded **/*JDBC3.java pattern
+The build currently requires Java 6, ant 1.7.1 and maven 2.0.9. Later version may work.
+Although it's no longer tried and tested, it may remain possible for a time to build on Java 5 by editing
+ArjunaJTA/jdbc/build.xml and changing the excluded **/*JDBC3.java pattern
to **/*JDBC4.java instead. This is required as the JDBC3 and 4 APIs are not compatible.
A handful of unit tests build and run as part of the normal build. Most test coverage is in the form of integration
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2010-02-02 15:22:46 UTC (rev 31361)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2010-02-02 16:08:33 UTC (rev 31362)
@@ -36,8 +36,9 @@
You don't need to check out JBossTS, the script does that.
Check out the jbossts web pages project
source and binary bundles for download by end users get published here
- Build or install a tagged release of JBossAS to build against. Set JBOSS_HOME.
- Use the oldest JBossAS release the JBossTS release is intended to support.
+ Check the version of JBossAS referenced in maven/pom-template.xml is sane.
+ You MUST NOT use a snapshot release if doing a tagged build of JBossTS.
+ In general, use the oldest JBossAS release the JBossTS release is intended to support.
Update the properties section below to suit your machine.
Set JAVA_HOME to a jdk 1.6, since that's the version we currently support.
ant -f build-release-pkgs.xml dist mvn-repository cms-repository
@@ -62,7 +63,7 @@
<!--
<property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm"/>
<property name="tag" value="trunk"/>
- <property name="filename" value="4.9.0.SNAPSHOT"/>
+ <property name="filename" value="4.9.0.GA"/>
<property name="mvn.repositoryId" value="snapshots.jboss.org"/>
<property name="mvn.url" value="dav:https://snapshots.jboss.org/maven2"/>
-->
Modified: labs/jbosstm/trunk/build.xml
===================================================================
--- labs/jbosstm/trunk/build.xml 2010-02-02 15:22:46 UTC (rev 31361)
+++ labs/jbosstm/trunk/build.xml 2010-02-02 16:08:33 UTC (rev 31362)
@@ -27,23 +27,20 @@
</classpath>
</taskdef>
- <property environment="env"/>
+ <property environment="env"/>
- <!-- use 'standalone' or 'maven' -->
- <property name="dependency.handling" value="maven"/>
+ <target name="help">
+ <echo>
+ Targets supported in this build.xml file
+ clean - clean projects
+ core - build the core transaction engine
+ jta - build the standalone jta transaction engine
+ jts - build the standalone jts transaction engine
+ jbossjta - build the jboss integrated jta transaction engine
+ jbossjts - build the jboss integrated jts transaction engine
+ </echo>
+ </target>
- <target name="help">
- <echo>
-Targets supported in this build.xml file
- clean - clean projects
- core - build the core transaction engine
- jta - build the standalone jta transaction engine
- jts - build the standalone jts transaction engine
- jbossjta - build the jboss integrated jta transaction engine
- jbossjts - build the jboss integrated jts transaction engine
- </echo>
- </target>
-
<macrodef name="install.macro">
<attribute name="src.module"/>
<sequential>
@@ -54,23 +51,23 @@
</sequential>
</macrodef>
- <target name="jts" depends="clean, init_dependencies, antbuildsystem">
- <ant dir="ArjunaJTS"/>
- <install.macro src.module="ArjunaJTS"/>
- <ant dir="qa"/>
- </target>
+ <target name="jts" depends="clean, init_dependencies, antbuildsystem">
+ <ant dir="ArjunaJTS"/>
+ <install.macro src.module="ArjunaJTS"/>
+ <ant dir="qa"/>
+ </target>
- <target name="jta" depends="clean, init_dependencies, antbuildsystem">
- <ant dir="ArjunaJTA"/>
- <install.macro src.module="ArjunaJTA"/>
- <ant dir="qa"/>
- </target>
+ <target name="jta" depends="clean, init_dependencies, antbuildsystem">
+ <ant dir="ArjunaJTA"/>
+ <install.macro src.module="ArjunaJTA"/>
+ <ant dir="qa"/>
+ </target>
- <target name="core" depends="clean, init_dependencies, antbuildsystem">
- <ant dir="ArjunaCore"/>
- <install.macro src.module="ArjunaCore"/>
- <ant dir="qa"/>
- </target>
+ <target name="core" depends="clean, init_dependencies, antbuildsystem">
+ <ant dir="ArjunaCore"/>
+ <install.macro src.module="ArjunaCore"/>
+ <ant dir="qa"/>
+ </target>
<macrodef name="atsinstall.macro">
<attribute name="build.type"/>
@@ -80,27 +77,27 @@
</sequential>
</macrodef>
- <target name="jbossjts" depends="clean, init_integration, jts">
- <ant dir="atsintegration" target="dist"/>
- <atsinstall.macro build.type="jts"/>
- </target>
+ <target name="jbossjts" depends="clean, jts">
+ <ant dir="atsintegration" target="dist"/>
+ <atsinstall.macro build.type="jts"/>
+ </target>
- <target name="jbossjta" depends="clean, init_integration, jta">
- <ant dir="atsintegration" target="dist">
- <property name="no_jts" value="true"/>
- </ant>
- <atsinstall.macro build.type="jta"/>
- </target>
+ <target name="jbossjta" depends="clean, jta">
+ <ant dir="atsintegration" target="dist">
+ <property name="no_jts" value="true"/>
+ </ant>
+ <atsinstall.macro build.type="jta"/>
+ </target>
<target name="antbuildsystem" depends="clean">
<ant dir="antbuildsystem"/>
</target>
- <target name="clean">
- <ant dir="antbuildsystem" target="clean"/>
- <ant dir="common" target="clean"/>
- <ant dir="ArjunaCore" target="clean"/>
- <ant dir="ArjunaJTA" target="clean"/>
+ <target name="clean">
+ <ant dir="antbuildsystem" target="clean"/>
+ <ant dir="common" target="clean"/>
+ <ant dir="ArjunaCore" target="clean"/>
+ <ant dir="ArjunaJTA" target="clean"/>
<if>
<available file="ArjunaJTS"/>
@@ -109,35 +106,13 @@
</then>
</if>
- <ant dir="atsintegration" target="clean"/>
+ <ant dir="atsintegration" target="clean"/>
- <delete dir="build"/>
- </target>
+ <delete dir="build"/>
+ </target>
- <target name="init_integration">
- <condition property="jboss.home" value="${env.JBOSS_HOME}">
- <isset property="env.JBOSS_HOME"/>
- </condition>
-
- <if>
- <equals arg1="${dependency.handling}" arg2="standalone"/>
- <then>
- <fail unless="jboss.home">
- The JBoss installation directory must be specified with the JBOSS_HOME environment variable or the jboss.home property.
- </fail>
- </then>
- </if>
-
- </target>
-
<target name="init_dependencies">
- <ant dir="maven" target="${dependency.handling}"/>
- <if>
- <isset property="jboss.home"/>
- <then>
- <ant dir="maven" target="standalone-atsintegration"/>
- </then>
- </if>
+ <ant dir="maven"/>
</target>
</project>
Modified: labs/jbosstm/trunk/maven/build.xml
===================================================================
--- labs/jbosstm/trunk/maven/build.xml 2010-02-02 15:22:46 UTC (rev 31361)
+++ labs/jbosstm/trunk/maven/build.xml 2010-02-02 16:08:33 UTC (rev 31362)
@@ -23,14 +23,11 @@
in dir 'ext' to allow for offline builds and strong versioning. Building the JBossAS
integration code required a copy of JBossAS via the JBOSS_HOME env var.
- Starting with 4.10 the build can use maven for dependency management whilst still
+ Starting with 4.10 the build uses maven for dependency management whilst still
using ant for the main build. This helps us play nice in a maven ecosystem. The top
level build script calls one or other method in this file to install the dependencies
- into build/extlib. In standalone mode they are copied from ext. In maven mode they are
- pulled from the repository. In either case build scripts use the maven names without
- versions to minimise the updating that is needed.
-
- Caution: Deprecation. At some point the standalone method of building will go away.
+ into build/extlib. Build scripts use the maven names without versions to minimise the
+ updating that is needed.
-->
<project name="JBossTS Dependency Management" default="maven" basedir=".">
<description>
@@ -39,7 +36,6 @@
<property name="ext.lib.src" value="../ext"/>
<property name="ext.lib.dest" value="../build/extlib"/>
- <property name="xts.ext.lib.dest" value="../XTS/build/extlib"/>
<property name="groupid" value="jboss.jbossts"/>
<property name="artifact" value="jbossts-build"/>
@@ -50,10 +46,8 @@
the dependencies into the dir where the build looks for them -->
<delete dir="${ext.lib.dest}"/>
- <delete dir="${xts.ext.lib.dest}"/>
<mkdir dir="${ext.lib.dest}"/>
- <mkdir dir="${xts.ext.lib.dest}"/>
-
+
<copy file="pom-template.xml"
tofile="pom.xml"
filtering="true"
@@ -79,73 +73,16 @@
</fileset>
</copy>
- <!-- XTS uses its own copy for now, so it can override some deps -->
- <copy todir="${xts.ext.lib.dest}" overwrite="true">
- <fileset dir="${ext.lib.dest}" includes="*"/>
- </copy>
- <copy todir="${xts.ext.lib.dest}" overwrite="true">
- <fileset dir="../XTS/ext">
- <include name="junit.jar"/>
- </fileset>
- </copy>
-
<!-- we use a local copy of JacORB for build/test as we need bits of it that are not in mvn.
However, we should ensure the AS has not upgraded or we'll wind up running on an untested version: -->
- <checksum file="${xts.ext.lib.dest}/jacorb.jar" property="as-jacorb-md5"/>
+ <checksum file="${ext.lib.dest}/jacorb.jar" property="as-jacorb-md5"/>
<checksum file="../ArjunaJTS/jacorb/lib/jacorb.jar" property="local-jacorb-md5"/>
<fail message="WARNING: effective JacORB version does not match JBossAS JacORB version. This is bad. I'm sulking. Edit maven/build.xml if you want to live dangerously, or go fix the problem.">
<condition>
<not><equals arg1="${as-jacorb-md5}" arg2="${local-jacorb-md5}"/></not>
</condition>
</fail>
-
</target>
- <target name="standalone">
-
- <delete dir="${ext.lib.dest}"/>
- <mkdir dir="${ext.lib.dest}"/>
-
- <!-- jars that match the maven naming pattern can be copied directly -->
- <copy todir="${ext.lib.dest}">
- <fileset dir="${ext.lib.src}">
- <include name="byteman.jar"/>
- <include name="emma.jar"/>
- <include name="emma_ant.jar"/>
- <include name="wrapper.jar"/>
- <include name="third_party_licenses.txt"/>
- </fileset>
- </copy>
-
- <!-- jars that don't match maven naming need to be renamed or the build scripts choke.
- Note: this is a kludge. But you knew that already. -->
-
- <copy file="${ext.lib.src}/jta-1_1-classes.zip" tofile="${ext.lib.dest}/jta.jar"/>
- <copy file="${ext.lib.src}/connector-api.jar" tofile="${ext.lib.dest}/jboss-jca-api.jar"/>
- <copy file="${ext.lib.src}/junit-4.6.jar" tofile="${ext.lib.dest}/junit.jar"/>
- <copy file="${ext.lib.src}/log4j-1.2.14.jar" tofile="${ext.lib.dest}/log4j.jar"/>
- <copy file="${ext.lib.src}/commons-logging-1.1.jar" tofile="${ext.lib.dest}/commons-logging.jar"/>
-
- </target>
-
- <target name="standalone-atsintegration">
-
- <!-- in legacy JBOSS_HOME mode we pull the pre-reqs for atsintegration
- from our local copy of JBossAS rather than from maven -->
-
- <copy file="${env.JBOSS_HOME}/common/lib/jboss-integration.jar"
- tofile="${ext.lib.dest}/jboss-transaction-spi.jar"/>
-
- <copy todir="${ext.lib.dest}">
- <fileset dir="${env.JBOSS_HOME}/lib">
- <include name="jboss-logmanager.jar"/>
- </fileset>
- <fileset dir="${env.JBOSS_HOME}/common/lib">
- <include name="jbosssx.jar"/>
- </fileset>
- </copy>
-
- </target>
-
</project>
Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml 2010-02-02 15:22:46 UTC (rev 31361)
+++ labs/jbosstm/trunk/maven/pom-template.xml 2010-02-02 16:08:33 UTC (rev 31362)
@@ -263,7 +263,17 @@
<artifactId>idl</artifactId>
</dependency>
+ <!-- tsmx (tooling) requires graphing support: -->
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ </dependency>
+
<!-- atsintegration (i.e. the JBossAS glue code) requires some app server bits. -->
<dependency>
@@ -354,14 +364,6 @@
<artifactId>jaxws-api</artifactId>
</dependency>
- <!--
- can this one be more fine grained?
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- </dependency>
- -->
-
</dependencies>
</project>
\ No newline at end of file
Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml 2010-02-02 15:22:46 UTC (rev 31361)
+++ labs/jbosstm/trunk/sharedbuild.xml 2010-02-02 16:08:33 UTC (rev 31362)
@@ -113,7 +113,6 @@
deprecation="${deprecation}" excludes="@{excluded.classes}" fork="true">
<classpath>
<fileset dir="${build.dir}/lib/ext/" includes="*"/>
- <fileset dir="." includes="${lib.dir}/ext/*"/>
<fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs}"/>
<additional.classpath/>
</classpath>
More information about the jboss-svn-commits
mailing list