[jboss-svn-commits] JBL Code SVN: r21890 - in labs/jbossbuild/buildmagic/trunk: build and 76 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 25 15:56:03 EDT 2008
Author: pgier
Date: 2008-08-25 15:56:03 -0400 (Mon, 25 Aug 2008)
New Revision: 21890
Added:
labs/jbossbuild/buildmagic/trunk/tools/bin/ant.cmd
labs/jbossbuild/buildmagic/trunk/tools/bin/antenv.cmd
labs/jbossbuild/buildmagic/trunk/tools/bin/envset.cmd
labs/jbossbuild/buildmagic/trunk/tools/bin/runrc.cmd
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/aliases.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/autoload.properties
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/common.properties
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/libraries.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/targets.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/task.properties
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/tools.ent
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-antlr.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-bcel.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-bsf.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-log4j.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-oro.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-regexp.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-resolver.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-commons-logging.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-commons-net.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-icontract.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jai.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-javamail.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jdepend.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jmf.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jsch.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-junit.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-launcher.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-netrexx.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-nodeps.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-starteam.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-stylebook.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-swing.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-trax.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-vaj.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-weblogic.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-xalan1.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/ant-xslp.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/maven-ant-tasks-2.0.9.jar
Removed:
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/xml/catalog/
labs/jbossbuild/buildmagic/trunk/thirdparty/apache-bcel/
labs/jbossbuild/buildmagic/trunk/thirdparty/apache-log4j/
labs/jbossbuild/buildmagic/trunk/thirdparty/dom4j-dom4j/
labs/jbossbuild/buildmagic/trunk/thirdparty/gnu-getopt/
labs/jbossbuild/buildmagic/trunk/thirdparty/gnu-regexp/
labs/jbossbuild/buildmagic/trunk/thirdparty/ibm-bsf/
labs/jbossbuild/buildmagic/trunk/thirdparty/junit-junit/
labs/jbossbuild/buildmagic/trunk/thirdparty/oswego-concurrent/
labs/jbossbuild/buildmagic/trunk/thirdparty/sun-jaxp/
labs/jbossbuild/buildmagic/trunk/thirdparty/sun-jmx/
labs/jbossbuild/buildmagic/trunk/thirdparty/xml-sax/
labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/autoload.properties
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/common.properties
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/libraries.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/modules.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/targets.ent
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/task.properties
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/tools.ent
labs/jbossbuild/buildmagic/trunk/tools/lib/optional.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/xalan.jar
Modified:
labs/jbossbuild/buildmagic/trunk/
labs/jbossbuild/buildmagic/trunk/build/
labs/jbossbuild/buildmagic/trunk/build/build.xml
labs/jbossbuild/buildmagic/trunk/build/etc/
labs/jbossbuild/buildmagic/trunk/common/
labs/jbossbuild/buildmagic/trunk/common/build.xml
labs/jbossbuild/buildmagic/trunk/common/src/
labs/jbossbuild/buildmagic/trunk/common/src/etc/
labs/jbossbuild/buildmagic/trunk/common/src/main/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/interception/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/appender/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/layout/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/util/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/file/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/http/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/njar/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/resource/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/coerce/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/collection/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/file/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/id/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/jmx/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/naming/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/platform/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/property/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/property/jmx/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/propertyeditor/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/state/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/stream/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/timeout/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/xml/
labs/jbossbuild/buildmagic/trunk/common/src/test/
labs/jbossbuild/buildmagic/trunk/common/src/test/org/
labs/jbossbuild/buildmagic/trunk/common/src/test/org/jboss/
labs/jbossbuild/buildmagic/trunk/common/src/test/org/jboss/util/
labs/jbossbuild/buildmagic/trunk/common/src/test/org/jboss/util/propertyeditor/
labs/jbossbuild/buildmagic/trunk/tasks/
labs/jbossbuild/buildmagic/trunk/tasks/build.xml
labs/jbossbuild/buildmagic/trunk/tasks/src/
labs/jbossbuild/buildmagic/trunk/tasks/src/bin/
labs/jbossbuild/buildmagic/trunk/tasks/src/etc/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/oevren/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/oevren/ant/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/oevren/ant/greebo/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/util/
labs/jbossbuild/buildmagic/trunk/tasks/src/resources/
labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/
labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss/
labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss/tools/
labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss/tools/buildmagic/
labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss/tools/buildmagic/task/
labs/jbossbuild/buildmagic/trunk/thirdparty/
labs/jbossbuild/buildmagic/trunk/thirdparty/apache-commons/
labs/jbossbuild/buildmagic/trunk/thirdparty/apache-commons/lib/
labs/jbossbuild/buildmagic/trunk/thirdparty/apache-slide/
labs/jbossbuild/buildmagic/trunk/thirdparty/apache-slide/client/
labs/jbossbuild/buildmagic/trunk/thirdparty/apache-slide/client/lib/
labs/jbossbuild/buildmagic/trunk/thirdparty/xdoclet-xdoclet/
labs/jbossbuild/buildmagic/trunk/thirdparty/xdoclet-xdoclet/lib/
labs/jbossbuild/buildmagic/trunk/tools/
labs/jbossbuild/buildmagic/trunk/tools/bin/
labs/jbossbuild/buildmagic/trunk/tools/bin/ant
labs/jbossbuild/buildmagic/trunk/tools/bin/ant.bat
labs/jbossbuild/buildmagic/trunk/tools/bin/antRun
labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.bat
labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.pl
labs/jbossbuild/buildmagic/trunk/tools/bin/complete-ant-cmd.pl
labs/jbossbuild/buildmagic/trunk/tools/bin/lcp.bat
labs/jbossbuild/buildmagic/trunk/tools/bin/runant.pl
labs/jbossbuild/buildmagic/trunk/tools/bin/runant.py
labs/jbossbuild/buildmagic/trunk/tools/etc/
labs/jbossbuild/buildmagic/trunk/tools/etc/xdoclet/
labs/jbossbuild/buildmagic/trunk/tools/etc/xdoclet/templates/
labs/jbossbuild/buildmagic/trunk/tools/examples/
labs/jbossbuild/buildmagic/trunk/tools/lib/
labs/jbossbuild/buildmagic/trunk/tools/lib/ant.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/junit.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/xercesImpl.jar
labs/jbossbuild/buildmagic/trunk/tools/lib/xml-apis.jar
Log:
[JBBUILD-482] Make changes to get buildmagic compiling again.
Property changes on: labs/jbossbuild/buildmagic/trunk
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/build
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Modified: labs/jbossbuild/buildmagic/trunk/build/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/build/build.xml 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/build/build.xml 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY libraries SYSTEM "../tools/etc/buildfragments/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildmagic/tools.ent">
+ <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildmagic/defaults.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
<!-- $Id$ -->
@@ -32,11 +32,8 @@
<!--+====================================================================+-->
&buildmagic;
- &libraries;
- &modules;
&defaults;
&tools;
- &targets;
<!--+====================================================================+-->
@@ -46,7 +43,7 @@
<!--| 'init'. |-->
<!--+====================================================================+-->
- <target name="init" depends="_default:init">
+ <target name="init" depends="_buildmagic:init">
<!-- Add module specific elements here. -->
</target>
@@ -75,6 +72,13 @@
<property name="version.name" value="supyo"/>
<!-- Module name(s) & version -->
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="buildmagic"/>
+ <property name="module.Name" value="Buildmagic Build"/>
<property name="module.version" value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
<!--+================================+-->
@@ -82,13 +86,13 @@
<!--+================================+-->
<!-- Configure thirdparty libraries -->
- <call target="configure-libraries"/>
+ <!--<call target="configure-libraries"/>-->
<path id="library.classpath">
<!-- Add thirdparty library elements here. -->
</path>
<!-- Configure modules -->
- <call target="configure-modules"/>
+ <!--<call target="configure-modules"/>-->
<path id="dependentmodule.classpath">
<!-- Add dependent module classpath elements here. -->
</path>
@@ -133,11 +137,67 @@
</moduleconfig>
<!-- Configure project defaults -->
- <call target="configure-project"/>
+ <!--<call target="configure-project"/>-->
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+ <!-- Skip any missing modules and issue a warning -->
+ <property name="executemodules.skipmissing" value="true"/>
+
+ <!-- The header and footer displayed during each module execution -->
+ <property name="executemodules.header"><![CDATA[
+ ======================================================================
+ == Executing '${target}' in module '${module}'...
+ ==]]></property>
+
+ <property name="executemodules.footer"><![CDATA[
+ ==
+ == Finished with '${target}' in module '${module}'.
+ ======================================================================
+ ]]></property>
+
+ <property name="executemodules.exportproperties">
+ version.major,
+ version.minor,
+ version.revision,
+ version.tag,
+ version.name,
+ version.cvstag,
+
+ specification.title,
+ specification.version,
+ specification.vendor,
+
+ implementation.title,
+ implementation.version,
+ implementation.vendor,
+ implementation.vendor.id,
+ implementation.url
+ </property>
+
+
</target>
+ <!-- ================================================================== -->
+ <!-- Module Pass-through Targets -->
+ <!-- ================================================================== -->
+
+ <!--
+ | These targets will execute all configured modules with the specified
+ | target.
+ -->
+ <target name="modules-all" depends="_buildmagic:modules:all" />
+ <target name="modules-most" depends="_buildmagic:modules:most" />
+ <target name="modules-main" depends="_buildmagic:modules:main"/>
+ <target name="modules-release" depends="_buildmagic:modules:release"/>
+ <target name="modules-tests" depends="_buildmagic:modules:tests"/>
+ <target name="modules-clean" depends="_buildmagic:modules:clean"/>
+ <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
+ <target name="modules-docs" depends="_buildmagic:modules:docs"/>
+
<!--+====================================================================+-->
<!--| Module Pass-through Hooks |-->
<!--| |-->
@@ -209,7 +269,7 @@
<!--| Generate all documentation for this module. |-->
<!--+====================================================================+-->
- <target name="docs" depends="_default:docs">
+ <target name="docs">
<!-- Add module specific elements here. -->
</target>
@@ -224,7 +284,7 @@
<target name="release-full"
description="Builds the full release structure."
- depends="modules-all, release"/>
+ depends="modules-most, release"/>
<!--+====================================================================+-->
Property changes on: labs/jbossbuild/buildmagic/trunk/build/etc
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Modified: labs/jbossbuild/buildmagic/trunk/common/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/common/build.xml 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/common/build.xml 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY libraries SYSTEM "../tools/etc/buildfragments/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildmagic/tools.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildmagic/defaults.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
<!-- $Id$ -->
@@ -20,7 +19,7 @@
<!--| Buildmagic extentions. |-->
<!--+======================================================================+-->
-<project default="main" name="JBoss/Common">
+<project default="main" name="JBoss/Common" xmlns:artifact="urn:maven-artifact-ant">
<!--+====================================================================+-->
<!--| Setup |-->
@@ -32,11 +31,14 @@
<!--+====================================================================+-->
&buildmagic;
- &libraries;
- &modules;
&defaults;
&tools;
- &targets;
+ <echo>source path: ${source.java}</echo>
+
+ <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks-2.0.9.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant"
+ classpathref="maven-ant-tasks.classpath" />
<!--+====================================================================+-->
@@ -46,7 +48,7 @@
<!--| 'init'. |-->
<!--+====================================================================+-->
- <target name="init" depends="_default:init">
+ <target name="init" depends="_buildmagic:init">
<!-- Add module specific elements here. -->
</target>
@@ -63,22 +65,42 @@
<!-- Module name(s) & version -->
<property name="module.name" value="common"/>
<property name="module.Name" value="JBoss/Common"/>
+
+ <property name="javac.excludes" value="org/jboss/util/**/jmx/*,**/ObjectNameEditor.java"/>
+ <echo>javac excludes : ${javac.excludes}</echo>
- <!-- Configure thirdparty libraries -->
- <dependency-manager
+ <!-- Configure thirdparty libraries using maven-->
+ <artifact:dependencies pathId="library.classpath">
+ <dependency groupId="log4j" artifactId="log4j"
+ version="1.2.4"/>
+ <dependency groupId="slide" artifactId="webdavlib"
+ version="1.0.16" />
+ <dependency groupId="commons-httpclient" artifactId="commons-httpclient"
+ version="1.0" />
+ <dependency groupId="junit" artifactId="junit"
+ version="3.7" />
+ <dependency groupId="gnu-regexp" artifactId="gnu-regexp"
+ version="1.1.4" />
+ <!--<dependency groupId="com.sun.jmx" artifactId="jmxri"
+ version="1.2" /> -->
+ <dependency groupId="dom4j" artifactId="dom4j"
+ version="1.3" />
+ </artifact:dependencies>
+
+ <!--<dependency-manager
cacheDir="${project.thirdparty.cache}"
metadataFile="${project.root}/build/.metadata/${module.name}.tstamp"
dependencyFile="${module.root}/dependencies.xml"
offline="${dependency-manager.offline}"
pathID="library.classpath">
<repository url="http://jboss.sf.net/buildmagic/thirdparty" type="jboss"/>
- </dependency-manager>
+ </dependency-manager>-->
<!-- Required for XDoclet until tools depends are handled by DM -->
- <call target="configure-libraries"/>
+ <!--<call target="configure-libraries"/>-->
<!-- Configure modules -->
- <call target="configure-modules"/>
+ <!--<call target="configure-modules"/>-->
<path id="dependentmodule.classpath">
</path>
@@ -107,15 +129,14 @@
<target name="compile"
description="Compile all source files."
- depends="compile-mbean-sources,
- _default:compile-classes,
+ depends="_default:compile-classes,
_default:compile-etc,
_default:compile-test-classes">
<!-- Add module specific elements here. -->
</target>
<!-- Compile mbeans with XDoclet -->
- <target name="compile-mbean-sources" depends="init">
+ <!--<target name="compile-mbean-sources" depends="init">
<mkdir dir="${build.gen-src}"/>
<jmxdoclet destdir="${build.gen-src}" excludedtags="@version, at author">
<fileset dir="${source.java}">
@@ -124,13 +145,13 @@
<mbeaninterface mergedir="${project.tools}/etc/xdoclet/templates"/>
</jmxdoclet>
- </target>
+ </target>-->
<!--+====================================================================+-->
<!--| test this module |-->
<!--| |-->
<!--+====================================================================+-->
- <target name="tests" depends="_default:tests"/>
+ <!--<target name="tests" depends="_buildmagic:tests"/>-->
<!--+====================================================================+-->
@@ -143,10 +164,10 @@
<target name="output"
description="Generate all target output."
- depends="_buildmagic:build-bypass-check"
+ depends="_buildmagic:build-bypass-check, compile"
unless="build-bypass.on">
- <call target="compile"/>
+ <!--<call target="compile"/>-->
<mkdir dir="${build.lib}"/>
@@ -175,7 +196,7 @@
</jar>
<!-- Generate checksums -->
- <call target="_default:compile-checksums"/>
+ <!--<call target="_default:compile-checksums"/>-->
<!-- Update the build marker to allow bypassing -->
<touch file="${build-bypass.marker}"/>
@@ -189,7 +210,7 @@
<!--| Generate all documentation for this module. |-->
<!--+====================================================================+-->
- <target name="docs" depends="_default:docs">
+ <target name="docs" >
<!-- Add module specific elements here. -->
</target>
@@ -200,18 +221,18 @@
<!--| Standard targets and psuedo-targets. |-->
<!--+====================================================================+-->
- <target name="clean" depends="_default:clean">
+ <target name="clean" depends="_buildmagic:clean">
<!-- Add module specific elements here. -->
</target>
- <target name="clobber" depends="_default:clobber">
+ <target name="clobber" depends="_buildmagic:clobber">
<!-- Add module specific elements here. -->
</target>
<!-- main, all, most and help are primary psuedo-targets -->
<target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
+ <target name="all"/>
+ <target name="most" depends="output"/>
+ <target name="help"/>
</project>
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/etc
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/interception
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/appender
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/layout
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/util
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/file
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/http
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/njar
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/net/protocol/resource
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/coerce
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/collection
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/file
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/id
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/jmx
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/naming
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/platform
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/property
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/property/jmx
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/propertyeditor
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/state
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/stream
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/timeout
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/xml
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/test
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/test/org
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/test/org/jboss
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/test/org/jboss/util
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/common/src/test/org/jboss/util/propertyeditor
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Modified: labs/jbossbuild/buildmagic/trunk/tasks/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/build.xml 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tasks/build.xml 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildmagic/tools.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildmagic/defaults.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
<!-- $Id$ -->
@@ -19,7 +19,7 @@
<!--| Buildmagic extentions. |-->
<!--+======================================================================+-->
-<project default="main" name="Buildmagic/Tasks">
+<project default="main" name="Buildmagic/Tasks" xmlns:artifact="urn:maven-artifact-ant">
<!--+====================================================================+-->
<!--| Setup |-->
@@ -31,11 +31,13 @@
<!--+====================================================================+-->
&buildmagic;
- &modules;
&defaults;
&tools;
- &targets;
+ <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks-2.0.9.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant"
+ classpathref="maven-ant-tasks.classpath" />
<!--+====================================================================+-->
<!--| Initialization |-->
@@ -44,8 +46,8 @@
<!--| 'init'. |-->
<!--+====================================================================+-->
- <target name="init" depends="_default:init">
- <!-- Add module specific elements here. -->
+ <target name="init" depends="_buildmagic:init">
+
</target>
@@ -66,21 +68,35 @@
<!--| Library & Module Dependencies. |-->
<!--+================================+-->
- <!-- Configure thirdparty libraries -->
- <dependency-manager
+ <!-- Configure thirdparty libraries using maven -->
+
+ <artifact:dependencies pathId="library.classpath">
+ <dependency groupId="log4j" artifactId="log4j"
+ version="1.2.4"/>
+ <dependency groupId="bsf" artifactId="bsf"
+ version="2.2" />
+ <dependency groupId="jboss" artifactId="jboss-common"
+ version="1.0.3.GA" />
+ </artifact:dependencies>
+
+ <!--<dependency-manager
cacheDir="${project.thirdparty.cache}"
metadataFile="${project.root}/build/.metadata/${module.name}.tstamp"
dependencyFile="${module.root}/dependencies.xml"
offline="${dependency-manager.offline}"
pathID="library.classpath">
<repository url="http://jboss.sf.net/buildmagic/thirdparty" type="jboss"/>
- </dependency-manager>
+ </dependency-manager>-->
<!-- Configure modules -->
- <call target="configure-modules"/>
+ <path id="jboss.common.root" path="../common"/>
+ <property name="jboss.common.root" value="../common"/>
+
+
+ <!--<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.common.classpath"/>
- </path>
+ </path>-->
<!--+=======================================+-->
<!--| Override any default properties here. |-->
@@ -144,7 +160,7 @@
</fileset>
<!-- Include required classes from common -->
- <fileset dir="${jboss.common.root}/classes">
+ <fileset dir="${jboss.common.root}/output/classes">
<include name="org/jboss/net/protocol/**"/>
<include name="org/jboss/logging/*.class"/>
<include name="org/jboss/util/DirectoryBuilder*.class"/>
@@ -162,34 +178,23 @@
<!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs" depends="_default:docs">
- <!-- Add module specific elements here. -->
- </target>
-
-
- <!--+====================================================================+-->
<!--| Misc. |-->
<!--| |-->
<!--| Standard targets and psuedo-targets. |-->
<!--+====================================================================+-->
- <target name="clean" depends="_default:clean">
+ <target name="clean" depends="_buildmagic:clean">
<!-- Add module specific elements here. -->
</target>
- <target name="clobber" depends="_default:clobber">
+ <target name="clobber" depends="_buildmagic:clobber">
<!-- Add module specific elements here. -->
</target>
<!-- main, all, most and help are primary psuedo-targets -->
<target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
+ <target name="all"/>
+ <target name="most" depends="output"/>
+ <target name="help"/>
</project>
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/bin
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/etc
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/oevren
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/oevren/ant
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/oevren/ant/greebo
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/util
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/resources
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss/tools
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss/tools/buildmagic
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/resources/org/jboss/tools/buildmagic/task
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty/apache-commons
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty/apache-commons/lib
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty/apache-slide
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty/apache-slide/client
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty/apache-slide/client/lib
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty/xdoclet-xdoclet
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/thirdparty/xdoclet-xdoclet/lib
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tools
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/bin
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/ant
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/ant 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/ant 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,24 +1,77 @@
#! /bin/sh
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-# reserved.
+# Copyright 2001-2005 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
-# load system-wide ant configuration
-if [ -f "/etc/ant.conf" ] ; then
- . /etc/ant.conf
-fi
+# Extract launch and ant arguments, (see details below).
+ant_exec_args=
+no_config=false
+use_jikes_default=false
+ant_exec_debug=false
+show_help=false
+for arg in "$@" ; do
+ if [ "$arg" = "--noconfig" ] ; then
+ no_config=true
+ elif [ "$arg" = "--usejikes" ] ; then
+ use_jikes_default=true
+ elif [ "$arg" = "--execdebug" ] ; then
+ ant_exec_debug=true
+ elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then
+ show_help=true
+ ant_exec_args="$ant_exec_args -h"
+ else
+ if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then
+ show_help=true
+ fi
+ ant_exec_args="$ant_exec_args \"$arg\""
+ fi
+done
-# provide default values for people who don't use RPMs
-if [ -z "$rpm_mode" ] ; then
- rpm_mode=false;
+# Source/default ant configuration
+if $no_config ; then
+ rpm_mode=false
+ usejikes=$use_jikes_default
+else
+ # load system-wide ant configuration
+ if [ -f "/etc/ant.conf" ] ; then
+ . /etc/ant.conf
+ fi
+
+ # load user ant configuration
+ if [ -f "$HOME/.ant/ant.conf" ] ; then
+ . $HOME/.ant/ant.conf
+ fi
+ if [ -f "$HOME/.antrc" ] ; then
+ . "$HOME/.antrc"
+ fi
+
+ # provide default configuration values
+ if [ -z "$rpm_mode" ] ; then
+ rpm_mode=false
+ fi
+ if [ -z "$usejikes" ] ; then
+ usejikes=$use_jikes_default
+ fi
fi
-if [ -z "$usejikes" ] ; then
- usejikes=false;
-fi
-# load user ant configuration
-if [ -f "$HOME/.antrc" ] ; then
- . "$HOME/.antrc"
+# Setup Java environment in rpm mode
+if $rpm_mode ; then
+ if [ -f /usr/share/java-utils/java-functions ] ; then
+ . /usr/share/java-utils/java-functions
+ set_jvm
+ set_javacmd
+ fi
fi
# OS specific support. $var _must_ be set to either true or false.
@@ -28,43 +81,29 @@
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
esac
-if [ -z "$ANT_HOME" ] ; then
- # try to find ANT
- if [ -d /opt/ant ] ; then
- ANT_HOME=/opt/ant
- fi
-
- if [ -d "${HOME}/opt/ant" ] ; then
- ANT_HOME="${HOME}/opt/ant"
- fi
-
+if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
## resolve links - $0 may be a link to ant's home
PRG="$0"
progname=`basename "$0"`
- saveddir=`pwd`
# need this for relative symlinks
- cd `dirname "$PRG"`
-
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
else
- PRG=`dirname "$PRG"`"/$link"
+ PRG=`dirname "$PRG"`"/$link"
fi
done
-
+
ANT_HOME=`dirname "$PRG"`/..
- cd "$saveddir"
-
# make it fully qualified
ANT_HOME=`cd "$ANT_HOME" && pwd`
fi
@@ -75,90 +114,98 @@
ANT_HOME=`cygpath --unix "$ANT_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
# set ANT_LIB location
ANT_LIB="${ANT_HOME}/lib"
-if [ -z "$JAVACMD" ] ; then
+if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
- JAVACMD=java
+ JAVACMD=`which java 2> /dev/null `
+ if [ -z "$JAVACMD" ] ; then
+ JAVACMD=java
+ fi
fi
fi
-
+
if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly."
echo " We cannot execute $JAVACMD"
exit 1
fi
-if [ -n "$CLASSPATH" ] ; then
- LOCALCLASSPATH="$CLASSPATH"
-fi
-
-# in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
-if $rpm_mode; then
- JAVALIBDIR=/usr/share/java
- for i in ant ant-optional jaxp_parser xml_apis
- do
- if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH="$JAVALIBDIR/$i.jar"
- else
- LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
+# Build local classpath using just the launcher in non-rpm mode or
+# use the Jpackage helper in rpm mode with basic and default jars
+# specified in the ant.conf configuration. Because the launcher is
+# used, libraries linked in ANT_HOME will also be include, but this
+# is discouraged as it is not java-version safe. A user should
+# request optional jars and their dependencies via the OPT_JAR_LIST
+# variable
+if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
+ LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+ # If the user requested to try to add some other jars to the classpath
+ if [ -n "$OPT_JAR_LIST" ] ; then
+ _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
+ if [ -n "$_OPTCLASSPATH" ] ; then
+ LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH"
fi
- done
-
- # in rpm mode ant/lib is in /usr/share/java/ant
- ANT_LIB="${JAVALIBDIR}/ant"
-fi
-
-# add in the dependency .jar files in non-RPM mode (the default)
-for i in "${ANT_LIB}"/*.jar
-do
- # if the directory is empty, then it will return the input string
- # this is stupid, so case for it
- if [ -f "$i" ] ; then
- if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH="$i"
- else
- LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
- fi
fi
-done
-if [ -n "$JAVA_HOME" ] ; then
+ # Explicitly add javac path to classpath, assume JAVA_HOME set
+ # properly in rpm mode
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
fi
-
if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
fi
+ # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
+ # user CLASSPATH first and ant-found jars after.
+ # In that case, the user CLASSPATH will override ant-found jars
+ #
+ # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
+ # with ant-found jars first and user CLASSPATH after
+ if [ -n "$CLASSPATH" ] ; then
+ # merge local and specified classpath
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH="$CLASSPATH"
+ elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
+ LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
+ else
+ LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
+ fi
+
+ # remove class path from launcher -cp option
+ CLASSPATH=""
+ fi
+else
+ # not using rpm_mode; use launcher to determine classpaths
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+ else
+ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
+ fi
+fi
+
+if [ -n "$JAVA_HOME" ] ; then
# OSX hack to make Ant work with jikes
if $darwin ; then
- OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
- if [ -d ${OSXHACK} ] ; then
- for i in ${OSXHACK}/*.jar
+ OSXHACK="${JAVA_HOME}/../Classes"
+ if [ -d "${OSXHACK}" ] ; then
+ for i in "${OSXHACK}"/*.jar
do
JIKESPATH="$JIKESPATH:$i"
done
fi
fi
-else
- echo "Warning: JAVA_HOME environment variable is not set."
- echo " If build fails because sun.* classes could not be found"
- echo " you will need to set the JAVA_HOME environment variable"
- echo " to the installation directory of java."
fi
# Allow Jikes support (off by default)
@@ -166,27 +213,87 @@
ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
fi
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin, switch paths to appropriate format before running java
+# For PATHs convert to unix format first, then to windows format to ensure
+# both formats are supported. Probably this will fail on directories with ;
+# in the name in the path. Let's assume that paths containing ; are more
+# rare than windows style paths on cygwin.
if $cygwin; then
- ANT_HOME=`cygpath --path --windows "$ANT_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
- CYGHOME=`cygpath --path --windows "$HOME"`
+ if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
+ format=mixed
+ else
+ format=windows
+ fi
+ ANT_HOME=`cygpath --$format "$ANT_HOME"`
+ ANT_LIB=`cygpath --$format "$ANT_LIB"`
+ JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+ LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+ LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
+ if [ -n "$CLASSPATH" ] ; then
+ CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+ CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
+ fi
+ CYGHOME=`cygpath --$format "$HOME"`
fi
+# Show script help if requested
+if $show_help ; then
+ echo $0 '[script options] [options] [target [target2 [target3] ..]]'
+ echo 'Script Options:'
+ echo ' --help, --h print this message and ant help'
+ echo ' --noconfig suppress sourcing of /etc/ant.conf,'
+ echo ' $HOME/.ant/ant.conf, and $HOME/.antrc'
+ echo ' configuration files'
+ echo ' --usejikes enable use of jikes by default, unless'
+ echo ' set explicitly in configuration files'
+ echo ' --execdebug print ant exec line generated by this'
+ echo ' launch script'
+ echo ' '
+fi
+# add a second backslash to variables terminated by a backslash under cygwin
+if $cygwin; then
+ case "$ANT_HOME" in
+ *\\ )
+ ANT_HOME="$ANT_HOME\\"
+ ;;
+ esac
+ case "$CYGHOME" in
+ *\\ )
+ CYGHOME="$CYGHOME\\"
+ ;;
+ esac
+ case "$JIKESPATH" in
+ *\\ )
+ JIKESPATH="$JIKESPATH\\"
+ ;;
+ esac
+ case "$LOCALCLASSPATH" in
+ *\\ )
+ LOCALCLASSPATH="$LOCALCLASSPATH\\"
+ ;;
+ esac
+ case "$CLASSPATH" in
+ *\\ )
+ CLASSPATH="$CLASSPATH\\"
+ ;;
+ esac
+fi
+# Execute ant using eval/exec to preserve spaces in paths,
+# java options, and ant args
+ant_sys_opts=
if [ -n "$CYGHOME" ]; then
if [ -n "$JIKESPATH" ]; then
- JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" -Dcygwin.user.home="$CYGHOME" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+ ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
else
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+ ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\""
fi
else
if [ -n "$JIKESPATH" ]; then
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
- else
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+ ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
-
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+if $ant_exec_debug ; then
+ echo $ant_exec_command
+fi
+eval $ant_exec_command
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/ant.bat
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/ant.bat 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/ant.bat 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,11 +1,23 @@
@echo off
-REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-REM reserved.
+REM Copyright 2001,2004-2005 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
set DEFAULT_ANT_HOME=%~dp0..
@@ -13,6 +25,8 @@
if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
set DEFAULT_ANT_HOME=
+set _USE_CLASSPATH=yes
+
rem Slurp the command line arguments. This loop allows for an unlimited number
rem of arguments (up to the command line limit, anyway).
set ANT_CMD_LINE_ARGS=%1
@@ -20,31 +34,39 @@
shift
:setupArgs
if ""%1""=="""" goto doneStart
+if ""%1""==""-noclasspath"" goto clearclasspath
set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
shift
goto setupArgs
-rem This label provides a place for the argument list loop to break out
+
+rem here is there is a -noclasspath in the options
+:clearclasspath
+set _USE_CLASSPATH=no
+shift
+goto setupArgs
+
+rem This label provides a place for the argument list loop to break out
rem and for NT handling to skip to.
+
:doneStart
-
rem find ANT_HOME if it does not exist due to either an invalid value passed
rem by the user or the %0 problem on Windows 9x
-if exist "%ANT_HOME%" goto checkJava
+if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
-rem check for ant in Program Files on system drive
-if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
-set ANT_HOME=%SystemDrive%\Program Files\ant
+rem check for ant in Program Files
+if not exist "%ProgramFiles%\ant" goto checkSystemDrive
+set ANT_HOME=%ProgramFiles%\ant
goto checkJava
:checkSystemDrive
rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\nul goto checkCDrive
+if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
set ANT_HOME=%SystemDrive%\ant
goto checkJava
:checkCDrive
rem check for ant in C:\ant for Win9X users
-if not exist C:\ant\nul goto noAntHome
+if not exist C:\ant\lib\ant.jar goto noAntHome
set ANT_HOME=C:\ant
goto checkJava
@@ -53,42 +75,51 @@
goto end
:checkJava
-set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" %%i
+set _JAVACMD=%JAVACMD%
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-set _JAVACMD=%JAVA_HOME%\bin\java.exe
-if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\tools.jar"
-if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\classes.zip"
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
goto checkJikes
:noJavaHome
-set _JAVACMD=java.exe
-echo.
-echo Warning: JAVA_HOME environment variable is not set.
-echo If build fails because sun.* classes could not be found
-echo you will need to set the JAVA_HOME environment variable
-echo to the installation directory of java.
-echo.
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
:checkJikes
if not "%JIKESPATH%"=="" goto runAntWithJikes
:runAnt
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
+if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
+if not "%CLASSPATH%"=="" goto runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
goto end
+:runAntNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+goto end
+
:runAntWithJikes
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
+if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
+if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
+
+:runAntWithJikesNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
goto end
+:runAntWithJikesAndClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+goto end
+
:end
-set LOCALCLASSPATH=
set _JAVACMD=
set ANT_CMD_LINE_ARGS=
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
:mainEnd
if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
Added: labs/jbossbuild/buildmagic/trunk/tools/bin/ant.cmd
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/ant.cmd (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/ant.cmd 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,92 @@
+/*
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Run ant
+*/
+
+'@echo off'
+parse arg mode envarg '::' antarg
+
+if mode\='.' & mode\='..' & mode\='/' then do
+ envarg = mode envarg
+ mode = ''
+end
+
+if antarg = '' then do
+ antarg = envarg
+ envarg = ''
+end
+
+x = setlocal()
+
+env="OS2ENVIRONMENT"
+antenv = _getenv_('antenv')
+if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
+
+if mode = '' then mode = _getenv_('ANT_MODE' '..')
+if mode \= '/' then do
+ runrc = _getenv_('runrc')
+ antrc = _getenv_('antrc' 'antrc.cmd')
+ if mode = '..' then mode = '-r'
+ else mode = ''
+ interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
+end
+
+if _testenv_() = 0 then do
+ say 'Ant environment is not set properly'
+ x = endlocal()
+ exit 16
+end
+
+settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
+
+java = _getenv_('javacmd' 'java')
+opts = value('ANT_OPTS',,env)
+args = value('ANT_ARGS',,env)
+lcp = value('LOCALCLASSPATH',,env)
+cp = value('CLASSPATH',,env)
+if value('ANT_USE_CP',,env) \= '' then do
+ if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
+ lcp = lcp || cp
+ 'SET CLASSPATH='
+end
+if lcp\='' then lcp = '-classpath' lcp
+
+cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
+launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
+if launcher = '' then entry = 'org.apache.tools.ant.Main'
+else entry = 'org.apache.tools.ant.launch.Launcher'
+java opts lcp entry settings args antarg
+
+x = endlocal()
+
+return rc
+
+_testenv_: procedure expose env ANT_HOME JAVA_HOME
+ANT_HOME = value('ANT_HOME',,env)
+if ANT_HOME = '' then return 0
+JAVA_HOME = value('JAVA_HOME',,env)
+if JAVA_HOME = '' then return 0
+cp = translate(value('CLASSPATH',,env))
+if pos(translate(ANT_HOME), cp) = 0 then return 0
+if pos(translate(JAVA_HOME), cp) = 0 then return 0
+return 1
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/bin/ant.cmd
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/antRun
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/antRun 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/antRun 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,7 +1,21 @@
-#! /bin/sh
+#!/bin/sh
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-# reserved.
+#
+# Copyright 2001-2002,2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
# Args: DIR command
cd "$1"
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.bat
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.bat 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.bat 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,9 +1,24 @@
@echo off
-REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-REM reserved.
+REM
+REM Copyright 2001-2002,2004-2005 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM
+REM
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
if ""%1""=="""" goto runCommand
@@ -28,4 +43,5 @@
%ANT_RUN_CMD%
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.pl
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.pl 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/antRun.pl 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,4 +1,19 @@
#!/usr/bin/perl
+#
+# Copyright 2001,2003-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
#######################################################################
#
# antRun.pl
@@ -7,7 +22,6 @@
# this is akin to antRun.bat, and antRun the SH script
#
# created: 2001-10-18
-# last modified: 2001-11-13
# author: Jeff Tulley jtulley at novell.com
#######################################################################
#be fussy about variables
Added: labs/jbossbuild/buildmagic/trunk/tools/bin/antenv.cmd
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/antenv.cmd (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/antenv.cmd 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,99 @@
+/*
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Ant environment
+*/
+
+'@echo off'
+call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
+call SysLoadFuncs
+
+/* Prepare the parameters for later use */
+parse arg argv
+mode = ''
+args = ''
+opts = ''
+cp = ''
+lcp = ''
+
+do i = 1 to words(argv)
+ param = word(argv, i)
+ select
+ when param='-lcp' then mode = 'l'
+ when param='-cp' | param='-classpath' then mode = 'c'
+ when abbrev('-opts', param, 4) then mode = 'o'
+ when abbrev('-args', param, 4) then mode = 'a'
+ otherwise
+ select
+ when mode = 'a' then args = space(args param, 1)
+ when mode = 'c' then cp = space(cp param, 1)
+ when mode = 'l' then lcp = space(lcp param, 1)
+ when mode = 'o' then opts = space(opts param, 1)
+ otherwise
+ say 'Option' param 'ignored'
+ end
+ end
+end
+
+env="OS2ENVIRONMENT"
+antconf = _getenv_('antconf' 'antconf.cmd')
+runrc = _getenv_('runrc')
+interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
+ANT_HOME = value('ANT_HOME',,env)
+JAVA_HOME = value('JAVA_HOME',,env)
+classpath = value('CLASSPATH',,env)
+classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+
+classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
+'SET CLASSPATH=' || classpath
+
+/* Setting classpathes, options and arguments */
+envset = _getenv_('envset')
+if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
+if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
+if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
+if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
+
+exit 0
+
+addpath: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if substr(path, length(path)) = ';' then glue = ''
+else glue = ';'
+if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
+return path
+
+prepend: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
+return path
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/bin/antenv.cmd
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/complete-ant-cmd.pl
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/complete-ant-cmd.pl 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/complete-ant-cmd.pl 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,8 +1,19 @@
#!/usr/bin/perl
#
-# Copyright (c) 2001 The Apache Software Foundation. All rights
-# reserved.
+# Copyright 2001,2004 The Apache Software Foundation
#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# A script to allow Bash or Z-Shell to complete an Ant command-line.
#
# To install for Bash 2.0 or better, add the following to ~/.bashrc:
Added: labs/jbossbuild/buildmagic/trunk/tools/bin/envset.cmd
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/envset.cmd (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/envset.cmd 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,130 @@
+/*
+
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+SET environment variables
+First optional parameter:
+ ; parameters are considered parts of a path variable, semicolons are
+ appended to each element if not already present
+ -D parameters are properties for Java or Makefile etc., -D will be
+ prepended and the parameters will be separated by a space
+ =D the same as above but equal sign is not required
+ , parameters should be comma separated in the environment variable
+ - parameters should be separated by the next parameter
+ Other values mean that the first parameter is missing and the environment
+ variable will be set to the space separated parameters
+
+Second parameter: name of the environment variable
+
+Next parameters: values
+; implies that the equal sign is considered a part of the parameter and is
+not interpreted
+
+-D requires parameters in the form name=value. If the equal sign is not found,
+the parameters are changed to name=expanded_name
+
+Other options have optional equal sign. If it is found, only the part after
+the equal sign will be oprionally expanded.
+
+If the parameter is the minus sign, the next parameter will not be expanded.
+If the parameter is a single dot, it will be replaced with the value of the
+environment variable as it existed before envset was invoked.
+
+For other parameters the batch looks for the environment variable with the
+same name (in uppercase). If it is found, it forms the expanded_name. If
+the environment variable with such a name does not exist, the expanded_name
+will hold the parameter name without case conversion.
+*/
+
+parse arg mode envar args
+
+equal = 0
+sep = ' '
+
+/* Parse command line parameters */
+select
+ when mode='-' then do
+ sep = envar
+ parse var args envar args
+ end
+ when mode=';' then do
+ sep = ''
+ equal = -1
+ end
+ when mode='-D' then equal = 1
+ when mode='=D' then mode = '-D'
+ when mode=',' then sep = ','
+otherwise
+ args = envar args
+ envar = mode
+ mode = ''
+end
+
+env = 'OS2ENVIRONMENT'
+envar = translate(envar)
+orig = value(envar,,env)
+newval = ''
+expand = 1
+
+/* for each parameter... */
+do i = 1 to words(args)
+ if expand > 0 & word(args, i) = '-' then expand = 0
+ else call addval word(args, i)
+end
+
+/* Optionally enclose path variable by quotes */
+if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
+
+/* Set the new value, 'SET' cannot be used since it does not allow '=' */
+x = value(envar, newval, env)
+exit 0
+
+addval: procedure expose sep equal orig expand newval mode env
+parse arg var
+
+if var = '.' then expvar = orig
+else do
+ if equal >= 0 then do
+ parse var var name '=' val
+ if val = '' then var = name
+ else var = val
+ end
+ if expand = 0 then expvar = var
+ else expvar = value(translate(var),,env)
+ if expvar = '' then expvar = var
+ if equal >= 0 then do
+ if val = '' then do
+ parse var expvar key '=' val
+ if val <> '' then name = key
+ else do
+ if equal > 0 then val = key
+ else name = key
+ end
+ end
+ else val = expvar
+ if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
+ if val = '' then expvar = name
+ else expvar = name || '=' || val
+ end
+ if mode = '-D' then expvar = '-D' || expvar
+ if mode = ';' then do
+ if right(expvar, 1) <> ';' then expvar = expvar || ';'
+ end
+end
+
+if newval = '' then newval = expvar
+else newval = newval || sep || expvar
+expand = 1
+return
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/bin/envset.cmd
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/lcp.bat
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/lcp.bat 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/lcp.bat 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,5 +1,19 @@
-REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-REM reserved.
+REM
+REM Copyright 2001-2004 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM
+REM
set _CLASSPATHCOMPONENT=%1
if ""%1""=="""" goto gotAllArgs
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/runant.pl
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/runant.pl 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/runant.pl 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,8 +1,19 @@
#!/usr/bin/perl
#
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-# reserved.
+# Copyright 2000-2004 The Apache Software Foundation
#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
#######################################################################
#
# runant.pl
@@ -18,7 +29,6 @@
# the code is not included.
#
# created: 2000-8-24
-# last modified: 2000-8-24
# author: Steve Loughran steve_l at sourceforge.net
#######################################################################
#
@@ -39,7 +49,7 @@
#use warnings;
#and set $debug to 1 to turn on trace info
-my $debug=0;
+my $debug=1;
#######################################################################
#
@@ -61,6 +71,8 @@
$onnetware = 1;
}
+my $oncygwin = ($^O eq "cygwin");
+
#ISSUE: what java wants to split up classpath varies from platform to platform
#and perl is not too hot at hinting which box it is on.
#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed.
@@ -72,53 +84,7 @@
}
#build up standard classpath
-my $localpath=$ENV{CLASSPATH};
-if ($localpath eq "")
- {
- print "warning: no initial classpath\n" if ($debug);
- $localpath="";
- }
-if ($onnetware == 1)
-{
-# avoid building a command line bigger than 512 characters - make localpath
-# only include the "extra" stuff, and add in the system classpath as an expanded
-# variable.
- $localpath="";
-}
-
-#add jar files. I am sure there is a perl one liner to do this.
-my $jarpattern="$HOME/lib/*.jar";
-my @jarfiles =glob($jarpattern);
-print "jarfiles=@jarfiles\n" if ($debug);
-my $jar;
-foreach $jar (@jarfiles )
- {
- $localpath.="$s$jar";
- }
-
-#if Java home is defined, look for tools.jar & classes.zip and add to classpath
-my $JAVA_HOME = $ENV{JAVA_HOME};
-if ($JAVA_HOME ne "")
- {
- my $tools="$JAVA_HOME/lib/tools.jar";
- if (-e "$tools")
- {
- $localpath .= "$s$tools";
- }
- my $classes="$JAVA_HOME/lib/classes.zip";
- if (-e $classes)
- {
- $localpath .= "$s$classes";
- }
- }
-else
- {
- print "\n\nWarning: JAVA_HOME environment variable is not set.\n".
- "If the build fails because sun.* classes could not be found\n".
- "you will need to set the JAVA_HOME environment variable\n".
- "to the installation directory of java\n";
- }
-
+my $localpath = "$HOME/lib/ant-launcher.jar";
#set JVM options and Ant arguments, if any
my @ANT_OPTS=split(" ", $ENV{ANT_OPTS});
my @ANT_ARGS=split(" ", $ENV{ANT_ARGS});
@@ -131,22 +97,46 @@
#construct arguments to java
my @ARGS;
-if ($onnetware == 1)
-{
-# make classpath literally $CLASSPATH; and then the contents of $localpath
-# this is to avoid pushing us over the 512 character limit
-# even skip the ; - that is already in $localpath
- push @ARGS, "-classpath", "\$CLASSPATH$localpath";
+push @ARGS, @ANT_OPTS;
+
+my $CYGHOME = "";
+
+my $classpath=$ENV{CLASSPATH};
+if ($oncygwin == 1) {
+ $localpath = `cygpath --path --windows $localpath`;
+ chomp ($localpath);
+ if (! $classpath eq "")
+ {
+ $classpath = `cygpath --path --windows "$classpath"`;
+ chomp ($classpath);
+ }
+ $HOME = `cygpath --path --windows $HOME`;
+ chomp ($HOME);
+ $CYGHOME = `cygpath --path --windows $ENV{HOME}`;
+ chomp ($CYGHOME);
}
-else
+push @ARGS, "-classpath", "$localpath";
+push @ARGS, "-Dant.home=$HOME";
+if ( ! $CYGHOME eq "" )
{
- push @ARGS, "-classpath", "$localpath";
+ push @ARGS, "-Dcygwin.user.home=\"$CYGHOME\""
}
-push @ARGS, "-Dant.home=$HOME";
-push @ARGS, @ANT_OPTS;
-push @ARGS, "org.apache.tools.ant.Main", @ANT_ARGS;
+push @ARGS, "org.apache.tools.ant.launch.Launcher", @ANT_ARGS;
push @ARGS, @ARGV;
-
+if (! $classpath eq "")
+{
+ if ($onnetware == 1)
+ {
+ # make classpath literally $CLASSPATH
+ # this is to avoid pushing us over the 512 character limit
+ # even skip the ; - that is already in $localpath
+ push @ARGS, "-lib", "\$CLASSPATH";
+ }
+ else
+ {
+ push @ARGS, "-lib", "$classpath";
+ }
+}
print "\n $JAVACMD @ARGS\n\n" if ($debug);
my $returnValue = system $JAVACMD, @ARGS;
Modified: labs/jbossbuild/buildmagic/trunk/tools/bin/runant.py
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/runant.py 2008-08-25 10:55:17 UTC (rev 21889)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/runant.py 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,23 +1,34 @@
#!/usr/bin/python
+# Copyright 2001,2003-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
"""
runant.py
- This script is a translation of the runant.pl written by Steve Loughran.
- It runs ant with/out arguments, it should be quite portable (thanks to
- the python os library)
- This script has been tested with Python2.0/Win2K
+ This script is a translation of the runant.pl written by Steve Loughran.
+ It runs ant with/out arguments, it should be quite portable (thanks to
+ the python os library)
+ This script has been tested with Python2.0/Win2K
- Copyright (c) 2001 The Apache Software Foundation. All rights
- reserved.
-
created: 2001-04-11
author: Pierre Dittgen pierre.dittgen at criltelecom.com
Assumptions:
- the "java" executable/script is on the command path
- - ANT_HOME has been set
"""
import os, os.path, string, sys
@@ -25,75 +36,65 @@
debug = 0
#######################################################################
-#
-# check to make sure environment is setup
-#
-if not os.environ.has_key('ANT_HOME'):
- print '\n\nANT_HOME *MUST* be set!\n\n'
- sys.exit(1)
-else:
- ANT_HOME = os.environ['ANT_HOME']
-if not os.environ.has_key('JAVACMD'):
- JAVACMD = 'java'
+# If ANT_HOME is not set default to script's parent directory
+if os.environ.has_key('ANT_HOME'):
+ ANT_HOME = os.environ['ANT_HOME']
else:
- JAVACMD = os.environ['JAVACMD']
+ ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
-# Sets the separator char for CLASSPATH
-SEPARATOR = ':'
-if os.name == 'dos' or os.name == 'nt':
- SEPARATOR = ';'
+# set ANT_LIB location
+ANT_LIB = os.path.join(ANT_HOME, 'lib')
-# Build up standard classpath
-localpath = ''
-if os.environ.has_key('CLASSPATH'):
- localpath = os.environ['CLASSPATH']
+# set JAVACMD (check variables JAVACMD and JAVA_HOME)
+JAVACMD = None
+if not os.environ.has_key('JAVACMD'):
+ if os.environ.has_key('JAVA_HOME'):
+ if not os.path.exists(os.environ['JAVA_HOME']):
+ print "Warning: JAVA_HOME is not defined correctly."
+ else:
+ JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java')
+ else:
+ print "Warning: JAVA_HOME not set."
else:
- if debug:
- print 'Warning: no initial classpath\n'
+ JAVACMD = os.environ['JAVACMD']
+if not JAVACMD:
+ JAVACMD = 'java'
-# Add jar files
-LIBDIR = os.path.join(ANT_HOME, 'lib')
-jarfiles = []
-for file in os.listdir(LIBDIR):
- if file[-4:] == '.jar':
- jarfiles.append(os.path.join(LIBDIR,file))
-if debug:
- print 'Jar files:'
- for jar in jarfiles:
- print jar
-localpath = localpath + SEPARATOR + string.join(jarfiles, SEPARATOR)
+launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
+if not os.path.exists(launcher_jar):
+ print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \
+ ANT_LIB
-# If JAVA_HOME is defined, look for tools.jar & classes.zip
-# and add to classpath
-if os.environ.has_key('JAVA_HOME') and os.environ['JAVA_HOME'] != '':
- JAVA_HOME = os.environ['JAVA_HOME']
- TOOLS = os.path.join(JAVA_HOME, os.path.join('lib', 'tools.jar'))
- if os.path.exists(TOOLS):
- localpath = localpath + SEPARATOR + TOOLS
- CLASSES = os.path.join(JAVA_HOME, os.path.join('lib', 'classes.zip'))
- if os.path.exists(CLASSES):
- localpath = localpath + SEPARATOR + CLASSES
-else:
- print '\n\nWarning: JAVA_HOME environment variable is not set.\n', \
- 'If the build fails because sun.* classes could not be found\n', \
- 'you will need to set the JAVA_HOME environment variable\n', \
- 'to the installation directory of java\n'
+# Build up standard classpath (LOCALCLASSPATH)
+LOCALCLASSPATH = launcher_jar
+if os.environ.has_key('LOCALCLASSPATH'):
+ LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
-# Jikes
-ANT_OPTS = []
+ANT_OPTS = ""
if os.environ.has_key('ANT_OPTS'):
- ANT_OPTS = string.split(os.environ['ANT_OPTS'])
+ ANT_OPTS = os.environ['ANT_OPTS']
+
+OPTS = ""
if os.environ.has_key('JIKESPATH'):
- ANT_OPTS.append('-Djikes.class.path=' + os.environ['JIKESPATH'])
+ OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
+ANT_ARGS = ""
+if os.environ.has_key('ANT_ARGS'):
+ ANT_ARGS = os.environ['ANT_ARGS']
+
+CLASSPATH = ""
+if os.environ.has_key('CLASSPATH'):
+ CLASSPATH = os.environ['CLASSPATH']
+
# Builds the commandline
-cmdline = '%s -classpath %s -Dant.home=%s %s org.apache.tools.ant.Main %s' \
- % (JAVACMD, localpath, ANT_HOME, string.join(ANT_OPTS,' '), \
- string.join(sys.argv[1:], ' '))
+cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
+ 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
+ % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
+ CLASSPATH, string.join(sys.argv[1:], ' '))
if debug:
- print '\n%s\n\n' % (cmdline)
+ print '\n%s\n\n' % (cmdline)
# Run the biniou!
os.system(cmdline)
Added: labs/jbossbuild/buildmagic/trunk/tools/bin/runrc.cmd
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/bin/runrc.cmd (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/bin/runrc.cmd 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,59 @@
+/*
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Run RC file, name is in the first arg, second arg is either PATH
+ ENV or -r or nothing
+*/
+
+parse arg name path rest
+
+if name = '' then do
+ say 'RC file name is missing'
+ exit 1
+end
+
+if rest \= '' then do
+ say 'Too many parameters'
+ exit 1
+end
+
+call runit name path
+exit 0
+
+runit: procedure
+parse arg name path dir
+
+if path \= '' & path \= '-r' then do
+ dir = value(translate(path),,'OS2ENVIRONMENT')
+ if dir = '' then return
+ dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
+end
+
+if dir = '' then dir = directory()
+
+if path = '-r' then do /* recursive call */
+ subdir = filespec('path', dir)
+ if subdir \= '\' then do
+ subdir = left(subdir, length(subdir)-1)
+ call runit name path filespec('drive', dir) || subdir
+ end
+end
+
+/* Look for the file and run it */
+if right(dir, 1) \= '\' then dir = dir || '\'
+rcfile = stream(dir || name, 'c', 'query exists')
+if rcfile \= '' then interpret 'call "' || rcfile || '"'
+
+return
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/bin/runrc.cmd
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/etc
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic (from rev 21628, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
output
.settings
local.properties
Added: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/aliases.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/aliases.ent (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/aliases.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,97 @@
+<!-- list of aliases used to bridge gap between buildmagic defs and jbossbuild -->
+
+
+<path id="apache.commons.classpath">
+ <pathelement path="${apache.collections.lib}/commons-collections.jar"/>
+ <pathelement path="${apache.logging.lib}/commons-logging.jar"/>
+ <pathelement path="${apache.httpclient.lib}/commons-httpclient.jar"/>
+ <pathelement path="${apache.pool.lib}/commons-pool.jar"/>
+ <pathelement path="${apache.discovery.lib}/commons-discovery.jar"/>
+ <pathelement path="${apache.fileupload.lib}/commons-fileupload.jar"/>
+ <pathelement path="${apache.lang.lib}/commons-lang-2.0.jar"/>
+</path>
+
+<path id="sax.classpath">
+ <pathelement path="${xml-sax.classpath}"/>
+</path>
+
+<property name="xdoclet-xdoclet.lib" value="${xdoclet.xdoclet.lib}"/>
+<path id="xdoclet.task.classpath">
+ <path refid="xdoclet.xdoclet.classpath"/>
+</path>
+
+<property name="gjt.jpl-util.lib" value="${gjt.jpl.util.lib}"/>
+<path id="gjt.jpl-util.classpath">
+ <path refid="gjt.jpl.util.classpath"/>
+</path>
+
+<property name="opennms.joesnmp.lib" value="${joesnmp.joesnmp.lib}"/>
+<path id="opennms.joesnmp.classpath">
+ <path refid="joesnmp.joesnmp.classpath"/>
+</path>
+
+<path id="jacorb.idl.classpath">
+ <path refid="apache.avalon.logkit.classpath"/>
+ <pathelement path="${jacorb.jacorb.lib}/idl.jar"/>
+</path>
+
+<property name="jacorb.idl.include" value="${jacorb.jacorb.resources}"/>
+<property name="jacorb.jacorb.properties" value="${jacorb.jacorb.resources}"/>
+
+<property name="sleepycat.lib" value="${sleepycat.sleepycat.lib}"/>
+<path id="sleepycat.classpath">
+ <path refid="sleepycat.sleepycat.classpath"/>
+</path>
+
+<property name="apache.tomcat55.root" value="${apache.tomcat.root}"/>
+<property name="apache.tomcat55.lib" value="${apache.tomcat.lib}"/>
+<path id="apache.tomcat55.classpath">
+ <path refid="apache.tomcat.classpath"/>
+</path>
+
+<property name="trove.lib" value="${trove.trove.lib}"/>
+<path id="trove.classpath">
+ <path refid="trove.trove.classpath"/>
+</path>
+
+<path id="qdox.classpath">
+ <path refid="qdox.qdox.classpath"/>
+</path>
+
+<property name="javassist.lib" value="${javassist.javassist.lib}"/>
+<path id="javassist.classpath">
+ <path refid="javassist.javassist.classpath"/>
+</path>
+
+<property name="hibernate.lib" value="${hibernate.hibernate.lib}"/>
+<path id="hibernate3.classpath">
+ <path refid="hibernate.hibernate.classpath"/>
+</path>
+
+<property name="odmg.lib" value="${odmg.odmg.lib}"/>
+<path id="odmg.classpath">
+ <path refid="odmg.odmg.classpath"/>
+</path>
+
+<property name="cglib.lib" value="${cglib.cglib.lib}"/>
+<path id="cglib.classpath">
+ <path refid="cglib.cglib.classpath"/>
+</path>
+
+<path id="ejb3-persistence.classpath">
+ <path refid="hibernate.annotations.classpath"/>
+ <path refid="hibernate.entitymanager.classpath"/>
+</path>
+
+<property name="spring.lib" value="${spring.spring.lib}"/>
+<path id="spring.classpath">
+ <path refid="spring.spring.classpath"/>
+</path>
+
+<!-- Ant -->
+<property name="apache.ant.root" value="${project.tools}"/>
+<property name="apache.ant.lib" value="${apache.ant.root}/lib"/>
+<path id="apache.ant.classpath">
+ <pathelement path="${apache.ant.lib}/ant.jar"/>
+</path>
+
\ No newline at end of file
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/aliases.ent
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/autoload.properties
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/autoload.properties 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/autoload.properties 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,42 +0,0 @@
-### ====================================================================== ###
-## ##
-## BuildMagic tasks which will be autoloaded. ##
-## ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-### Stuff that glues things together ###
-
-resolveproperties=org.jboss.tools.buildmagic.task.ResolveProperties
-resolver=org.jboss.tools.buildmagic.task.ResolveProperties
-propertyfilter=org.jboss.tools.buildmagic.task.PropertyFilter
-require=org.jboss.tools.buildmagic.task.Require
-call=org.jboss.tools.buildmagic.task.CallTarget
-Ant=org.jboss.tools.buildmagic.task.Ant
-
-### Project/Module tasks ###
-
-execmodules=org.jboss.tools.buildmagic.task.module.ExecuteModules
-projectinfo=org.jboss.tools.buildmagic.task.module.ProjectInfo
-moduleinfo=org.jboss.tools.buildmagic.task.module.ModuleInfo
-moduleconfig=org.jboss.tools.buildmagic.task.module.ModuleConfig
-moduleinit=org.jboss.tools.buildmagic.task.module.ModuleInit
-
-### Configuration Helpers ###
-library=org.jboss.tools.buildmagic.task.config.Library
-modulelibrary=org.jboss.tools.buildmagic.task.config.ModuleLibrary
-libraryset=org.jboss.tools.buildmagic.task.config.LibrarySet
-
-### Misc ###
-
-projecthelp=org.jboss.tools.buildmagic.task.ProjectHelp
-_puke=org.jboss.tools.buildmagic.task.util.Puke
-_dump=org.jboss.tools.buildmagic.task.util.Dump
-
-### Unused ??? ###
-
-#set=org.jboss.tools.buildmagic.task.Set
-#unset=org.jboss.tools.buildmagic.task.Unset
-#appendpath=org.jboss.tools.buildmagic.task.AppendPath
-#findroot=org.jboss.tools.buildmagic.task.FindRoot
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/autoload.properties (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/autoload.properties)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/autoload.properties (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/autoload.properties 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,42 @@
+### ====================================================================== ###
+## ##
+## BuildMagic tasks which will be autoloaded. ##
+## ##
+### ====================================================================== ###
+
+### $Id$ ###
+
+### Stuff that glues things together ###
+
+resolveproperties=org.jboss.tools.buildmagic.task.ResolveProperties
+resolver=org.jboss.tools.buildmagic.task.ResolveProperties
+propertyfilter=org.jboss.tools.buildmagic.task.PropertyFilter
+require=org.jboss.tools.buildmagic.task.Require
+call=org.jboss.tools.buildmagic.task.CallTarget
+Ant=org.jboss.tools.buildmagic.task.Ant
+
+### Project/Module tasks ###
+
+execmodules=org.jboss.tools.buildmagic.task.module.ExecuteModules
+projectinfo=org.jboss.tools.buildmagic.task.module.ProjectInfo
+moduleinfo=org.jboss.tools.buildmagic.task.module.ModuleInfo
+moduleconfig=org.jboss.tools.buildmagic.task.module.ModuleConfig
+moduleinit=org.jboss.tools.buildmagic.task.module.ModuleInit
+
+### Configuration Helpers ###
+library=org.jboss.tools.buildmagic.task.config.Library
+modulelibrary=org.jboss.tools.buildmagic.task.config.ModuleLibrary
+libraryset=org.jboss.tools.buildmagic.task.config.LibrarySet
+
+### Misc ###
+
+projecthelp=org.jboss.tools.buildmagic.task.ProjectHelp
+_puke=org.jboss.tools.buildmagic.task.util.Puke
+_dump=org.jboss.tools.buildmagic.task.util.Dump
+
+### Unused ??? ###
+
+#set=org.jboss.tools.buildmagic.task.Set
+#unset=org.jboss.tools.buildmagic.task.Unset
+#appendpath=org.jboss.tools.buildmagic.task.AppendPath
+#findroot=org.jboss.tools.buildmagic.task.FindRoot
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/buildmagic.ent 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,270 +0,0 @@
-<!-- $Id$ -->
-
-<!-- ================================================================== -->
-<!-- Initialization -->
-<!-- ================================================================== -->
-
-<!-- Initialize the build system. -->
-<target name="_buildmagic:init" unless="init.disable">
-
- <!-- Make sure we have the right version of Ant -->
- <property name="buildmagic.ant.baseversion" value="1.5"/>
-
- <!--
- | Add new conditions for other supported Ant versions when they
- | become avaialble.
- -->
-
- <condition property="buildmagic.ant.compatible">
- <and>
- <contains string="${ant.version}"
- substring="Ant version ${buildmagic.ant.baseversion}"/>
- </and>
- </condition>
-
- <fail unless="buildmagic.ant.compatible">
-
- Unsupported Ant version:
-
- ${ant.version}
-
- Please install a version which is compatible with Ant ${buildmagic.ant.baseversion}.
-
- </fail>
-
- <!-- JDK Detection -->
- <available classname="java.lang.Void" property="HAVE_JDK_1.1"/>
- <available classname="java.lang.ThreadLocal" property="HAVE_JDK_1.2"/>
- <available classname="java.lang.StrictMath" property="HAVE_JDK_1.3"/>
- <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
-
- <!-- 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.thirdparty.cache" value="${project.root}/thirdparty-cache"/>
-
- <!-- 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"/>
- <property name="module.thirdparty" value="${module.root}/thirdparty"/>
-
- <!-- Load Buildmagic extention tasks. -->
- <property name="buildmagic.local.classpath" value="."/>
- <path id="buildmagic.task.classpath">
- <fileset dir="${project.tools}/lib">
- <include name="*"/>
- </fileset>
- <pathelement location="${project.tools}/lib"/>
- <pathelement location="${project.tools}/etc"/>
- <pathelement location="${project.tools}"/>
- <pathelement path="${buildmagic.local.classpath}"/>
- </path>
- <taskdef file="${project.tools}/etc/buildfragments/autoload.properties"
- classpathref="buildmagic.task.classpath"/>
- <taskdef name="property" classname="org.jboss.tools.buildmagic.task.Property"
- classpathref="buildmagic.task.classpath"/>
- <taskdef name="dependency-manager"
- classname="oevren.ant.greebo.FetchDependencyTask"
- classpathref="buildmagic.task.classpath"/>
-
- <!-- Include user and project property overrides. -->
- <property file="${project.build}/local.properties"/>
- <property file="${user.home}/.buildmagic.properties"/>
- <property file="${user.home}/.ant.properties"/>
-
- <call target="_buildmagic:init:local-properties">
- <available file="${module.root}/etc/local.properties-example"
- property="init.have-local-properties"/>
- </call>
-
- <!-- Setup the build.log -->
- <call target="_buildmagic:init:buildlog" unless="init-buildlog.disable"/>
-
- <!-- Load common properties -->
- <property file="${project.tools}/etc/buildfragments/common.properties"/>
-
- <!-- 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}"/>
-
- <!-- Invoke the configure task -->
- <call target="configure" unless="configure.disable"/>
-
- <!-- Load common task properties -->
- <property file="${project.tools}/etc/buildfragments/task.properties"/>
-
- <property name="build-bypass.marker" value="${module.output}/build-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>
-
-<!-- Install the local.properties example if it is there -->
-<target name="_buildmagic:init:local-properties">
- <!-- Setup the local.properties file as needed -->
- <copy file="${module.root}/etc/local.properties-example"
- tofile="${module.root}/local.properties" filtering="yes"/>
- <property file="${module.root}/local.properties"/>
-</target>
-
-<!-- Initialize the build.log -->
-<target name="_buildmagic:init:buildlog">
- <property name="buildlog.level" value="info"/>
- <record name="${basedir}/build.log" append="no" loglevel="${buildlog.level}"/>
- <property name="init-buildlog.disable" value="true" system="true"/>
-</target>
-
-<!-- Show the running environment if -Dinit.verbose=true -->
-<target name="_buildmagic:init:show-environment">
- <echo><![CDATA[
-project.root: ${project.root}
-module.root: ${module.root}
-user.home: ${user.home}
-build.compiler: ${build.compiler}
-java.home: ${java.home}
-java.class.path: ${java.class.path}
-java.version: ${java.version}
-java.vendor: ${java.vendor}
-java.vm.version: ${java.vm.version}
-java.vm.name: ${java.vm.name}
-java.vm.info: ${java.vm.info}
-os.name: ${os.name}
-os.arch: ${os.arch}
-os.version: ${os.version}
-]]></echo>
-</target>
-
-<!-- ================================================================== -->
-<!-- Build Bypass -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:build-bypass-checker" depends="init" unless="build-bypass.disabled">
-
- <uptodate property="build-bypass.on" targetfile="${build-bypass.marker}">
- <srcfiles dir="${module.source}" includes="**/*"/>
- <srcfiles dir="${module.root}" includes="build.xml,local.properties"/>
- <srcfiles dir="${project.root}" includes="build/build.xml,build/local.properties"/>
- </uptodate>
-
-</target>
-
-<target name="_buildmagic:build-bypass-notice" if="build-bypass.on">
- <echo>
-Build disabled because module is already built. To force the module
-to build define build-bypass.disabled=true.
- </echo>
-</target>
-
-<target name="_buildmagic:build-bypass-check" depends="_buildmagic:build-bypass-checker, _buildmagic:build-bypass-notice"/>
-
-
-<!-- ================================================================== -->
-<!-- Cleaning -->
-<!-- ================================================================== -->
-
-<!-- Clean up all build output -->
-<target name="_buildmagic:clean" depends="init">
- <delete dir="${module.output}"/>
-</target>
-
-<!-- Clean up all generated files -->
-<target name="_buildmagic:clobber" depends="init">
- <delete file="${module.root}/local.properties"/>
-
- <!-- Try to stop the build log before we delete the file. -->
- <record name="${module.root}/build.log" action="stop"/>
-
- <!--
- | This file may be opened still due and fail to be removed on win32
- | systems, so lets just ignore those errors for now.
- -->
- <delete file="${module.root}/build.log" quiet="true" failonerror="false"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Help -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:help:standard" depends="init">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-<target name="_buildmagic:help:build" depends="init">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -Dgroups=<group>[(,<group>)*] Specify the module groups.
- -Dmodules=<module>[(,<module>)*] Specify the modules.
- (overrides groups).
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Release -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:release:zip" depends="init">
- <zip zipfile="${module.output}/${release.id}.zip">
- <fileset dir="${module.output}">
- <include name="${release.id}/**"/>
- </fileset>
- </zip>
-</target>
-
-<target name="_buildmagic:release:tar" depends="init">
- <tar tarfile="${module.output}/${release.id}.tar" longfile="gnu"
- basedir="${module.output}"
- includes="${release.id}/**">
- </tar>
-</target>
-
-<target name="_buildmagic:release:tgz" depends="_buildmagic:release:tar">
- <gzip src="${module.output}/${release.id}.tar"
- zipfile="${module.output}/${release.id}.tgz"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Install -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:install:default" depends="init">
- <!-- Copy the output directory to the install directory -->
- <mkdir dir="${install.root}"/>
- <copy todir="${install.root}" filtering="no">
- <fileset dir="${module.output}">
- <include name="**/*"/>
- <exclude name="${install.id}/**"/>
- </fileset>
- </copy>
-</target>
-
-
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/buildmagic.ent)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,565 @@
+<!-- $Id$ -->
+
+<!-- ================================================================== -->
+<!-- Initialization -->
+<!-- ================================================================== -->
+
+<!-- Initialize the build system. -->
+<target name="_buildmagic: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"/>
+
+ <!--
+ | 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.ant.baseversion}.
+
+ </fail>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Void" property="HAVE_JDK_1.1"/>
+ <available classname="java.lang.ThreadLocal" property="HAVE_JDK_1.2"/>
+ <available classname="java.lang.StrictMath" property="HAVE_JDK_1.3"/>
+ <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
+
+ <!-- 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.thirdparty.cache" value="${project.root}/thirdparty-cache"/>
+
+ <!-- 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"/>
+ <property name="module.thirdparty" value="${module.root}/thirdparty"/>
+
+ <!-- Load Buildmagic extention tasks. -->
+ <property name="buildmagic.local.classpath" value="."/>
+ <path id="buildmagic.task.classpath">
+ <fileset dir="${project.tools}/lib">
+ <include name="*"/>
+ </fileset>
+ <pathelement location="${project.tools}/lib"/>
+ <pathelement location="${project.tools}/etc"/>
+ <pathelement location="${project.tools}"/>
+ <pathelement path="${buildmagic.local.classpath}"/>
+ </path>
+ <taskdef file="${project.tools}/etc/buildmagic/autoload.properties"
+ classpathref="buildmagic.task.classpath"/>
+ <taskdef name="property" classname="org.jboss.tools.buildmagic.task.Property"
+ classpathref="buildmagic.task.classpath"/>
+ <taskdef name="dependency-manager"
+ classname="oevren.ant.greebo.FetchDependencyTask"
+ classpathref="buildmagic.task.classpath"/>
+
+ <!-- Include user and project property overrides. -->
+ <property file="${project.build}/local.properties"/>
+ <property file="${user.home}/.buildmagic.properties"/>
+ <property file="${user.home}/.ant.properties"/>
+
+ <call target="_buildmagic:init:local-properties">
+ <available file="${module.root}/etc/local.properties-example"
+ property="init.have-local-properties"/>
+ </call>
+
+ <!-- Setup the build.log -->
+ <call target="_buildmagic:init:buildlog" unless="init-buildlog.disable"/>
+
+ <!-- Load common properties -->
+ <property file="${project.tools}/etc/buildmagic/common.properties"/>
+
+ <!-- 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}"/>
+
+ <!-- Invoke the configure task -->
+ <call target="configure" unless="configure.disable"/>
+
+ <!-- Load common task properties -->
+ <property file="${project.tools}/etc/buildmagic/task.properties"/>
+
+ <property name="build-bypass.marker" value="${module.output}/build-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>
+
+<!-- Install the local.properties example if it is there -->
+<target name="_buildmagic:init:local-properties">
+ <!-- Setup the local.properties file as needed -->
+ <copy file="${module.root}/etc/local.properties-example"
+ tofile="${module.root}/local.properties" filtering="yes"/>
+ <property file="${module.root}/local.properties"/>
+</target>
+
+<!-- Initialize the build.log -->
+<target name="_buildmagic:init:buildlog">
+ <property name="buildlog.level" value="info"/>
+ <record name="${basedir}/build.log" append="no" loglevel="${buildlog.level}"/>
+ <property name="init-buildlog.disable" value="true" system="true"/>
+</target>
+
+<!-- Show the running environment if -Dinit.verbose=true -->
+<target name="_buildmagic:init:show-environment">
+ <echo><![CDATA[
+project.root: ${project.root}
+module.root: ${module.root}
+user.home: ${user.home}
+build.compiler: ${build.compiler}
+java.home: ${java.home}
+java.class.path: ${java.class.path}
+java.version: ${java.version}
+java.vendor: ${java.vendor}
+java.vm.version: ${java.vm.version}
+java.vm.name: ${java.vm.name}
+java.vm.info: ${java.vm.info}
+os.name: ${os.name}
+os.arch: ${os.arch}
+os.version: ${os.version}
+]]></echo>
+</target>
+
+<!-- ================================================================== -->
+<!-- Build Bypass -->
+<!-- ================================================================== -->
+
+<target name="_buildmagic:build-bypass-checker" depends="init" unless="build-bypass.disabled">
+
+ <uptodate property="build-bypass.on" targetfile="${build-bypass.marker}">
+ <srcfiles dir="${module.source}" includes="**/*"/>
+ <srcfiles dir="${module.root}" includes="build.xml,local.properties"/>
+ <srcfiles dir="${project.root}" includes="build/build.xml,build/local.properties"/>
+ </uptodate>
+
+</target>
+
+<target name="_buildmagic:build-bypass-notice" if="build-bypass.on">
+ <echo>
+Build disabled because module is already built. To force the module
+to build define build-bypass.disabled=true.
+ </echo>
+</target>
+
+<target name="_buildmagic:build-bypass-check" depends="_buildmagic:build-bypass-checker, _buildmagic:build-bypass-notice"/>
+
+<!-- ================================================================== -->
+<!-- Compile -->
+<!-- ================================================================== -->
+
+<!-- Compile all class files -->
+<target name="_default:compile-classes" depends="init" unless="compile.disable">
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Hack, required to avoid duplicate javac targets -->
+ <mkdir dir="${build.gen-src}"/>
+
+ <!-- Remove classes which depend on changed files, so they will rebuild. -->
+ <depend srcdir="${source.java}:${build.gen-src}"
+ destdir="${build.classes}"
+ dump="${javac.depend.dump}"
+ closure="${javac.depend.closure}">
+ <include name="${javac.includes}"/>
+ <exclude name="${javac.excludes}"/>
+ </depend>
+
+ <javac destdir="${build.classes}"
+ optimize="${javac.optimize}"
+ target="${javac.target}"
+ source="${javac.source}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ includes="${javac.includes}"
+ excludes="${javac.excludes}"
+ failonerror="${javac.fail.onerror}">
+ <!--<bootclasspath>
+ <path refid="javac.bootclasspath"/>
+ </bootclasspath>-->
+ <src path="${source.java}:${build.gen-src}"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+</target>
+
+<!--
+ | Compile mbeans
+ -->
+
+<target name="_buildmagic:mbean-bypass-checker" depends="init" unless="mbean-bypass.disabled">
+ <uptodate property="mbean-bypass.on" targetfile="${mbean-bypass.marker}">
+ <srcfiles dir="${source.java}" includes="${mbean.includes}"/>
+ </uptodate>
+
+</target>
+<target name="_default:compile-mbean-sources"
+ depends="_buildmagic:mbean-bypass-checker"
+ unless="mbean-bypass.on">
+
+ <taskdef name="jmxdoclet"
+ classname="xdoclet.modules.jmx.JMXDocletTask"
+ classpathref="xdoclet.task.classpath"/>
+
+ <mkdir dir="${build.gen-src}"/>
+
+ <jmxdoclet destdir="${build.gen-src}"
+ excludedtags="@version, at author">
+ <fileset dir="${source.java}"
+ includes="${mbean.includes}"/>
+ <mbeaninterface mergedir="${project.tools}/etc/xdoclet/templates"/>
+ </jmxdoclet>
+
+ <touch file="${mbean-bypass.marker}"/>
+</target>
+<target name="_default:compile-xmbean-sources"
+ depends="_buildmagic:mbean-bypass-checker"
+ unless="mbean-bypass.on">
+
+ <taskdef name="jmxdoclet"
+ classname="xdoclet.modules.jmx.JMXDocletTask"
+ classpathref="xdoclet.task.classpath"/>
+
+ <mkdir dir="${build.gen-src}"/>
+
+ <jmxdoclet destdir="${build.gen-src}"
+ excludedtags="@version, at author">
+ <fileset dir="${source.java}"
+ includes="${mbean.includes}"/>
+ <mbeaninterface mergedir="${project.tools}/etc/xdoclet/templates"/>
+ <jbossxmbean/>
+ </jmxdoclet>
+
+ <touch file="${mbean-bypass.marker}"/>
+</target>
+
+<!-- Compile all module test class files -->
+<target name="_default:compile-test-classes" depends="init" unless="compile.disable">
+
+ <mkdir dir="${build.test}"/>
+
+ <!-- Hack, required to avoid duplicate javac targets -->
+ <mkdir dir="${build.gen.test}"/>
+
+ <!-- Remove classes which depend on changed files, so they will rebuild. -->
+ <depend srcdir="${source.test}:${build.gen.test}"
+ destdir="${build.test}"
+ dump="${javac.depend.dump}"
+ closure="${javac.depend.closure}">
+ <include name="${javac.includes}"/>
+ <exclude name="${javac.excludes}"/>
+ </depend>
+
+ <javac destdir="${build.test}"
+ optimize="${javac.optimize}"
+ target="${javac.target}"
+ source="${javac.source}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ includes="${javac.includes}"
+ excludes="${javac.excludes}"
+ failonerror="${javac.fail.onerror}">
+ <src path="${source.test}:${build.gen.test}"/>
+ <classpath>
+ <path refid="javac.classpath"/>
+ <pathelement location="${build.classes}"/>
+ </classpath>
+ </javac>
+</target>
+
+<!-- Compile manifests -->
+<target name="_default:compile-etc" depends="init" unless="compile.disable">
+ <mkdir dir="${build.etc}"/>
+ <copy todir="${build.etc}" filtering="yes">
+ <fileset dir="${source.etc}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+</target>
+
+<!-- Compile resource files -->
+<target name="_default:compile-resources" depends="init" unless="compile.disable">
+ <mkdir dir="${build.resources}"/>
+ <copy todir="${build.resources}" filtering="yes">
+ <fileset dir="${source.resources}">
+ <patternset refid="compile-resources.filter.pattern"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.resources}" filtering="no">
+ <fileset dir="${source.resources}">
+ <patternset refid="compile-resources.pattern"/>
+ </fileset>
+ </copy>
+</target>
+
+<patternset id="compile-resources.filter.pattern">
+ <include name="**/*"/>
+</patternset>
+
+<patternset id="compile-resources.pattern">
+ <exclude name="INVALID_FILE_DOES_NOT_EXISTS"/>
+</patternset>
+
+<!-- Compile stylesheets files -->
+<target name="_default:compile-stylesheets" depends="init" unless="compile.disable">
+ <mkdir dir="${build.stylesheets}"/>
+ <copy todir="${build.stylesheets}" filtering="yes">
+ <fileset dir="${source.stylesheets}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+</target>
+
+<!-- ================================================================== -->
+<!-- Cleaning -->
+<!-- ================================================================== -->
+
+<!-- Clean up all build output -->
+<target name="_buildmagic:clean" depends="init">
+ <delete dir="${module.output}"/>
+</target>
+
+<!-- Clean up all generated files -->
+<target name="_buildmagic:clobber" depends="init">
+ <delete file="${module.root}/local.properties"/>
+
+ <!-- Try to stop the build log before we delete the file. -->
+ <record name="${module.root}/build.log" action="stop"/>
+
+ <!--
+ | This file may be opened still due and fail to be removed on win32
+ | systems, so lets just ignore those errors for now.
+ -->
+ <delete file="${module.root}/build.log" quiet="true" failonerror="false"/>
+</target>
+
+
+<!-- ================================================================== -->
+<!-- Help -->
+<!-- ================================================================== -->
+
+<target name="_buildmagic:help:standard" depends="init">
+ <projecthelp taskname="help">
+ <header><![CDATA[
+ The ${module.Name} module.
+]]></header>
+ <footer><![CDATA[
+ -projecthelp for all targets
+ -help for full options
+]]></footer>
+ </projecthelp>
+</target>
+
+<target name="_buildmagic:help:build" depends="init">
+ <projecthelp taskname="help">
+ <header><![CDATA[
+ The ${module.Name} module.
+]]></header>
+ <footer><![CDATA[
+ -Dgroups=<group>[(,<group>)*] Specify the module groups.
+ -Dmodules=<module>[(,<module>)*] Specify the modules.
+ (overrides groups).
+ -projecthelp for all targets
+ -help for full options
+]]></footer>
+ </projecthelp>
+</target>
+
+
+<!-- ================================================================== -->
+<!-- Release -->
+<!-- ================================================================== -->
+
+<target name="_buildmagic:release:zip" depends="init">
+ <zip zipfile="${module.output}/${release.id}.zip">
+ <fileset dir="${module.output}">
+ <include name="${release.id}/**"/>
+ </fileset>
+ </zip>
+</target>
+
+<target name="_buildmagic:release:tar" depends="init">
+ <tar tarfile="${module.output}/${release.id}.tar" longfile="gnu"
+ basedir="${module.output}"
+ includes="${release.id}/**">
+ </tar>
+</target>
+
+<target name="_buildmagic:release:tgz" depends="_buildmagic:release:tar">
+ <gzip src="${module.output}/${release.id}.tar"
+ zipfile="${module.output}/${release.id}.tgz"/>
+</target>
+
+
+<!-- ================================================================== -->
+<!-- Install -->
+<!-- ================================================================== -->
+
+<target name="_buildmagic:install:default" depends="init">
+ <!-- Copy the output directory to the install directory -->
+ <mkdir dir="${install.root}"/>
+ <copy todir="${install.root}" filtering="no">
+ <fileset dir="${module.output}">
+ <include name="**/*"/>
+ <exclude name="${install.id}/**"/>
+ </fileset>
+ </copy>
+</target>
+
+
+<!-- ================================================================== -->
+<!-- Module Pass-through Targets -->
+<!-- ================================================================== -->
+
+<!-- Invoke the 'all' on all configured modules -->
+<target name="_buildmagic:modules:all" depends="init">
+ <execmodules target="all"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}"
+ exportproperties="${executemodules.exportproperties}">
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ </execmodules>
+</target>
+
+<!-- Invoke the 'most' on all configured modules -->
+<target name="_buildmagic:modules:most" depends="init">
+ <execmodules target="most"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}"
+ exportproperties="${executemodules.exportproperties}">
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ </execmodules>
+</target>
+
+<!-- Invoke the 'main' on all configured modules -->
+<target name="_buildmagic:modules:main" depends="init">
+ <execmodules target="main"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}"
+ exportproperties="${executemodules.exportproperties}">
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ </execmodules>
+</target>
+
+<!-- Invoke the 'release' on all configured modules -->
+<target name="_buildmagic:modules:release" depends="init">
+ <execmodules target="release"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}"
+ exportproperties="${executemodules.exportproperties}">
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ </execmodules>
+</target>
+
+<!-- Invoke the 'tests' on all configured modules -->
+<target name="_buildmagic:modules:tests" depends="init">
+ <execmodules target="tests"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}"
+ exportproperties="${executemodules.exportproperties}">
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ <property name="build.reports" value="${project.root}/testsuite/output/reports"/>
+ </execmodules>
+</target>
+
+<!-- Invoke the 'clean' on all configured modules -->
+<target name="_buildmagic:modules:clean" depends="init">
+ <execmodules target="clean"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}">
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ </execmodules>
+</target>
+
+<!-- Invoke the 'clobber' on all configured modules -->
+<target name="_buildmagic:modules:clobber" depends="init">
+ <execmodules target="clobber"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}">
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ </execmodules>
+</target>
+
+<!-- Invoke the 'docs' on all configured modules -->
+<target name="_buildmagic:modules:docs" depends="init">
+ <execmodules target="docs"
+ modules="${modules}"
+ root="${project.root}/@MODULE@"
+ skipmissing="${executemodules.skipmissing}">
+ <before target="_module- at MODULE@- at TARGET@-prepare"/>
+ <header message="${executemodules.header}"/>
+ <footer message="${executemodules.footer}"/>
+ <after target="_module- at MODULE@- at TARGET@"/>
+ <property name="init.have-parent" value="true"/>
+ </execmodules>
+</target>
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/common.properties
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/common.properties 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/common.properties 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,36 +0,0 @@
-### ====================================================================== ###
-## ##
-## Copyright (c) 1998-2000 by Jason Dillon <jason at planet57.com> ##
-## ##
-## This file is part of BuildMagic; an extension to Ant. ##
-## ##
-## This library is free software; you can redistribute it and/or modify ##
-## it under the terms of the GNU Lesser General Public License as ##
-## published by the Free Software Foundation; either version 2 of the ##
-## License, or (at your option) any later version. ##
-## ##
-## This library is distributed in the hope that it will be useful, but ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of ##
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ##
-## Lesser General Public License for more details. ##
-## ##
-### ====================================================================== ###
-## ##
-## Common Properties ##
-## ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-buildmagic.resolveproperties.force=false
-buildmagic.propertyfilter.all=true
-
-### Jython Support ###
-
-true=1
-false=0
-
-### Misc ###
-
-/=${file.separator}
-sun.boot.classpath=${sun.boot.class.path}
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/common.properties (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/common.properties)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/common.properties (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/common.properties 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,36 @@
+### ====================================================================== ###
+## ##
+## Copyright (c) 1998-2000 by Jason Dillon <jason at planet57.com> ##
+## ##
+## This file is part of BuildMagic; an extension to Ant. ##
+## ##
+## This library is free software; you can redistribute it and/or modify ##
+## it under the terms of the GNU Lesser General Public License as ##
+## published by the Free Software Foundation; either version 2 of the ##
+## License, or (at your option) any later version. ##
+## ##
+## This library is distributed in the hope that it will be useful, but ##
+## WITHOUT ANY WARRANTY; without even the implied warranty of ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ##
+## Lesser General Public License for more details. ##
+## ##
+### ====================================================================== ###
+## ##
+## Common Properties ##
+## ##
+### ====================================================================== ###
+
+### $Id$ ###
+
+buildmagic.resolveproperties.force=false
+buildmagic.propertyfilter.all=true
+
+### Jython Support ###
+
+true=1
+false=0
+
+### Misc ###
+
+/=${file.separator}
+sun.boot.classpath=${sun.boot.class.path}
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/defaults.ent 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,144 +0,0 @@
-<!-- $Id$ -->
-
-<target name="configure-defaults" unless="configure-defaults.disable">
-
- <!-- =============== -->
- <!-- Module defaults -->
- <!-- =============== -->
-
- <basename property="module.name" file="${basedir}"/>
- <property name="module.Name" value="${ant.project.name}"/>
- <property name="module.version" value="DEV"/>
-
- <property name="version.major" value="UNKNOWN"/>
- <property name="version.minor" value="UNKNOWN"/>
- <property name="version.revision" value="UNKNOWN"/>
- <property name="version.tag" value="UNKNOWN"/>
- <property name="version.name" value="UNKNOWN"/>
-
- <!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="UNKNOWN"/>
-
- <!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}"/>
- <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
-
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://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 Group, LLC"/>
- <property name="implementation.vendor.id" value="${implementation.url}"/>
-
-
- <!-- ========= -->
- <!-- Locations -->
- <!-- ========= -->
-
- <!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main"/>
- <property name="source.docs" value="${module.source}/docs"/>
- <property name="source.etc" value="${module.source}/etc"/>
- <property name="source.examples" value="${module.source}/examples"/>
- <property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/resources"/>
- <property name="source.stylesheets" value="${module.source}/stylesheets"/>
- <property name="source.web" value="${module.source}/web"/>
- <property name="source.test" value="${module.source}/test"/>
-
- <!-- Where build generated files will go -->
- <property name="build.api" value="${module.output}/api"/>
- <property name="build.bin" value="${module.output}/bin"/>
- <property name="build.classes" value="${module.output}/classes"/>
- <property name="build.docs" value="${module.output}/docs"/>
- <property name="build.stylesheets" value="${module.output}/stylesheets"/>
- <property name="build.etc" value="${module.output}/etc"/>
- <property name="build.examples" value="${module.output}/examples"/>
- <property name="build.gen" value="${module.output}/gen"/>
- <property name="build.gen.classes" value="${build.gen}/classes"/>
- <property name="build.jmx-api" value="${module.output}/jmx-api"/>
- <property name="build.jmx-doc" value="${module.output}/jmx-doc"/>
- <property name="build.lib" value="${module.output}/lib"/>
- <property name="build.reports" value="${module.output}/reports"/>
- <property name="build.resources" value="${module.output}/resources"/>
- <property name="build.todo" value="${module.output}/todo"/>
- <property name="build.web" value="${module.output}/web"/>
- <property name="build.log" value="${module.output}/log"/>
- <property name="build.cache" value="${module.output}/cache"/>
- <property name="build.test" value="${module.output}/test"/>
- <property name="build.gen.test" value="${build.gen}/test"/>
-
- <!-- Legacy -->
- <property name="build.metadata" value="${module.output}/metadata"/>
- <property name="build.gen-src" value="${build.gen.classes}"/>
- <property name="source.java" value="${source.classes}"/>
- <property name="source.metadata" value="${module.source}/metadata"/>
-
- <!-- 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}"/>
-
- <property name="install.docs" value="${install.root}/docs"/>
- <property name="install.api" value="${install.docs}/api"/>
- <property name="install.jmx-api" value="${install.docs}/jmx-api"/>
- <property name="install.todo" value="${install.docs}/todo"/>
- <property name="install.examples" value="${install.docs}/examples"/>
- <property name="install.dtd" value="${install.docs}/dtd"/>
- <property name="install.bin" value="${install.root}/bin"/>
- <property name="install.etc" value="${install.root}/etc"/>
- <property name="install.client" value="${install.root}/client"/>
- <property name="install.lib" value="${install.root}/lib"/>
-
-
- <!-- ============= -->
- <!-- Task defaults -->
- <!-- ============= -->
-
- <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates"/>
-
- <!-- Access to environment variables -->
- <property environment="env"/>
-
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
-
- <property name="jar.update" value="true"/>
- <property name="jar.index" value="true"/>
-
- <property name="javac.depend.dump" value="true"/>
- <property name="javac.depend.closure" value="false"/>
- <property name="javac.depend.cachedir" value="${build.cache}/depends"/>
-
- <property name="javac.target" value="1.3"/>
- <property name="rmic.stubVersion" value="1.2"/>
-
- <!-- 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="org.jboss.*"/>
-
- <!-- 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>
\ No newline at end of file
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/defaults.ent)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,144 @@
+<!-- $Id$ -->
+
+<target name="configure-defaults" unless="configure-defaults.disable">
+
+ <!-- =============== -->
+ <!-- Module defaults -->
+ <!-- =============== -->
+
+ <basename property="module.name" file="${basedir}"/>
+ <property name="module.Name" value="${ant.project.name}"/>
+ <property name="module.version" value="DEV"/>
+
+ <property name="version.major" value="UNKNOWN"/>
+ <property name="version.minor" value="UNKNOWN"/>
+ <property name="version.revision" value="UNKNOWN"/>
+ <property name="version.tag" value="UNKNOWN"/>
+ <property name="version.name" value="UNKNOWN"/>
+
+ <!-- This must be set to the CVS tag for any release -->
+ <property name="version.cvstag" value="UNKNOWN"/>
+
+ <!-- Manifest version info -->
+ <property name="specification.title" value="JBoss"/>
+ <property name="specification.version" value="${version.major}.${version.minor}"/>
+ <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
+
+ <property name="implementation.title" value="JBoss [${version.name}]"/>
+ <property name="implementation.url" value="http://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 Group, LLC"/>
+ <property name="implementation.vendor.id" value="${implementation.url}"/>
+
+
+ <!-- ========= -->
+ <!-- Locations -->
+ <!-- ========= -->
+
+ <!-- Where source files live -->
+ <property name="source.classes" value="${module.source}/main"/>
+ <property name="source.docs" value="${module.source}/docs"/>
+ <property name="source.etc" value="${module.source}/etc"/>
+ <property name="source.examples" value="${module.source}/examples"/>
+ <property name="source.bin" value="${module.source}/bin"/>
+ <property name="source.resources" value="${module.source}/resources"/>
+ <property name="source.stylesheets" value="${module.source}/stylesheets"/>
+ <property name="source.web" value="${module.source}/web"/>
+ <property name="source.test" value="${module.source}/test"/>
+
+ <!-- Where build generated files will go -->
+ <property name="build.api" value="${module.output}/api"/>
+ <property name="build.bin" value="${module.output}/bin"/>
+ <property name="build.classes" value="${module.output}/classes"/>
+ <property name="build.docs" value="${module.output}/docs"/>
+ <property name="build.stylesheets" value="${module.output}/stylesheets"/>
+ <property name="build.etc" value="${module.output}/etc"/>
+ <property name="build.examples" value="${module.output}/examples"/>
+ <property name="build.gen" value="${module.output}/gen"/>
+ <property name="build.gen.classes" value="${build.gen}/classes"/>
+ <property name="build.jmx-api" value="${module.output}/jmx-api"/>
+ <property name="build.jmx-doc" value="${module.output}/jmx-doc"/>
+ <property name="build.lib" value="${module.output}/lib"/>
+ <property name="build.reports" value="${module.output}/reports"/>
+ <property name="build.resources" value="${module.output}/resources"/>
+ <property name="build.todo" value="${module.output}/todo"/>
+ <property name="build.web" value="${module.output}/web"/>
+ <property name="build.log" value="${module.output}/log"/>
+ <property name="build.cache" value="${module.output}/cache"/>
+ <property name="build.test" value="${module.output}/test"/>
+ <property name="build.gen.test" value="${build.gen}/test"/>
+
+ <!-- Legacy -->
+ <property name="build.metadata" value="${module.output}/metadata"/>
+ <property name="build.gen-src" value="${build.gen.classes}"/>
+ <property name="source.java" value="${source.classes}"/>
+ <property name="source.metadata" value="${module.source}/metadata"/>
+
+ <!-- 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}"/>
+
+ <property name="install.docs" value="${install.root}/docs"/>
+ <property name="install.api" value="${install.docs}/api"/>
+ <property name="install.jmx-api" value="${install.docs}/jmx-api"/>
+ <property name="install.todo" value="${install.docs}/todo"/>
+ <property name="install.examples" value="${install.docs}/examples"/>
+ <property name="install.dtd" value="${install.docs}/dtd"/>
+ <property name="install.bin" value="${install.root}/bin"/>
+ <property name="install.etc" value="${install.root}/etc"/>
+ <property name="install.client" value="${install.root}/client"/>
+ <property name="install.lib" value="${install.root}/lib"/>
+
+
+ <!-- ============= -->
+ <!-- Task defaults -->
+ <!-- ============= -->
+
+ <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates"/>
+
+ <!-- Access to environment variables -->
+ <property environment="env"/>
+
+ <!-- The combined thirdparty classpath -->
+ <path id="thirdparty.classpath">
+ <path refid="library.classpath"/>
+ <!--<path refid="dependentmodule.classpath"/>-->
+ </path>
+
+ <property name="jar.update" value="true"/>
+ <property name="jar.index" value="true"/>
+
+ <property name="javac.depend.dump" value="true"/>
+ <property name="javac.depend.closure" value="false"/>
+ <property name="javac.depend.cachedir" value="${build.cache}/depends"/>
+
+ <property name="javac.target" value="1.3"/>
+ <property name="rmic.stubVersion" value="1.2"/>
+
+ <!-- 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="org.jboss.*"/>
+
+ <!-- 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>
\ No newline at end of file
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/libraries.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/libraries.ent 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/libraries.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,356 +0,0 @@
-<!-- $Id$ -->
-
-<target name="libraries" depends="configure-libraries"/>
-
-<target name="configure-libraries" unless="configure-libraries.disable">
-
- <!-- Apache BCEL -->
- <property name="apache.bcel.root" value="${project.thirdparty}/apache-bcel"/>
- <property name="apache.bcel.lib" value="${apache.bcel.root}/lib"/>
- <path id="apache.bcel.classpath">
- <pathelement path="${apache.bcel.lib}/bcel.jar"/>
- </path>
-
- <!-- Apache Commons -->
- <property name="apache.commons.root" value="${project.thirdparty}/apache-commons"/>
- <property name="apache.commons.lib" value="${apache.commons.root}/lib"/>
- <path id="apache.commons.classpath">
- <pathelement path="${apache.commons.lib}/commons-collections.jar"/>
- <pathelement path="${apache.commons.lib}/commons-lang-1.0.jar"/>
- <pathelement path="${apache.commons.lib}/commons-logging-api.jar"/>
- <pathelement path="${apache.commons.lib}/commons-pool.jar"/>
- <pathelement path="${apache.commons.lib}/commons-discovery.jar"/>
- <pathelement path="${apache.commons.lib}/commons-fileupload-1.0-beta-1.jar"/>
- </path>
-
- <!-- Apache Log4j -->
- <property name="apache.log4j.root" value="${project.thirdparty}/apache-log4j"/>
- <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
- <path id="apache.log4j.classpath">
- <pathelement path="${apache.log4j.lib}/log4j.jar"/>
- <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
- </path>
-
- <!-- Javassist -->
- <property name="javassist.root" value="${project.thirdparty}/javassist"/>
- <property name="javassist.lib" value="${javassist.root}/lib"/>
- <path id="javassist.classpath">
- <pathelement path="${javassist.lib}/javassist.jar"/>
- </path>
-
- <!-- Apache Xalan -->
- <property name="apache.xalan.root" value="${project.thirdparty}/apache-xalan"/>
- <property name="apache.xalan.lib" value="${apache.xalan.root}/lib"/>
- <path id="apache.xalan.classpath">
- <pathelement path="${apache.xalan.lib}/xml-apis.jar"/>
- <pathelement path="${apache.xalan.lib}/xalan.jar"/>
- </path>
-
- <!-- Apache Struts -->
- <property name="apache.struts.root" value="${project.thirdparty}/apache-struts"/>
- <property name="apache.struts.lib" value="${apache.struts.root}/lib"/>
- <path id="apache.struts.classpath">
- <pathelement path="${apache.struts.lib}/struts.jar"/>
- </path>
-
- <!-- Apache Lucene -->
- <property name="apache.lucene.root" value="${project.thirdparty}/apache-lucene"/>
- <property name="apache.lucene.lib" value="${apache.lucene.root}/lib"/>
- <path id="apache.lucene.classpath">
- <pathelement path="${apache.lucene.lib}/lucene-1.2.jar"/>
- </path>
-
- <!-- Apache Slide -->
- <property name="apache.slide.root" value="${project.thirdparty}/apache-slide"/>
- <property name="apache.slide.lib" value="${apache.slide.root}/client/lib"/>
- <path id="apache.slide.classpath">
- <pathelement path="${apache.slide.lib}/webdavlib.jar"/>
- <pathelement path="${apache.slide.lib}/commons-httpclient.jar"/>
- </path>
-
- <!-- GNU Regex -->
- <property name="gnu.regexp.root" value="${project.thirdparty}/gnu-regexp"/>
- <property name="gnu.regexp.lib" value="${gnu.regexp.root}/lib"/>
- <path id="gnu.regexp.classpath">
- <pathelement path="${gnu.regexp.lib}/gnu-regexp.jar"/>
- </path>
-
- <!-- GNU Getopt -->
- <property name="gnu.getopt.root" value="${project.thirdparty}/gnu-getopt"/>
- <property name="gnu.getopt.lib" value="${gnu.getopt.root}/lib"/>
- <path id="gnu.getopt.classpath">
- <pathelement path="${gnu.getopt.lib}/getopt.jar"/>
- </path>
-
- <!-- MySQL -->
- <property name="mysql.mysql.root" value="${project.thirdparty}/mysql-mysql"/>
- <property name="mysql.mysql.lib" value="${mysql.mysql.root}/lib"/>
- <path id="mysql.mysql.classpath">
- <pathelement path="${mysql.mysql.lib}/mysql-connector-java-3.0.0-beta-bin.jar"/>
- </path>
-
- <!-- org.jdom -->
- <property name="jdom.root" value="${project.thirdparty}/jdom-beta-7"/>
- <property name="jdom.lib" value="${jdom.root}/lib"/>
- <path id="jdom.classpath">
- <pathelement path="${jdom.lib}/jdom.jar"/>
- </path>
-
- <!-- JUnit -->
- <property name="junit.junit.root" value="${project.thirdparty}/junit-junit"/>
- <property name="junit.junit.lib" value="${junit.junit.root}/lib"/>
- <path id="junit.junit.classpath">
- <pathelement path="${junit.junit.lib}/junit.jar"/>
- </path>
-
- <!-- EDU.oswego.cs.dl.util.concurrent -->
- <property name="oswego.concurrent.root" value="${project.thirdparty}/oswego-concurrent"/>
- <property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
- <path id="oswego.concurrent.classpath">
- <pathelement path="${oswego.concurrent.lib}/concurrent.jar"/>
- </path>
-
- <!-- org.xml.sax (SAX2 & SAX2 Extensions) -->
- <property name="sax.root" value="${project.thirdparty}/xml-sax"/>
- <property name="sax.lib" value="${sax.root}/lib"/>
- <path id="sax.classpath">
- <pathelement path="${sax.lib}/sax2.jar"/>
- <pathelement path="${sax.lib}/sax2-ext.jar"/>
- </path>
-
- <!-- Ant -->
- <property name="apache.ant.root" value="${project.tools}"/>
- <property name="apache.ant.lib" value="${apache.ant.root}/lib"/>
- <path id="apache.ant.classpath">
- <pathelement path="${apache.ant.lib}/ant.jar"/>
- <pathelement path="${apache.ant.lib}/optional.jar"/>
- </path>
-
- <!-- IBM WSDL4j -->
- <property name="ibm.wsdl4j.root" value="${project.thirdparty}/ibm-wsdl4j"/>
- <property name="ibm.wsdl4j.lib" value="${ibm.wsdl4j.root}/lib"/>
- <path id="ibm.wsdl4j.classpath">
- <pathelement path="${ibm.wsdl4j.lib}/wsdl4j.jar"/>
- </path>
-
- <!-- IBM UDDI4j -->
- <property name="ibm.uddi4j.root" value="${project.thirdparty}/ibm-uddi4j"/>
- <property name="ibm.uddi4j.lib" value="${ibm.uddi4j.root}/lib"/>
- <path id="ibm.uddi4j.classpath">
- <pathelement path="${ibm.uddi4j.lib}/uddi4j.jar"/>
- </path>
-
- <!-- IBM BSF -->
- <property name="ibm.bsf.root" value="${project.thirdparty}/ibm-bsf"/>
- <property name="ibm.bsf.lib" value="${ibm.bsf.root}/lib"/>
- <path id="ibm.bsf.classpath">
- <pathelement path="${ibm.bsf.lib}/bsf.jar"/>
- </path>
-
- <!-- Apache Axis -->
- <property name="apache.axis.root" value="${project.thirdparty}/apache-axis"/>
- <property name="apache.axis.lib" value="${apache.axis.root}/lib"/>
- <path id="apache.axis.classpath">
- <pathelement path="${apache.axis.lib}/axis.jar"/>
- <pathelement path="${apache.axis.lib}/jaxrpc.jar"/>
- <pathelement path="${apache.axis.lib}/saaj.jar"/>
- <path refid="ibm.wsdl4j.classpath"/>
- <path refid="ibm.uddi4j.classpath"/>
- </path>
-
- <!-- Dom4j -->
- <property name="dom4j.dom4j.root" value="${project.thirdparty}/dom4j-dom4j"/>
- <property name="dom4j.dom4j.lib" value="${dom4j.dom4j.root}/lib"/>
- <path id="dom4j.dom4j.classpath">
- <pathelement path="${dom4j.dom4j.lib}/dom4j.jar"/>
- </path>
-
- <!-- Exolab Castor -->
- <property name="exolab.castor.root" value="${project.thirdparty}/exolab-castor"/>
- <property name="exolab.castor.lib" value="${exolab.castor.root}/lib"/>
- <path id="exolab.castor.classpath">
- <pathelement path="${exolab.castor.lib}/castor.jar"/>
- </path>
-
- <!-- Exolab Tyrex -->
- <property name="exolab.tyrex.root" value="${project.thirdparty}/exolab-tyrex"/>
- <property name="exolab.tyrex.lib" value="${exolab.tyrex.root}/lib"/>
- <path id="exolab.tyrex.classpath">
- <pathelement path="${exolab.tyrex.lib}/tyrex.jar"/>
- </path>
-
- <!-- GJT JPL-Util -->
- <property name="gjt.jpl-util.root" value="${project.thirdparty}/gjt-jpl-util"/>
- <property name="gjt.jpl-util.lib" value="${gjt.jpl-util.root}/lib"/>
- <path id="gjt.jpl-util.classpath">
- <pathelement path="${gjt.jpl-util.lib}/jpl-util.jar"/>
- <pathelement path="${gjt.jpl-util.lib}/jpl-pattern.jar"/>
- </path>
-
- <!-- Hypersonic SQL -->
- <property name="hsqldb.hsqldb.root" value="${project.thirdparty}/hsqldb-hsqldb"/>
- <property name="hsqldb.hsqldb.lib" value="${hsqldb.hsqldb.root}/lib"/>
- <path id="hsqldb.hsqldb.classpath">
- <pathelement path="${hsqldb.hsqldb.lib}/hsqldb.jar"/>
- </path>
-
- <!-- JacORB -->
- <property name="jacorb.jacorb.root" value="${project.thirdparty}/jacorb-jacorb"/>
- <property name="jacorb.jacorb.lib" value="${jacorb.jacorb.root}/lib"/>
- <path id="jacorb.jacorb.classpath">
- <pathelement path="${jacorb.jacorb.lib}/jacorb.jar"/>
- </path>
-
- <!-- JavaGroups -->
- <property name="javagroups.javagroups.root" value="${project.thirdparty}/javagroups-javagroups"/>
- <property name="javagroups.javagroups.lib" value="${javagroups.javagroups.root}/lib"/>
- <path id="javagroups.javagroups.classpath">
- <pathelement path="${javagroups.javagroups.lib}/javagroups-2.0.jar"/>
- </path>
-
- <!-- Jasper Why is this under jetty??, should be apache -->
- <property name="jetty.jasper.root" value="${project.thirdparty}/mortbay-jetty"/>
- <property name="jetty.jasper.lib" value="${jetty.jasper.root}/lib"/>
- <path id="jetty.jasper.classpath">
- <pathelement path="${jetty.jasper.lib}/org.apache.jasper.jar"/>
- </path>
-
- <!-- Servlets -->
- <property name="sun.servlet.root" value="${project.thirdparty}/sun-servlet"/>
- <property name="sun.servlet.lib" value="${sun.servlet.root}/lib"/>
- <path id="sun.servlet.classpath">
- <pathelement path="${sun.servlet.lib}/servlet.jar"/>
- </path>
-
- <!-- Sun JMX -->
- <property name="sun.jmx.root" value="${project.thirdparty}/sun-jmx"/>
- <property name="sun.jmx.lib" value="${sun.jmx.root}/lib"/>
- <path id="sun.jmx.classpath">
- <pathelement path="${sun.jmx.lib}/jmxri.jar"/>
- <pathelement path="${sun.jmx.lib}/jmxtools.jar"/>
- </path>
-
- <!-- Java Authentication and Authorization Service (JAAS) -->
- <property name="sun.jaas.root" value="${project.thirdparty}/sun-jaas"/>
- <property name="sun.jaas.lib" value="${sun.jaas.root}/lib"/>
- <path id="sun.jaas.classpath">
- <pathelement path="${sun.jaas.lib}/jaas.jar"/>
- </path>
-
- <!-- Java XML Parser -->
- <property name="sun.jaxp.root" value="${project.thirdparty}/sun-jaxp"/>
- <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
- <path id="sun.jaxp.classpath">
- <pathelement path="${sun.jaxp.lib}/jaxp.jar"/>
- <pathelement path="${sun.jaxp.lib}/crimson.jar"/>
- <pathelement path="${sun.jaxp.lib}/xalan.jar"/>
- </path>
-
- <!-- JavaBeans Activation Framework (JAF) -->
- <property name="sun.jaf.root" value="${project.thirdparty}/sun-jaf"/>
- <property name="sun.jaf.lib" value="${sun.jaf.root}/lib"/>
- <path id="sun.jaf.classpath">
- <pathelement path="${sun.jaf.lib}/activation.jar"/>
- </path>
-
- <!-- JavaCC -->
- <property name="sun.javacc.root" value="${project.thirdparty}/sun-javacc"/>
- <property name="sun.javacc.lib" value="${sun.javacc.root}/lib"/>
-
- <!-- Java Cryptography Extension (JCE) -->
- <property name="sun.jce.root" value="${project.thirdparty}/sun-jce"/>
- <property name="sun.jce.lib" value="${sun.jce.root}/lib"/>
- <path id="sun.jce.classpath">
- <pathelement path="${sun.jce.lib}/jce1_2_1.jar"/>
- <pathelement path="${sun.jce.lib}/sunjce_provider.jar"/>
- <pathelement path="${sun.jce.lib}/local_policy.jar"/>
- <pathelement path="${sun.jce.lib}/US_export_policy.jar"/>
- </path>
-
- <!-- JavaMail -->
- <property name="sun.javamail.root" value="${project.thirdparty}/sun-javamail"/>
- <property name="sun.javamail.lib" value="${sun.javamail.root}/lib"/>
- <path id="sun.javamail.classpath">
- <pathelement path="${sun.javamail.lib}/mail.jar"/>
- </path>
-
- <!-- Java Secure Socket Extension (JSSE) -->
- <property name="sun.jsse.root" value="${project.thirdparty}/sun-jsse"/>
- <property name="sun.jsse.lib" value="${sun.jsse.root}/lib"/>
- <path id="sun.jsse.classpath">
- <pathelement path="${sun.jsse.lib}/jsse.jar"/>
- <pathelement path="${sun.jsse.lib}/jcert.jar"/>
- <pathelement path="${sun.jsse.lib}/jnet.jar"/>
- </path>
-
- <!-- Java Transaction Service (JTS) -->
- <property name="sun.jts.root" value="${project.thirdparty}/sun-jts"/>
- <property name="sun.jts.lib" value="${sun.jts.root}/lib"/>
- <path id="sun.jts.classpath">
- <pathelement path="${sun.jts.lib}/jts.jar"/>
- </path>
-
- <!-- JBoss Plastic APIs -->
- <property name="jboss.plastic.root" value="${project.thirdparty}/jboss-plastic"/>
- <property name="jboss.plastic.lib" value="${jboss.plastic.root}/lib"/>
- <path id="jboss.plastic.classpath">
- <pathelement path="${jboss.plastic.lib}/jboss-j2ee.jar"/>
- </path>
-
- <!-- SourceForge Tapestry -->
- <property name="sourceforge.tapestry.root" value="${project.thirdparty}/sourceforge-tapestry"/>
- <property name="sourceforge.tapestry.lib" value="${sourceforge.tapestry.root}/lib"/>
- <path id="sourceforge.tapestry.classpath">
- <pathelement path="${sourceforge.tapestry.lib}/net.sf.tapestry-2.2.jar"/>
- <pathelement path="${sourceforge.tapestry.lib}/net.sf.tapestry.contrib-2.2.jar"/>
- </path>
-
- <!-- XDoclet -->
-
- <!--
- | xdoclet has appended a version string to all their jars.
- | I'm using jb4 so we don't have to track them so carefully
- -->
- <property name="xdoclet.version" value="jb4"/>
-
- <!--
-
- jason: it seems like this hack is better defaulting to the default in thirdparty, if you
- want to build from CVS then change this to the value below in build/local.properties.
-
- <!- - this may be overridden by the build/local.properties file to use version from cvs- ->
- <property name="xdoclet.xdoclet.root" value="${project.root}/xdoclet/output"/>
-
- -->
- <property name="xdoclet.xdoclet.root" value="${project.thirdparty}/xdoclet-xdoclet"/>
-
- <property name="xdoclet.xdoclet.lib" value="${xdoclet.xdoclet.root}/lib"/>
- <path id="xdoclet.xdoclet.classpath">
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-xjavadoc-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-bea-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-ejb-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-java-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jboss-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jdo-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jmx-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-web-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-xdoclet-module-${xdoclet.version}.jar"/>
- <path refid="apache.commons.classpath"/>
- </path>
-
- <!-- BeanShell -->
- <property name="beanshell.beanshell.root" value="${project.thirdparty}/beanshell-beanshell"/>
- <property name="beanshell.beanshell.lib" value="${beanshell.beanshell.root}/lib"/>
- <path id="beanshell.beanshell.classpath">
- <pathelement path="${beanshell.beanshell.lib}/bsh-core-1.2b7.jar"/>
- </path>
-
- <!-- Informix -->
- <property name="informix.informix.root" value="${project.thirdparty}/informix-informix"/>
- <property name="informix.informix.lib" value="${informix.informix.root}/lib"/>
- <path id="informix.informix.classpath">
- <pathelement path="${informix.informix.lib}/ifxjdbc.jar"/>
- </path>
-
-</target>
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/libraries.ent (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/libraries.ent)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/libraries.ent (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/libraries.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,641 @@
+<!-- $Id$ -->
+
+ <!-- Spring -->
+ <property name="spring.root" value="${project.thirdparty}/spring"/>
+ <property name="spring.lib" value="${spring.root}/lib"/>
+ <path id="spring.classpath">
+ <pathelement path="${spring.lib}/spring-beans.jar"/>
+ <pathelement path="${spring.lib}/spring-core.jar"/>
+ <pathelement path="${spring.lib}/spring-context.jar"/>
+ </path>
+ <path id="spring-example.classpath">
+ <pathelement path="${spring.lib}/spring-aop.jar"/>
+ <pathelement path="${spring.lib}/spring-web.jar"/>
+ <pathelement path="${spring.lib}/spring-webmvc.jar"/>
+ </path>
+
+ <!-- Dom4j -->
+ <property name="dom4j.dom4j.root" value="${project.thirdparty}/dom4j-dom4j"/>
+ <property name="dom4j.dom4j.lib" value="${dom4j.dom4j.root}/lib"/>
+ <path id="dom4j.dom4j.classpath">
+ <pathelement path="${dom4j.dom4j.lib}/dom4j.jar"/>
+ </path>
+
+ <!-- Properties used for transtion to thirdparty build -->
+ <property name="jaxen.jaxen.lib" value="${dom4j.dom4j.root}/lib"/>
+
+ <!-- Javassist -->
+ <property name="javassist.root" value="${project.thirdparty}/javassist"/>
+ <property name="javassist.lib" value="${javassist.root}/lib"/>
+ <path id="javassist.classpath">
+ <pathelement path="${javassist.lib}/javassist.jar"/>
+ </path>
+
+ <!-- qdox -->
+ <property name="qdox.root" value="${project.thirdparty}/qdox"/>
+ <property name="qdox.lib" value="${qdox.root}/lib"/>
+ <path id="qdox.classpath">
+ <pathelement path="${qdox.lib}/qdox.jar"/>
+ </path>
+
+ <!-- hibernate3 -->
+ <property name="hibernate.root" value="${project.thirdparty}/hibernate"/>
+ <property name="hibernate.lib" value="${hibernate.root}/lib"/>
+ <path id="hibernate3.classpath">
+ <pathelement path="${hibernate.lib}/hibernate3.jar"/>
+ <pathelement path="${hibernate.lib}/asm.jar"/>
+ <pathelement path="${hibernate.lib}/asm-attrs.jar"/>
+ <pathelement path="${hibernate.lib}/antlr*.jar"/>
+ </path>
+
+ <!-- hibernate entity manager -->
+ <property name="hibernate.entitymanager.root" value="${project.thirdparty}/hibernate"/>
+ <property name="hibernate.entitymanager.lib" value="${hibernate.entitymanager.root}/lib"/>
+ <path id="hibernate.entitymanager.classpath">
+ <pathelement path="${hibernate.entitymanager.lib}/ejb3-persistence.jar"/>
+ <pathelement path="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar"/>
+ </path>
+
+ <!-- hibernate annotations manager -->
+ <property name="hibernate.annotations.root" value="${project.thirdparty}/hibernate"/>
+ <property name="hibernate.annotations.lib" value="${hibernate.annotations.root}/lib"/>
+ <path id="hibernate.annotations.classpath">
+ <pathelement path="${hibernate.annotations.lib}/hibernate-annotations.jar"/>
+ </path>
+
+ <!-- asm alias used for bridging to thirdparty build-->
+ <property name="asm.asm.root" value="${project.thirdparty}/hibernate"/>
+ <property name="asm.asm.lib" value="${asm.asm.root}/lib/"/>
+ <property name="asm.asm.resources" value="${asm.asm.root}/resources/"/>
+ <path id="asm.asm.classpath">
+ <pathelement path="${asm.asm.lib}/asm.jar"/>
+ <pathelement path="${asm.asm.lib}/asm-attrs.jar"/>
+ </path>
+
+
+ <!-- ejb3-persistence -->
+ <path id="ejb3-persistence.classpath">
+ <pathelement path="${hibernate.lib}/hibernate-annotations.jar"/>
+ <pathelement path="${hibernate.lib}/hibernate-entitymanager.jar"/>
+ <pathelement path="${hibernate.lib}/ejb3-persistence.jar"/>
+ </path>
+
+ <!-- ODMG (needed for Hibernate) -->
+ <property name="odmg.root" value="${project.thirdparty}/odmg"/>
+ <property name="odmg.lib" value="${odmg.root}/lib"/>
+ <path id="odmg.classpath">
+ <pathelement path="${odmg.lib}/odmg-3.0.jar"/>
+ </path>
+
+ <!-- CGLIB (needed for Hibernate) -->
+ <property name="cglib.root" value="${project.thirdparty}/cglib"/>
+ <property name="cglib.lib" value="${cglib.root}/lib"/>
+ <path id="cglib.classpath">
+ <pathelement path="${cglib.lib}/cglib-2.1.1.jar"/>
+ </path>
+
+
+ <!-- Trove -->
+ <property name="trove.root" value="${project.thirdparty}/trove"/>
+ <property name="trove.lib" value="${trove.root}/lib"/>
+ <path id="trove.classpath">
+ <pathelement path="${trove.lib}/trove.jar"/>
+ </path>
+
+ <!-- Ant -->
+ <property name="apache.ant.root" value="${project.tools}"/>
+ <property name="apache.ant.lib" value="${apache.ant.root}/lib"/>
+ <path id="apache.ant.classpath">
+ <pathelement path="${apache.ant.lib}/ant.jar"/>
+ </path>
+
+ <!-- Apache Avalon -->
+ <property name="apache.avalon.root" value="${project.thirdparty}/apache-avalon"/>
+ <property name="apache.avalon.lib" value="${apache.avalon.root}/lib"/>
+ <path id="apache.avalon.classpath">
+ <pathelement path="${apache.avalon.lib}/avalon-framework.jar"/>
+ </path>
+ <property name="apache.avalon.logkit.lib" value="${apache.avalon.lib}"/>
+ <path id="apache.avalon.logkit.classpath">
+ <pathelement path="${apache.avalon.logkit.lib}/logkit.jar"/>
+ </path>
+
+ <!-- Apache BCEL -->
+ <property name="apache.bcel.root" value="${project.thirdparty}/apache-bcel"/>
+ <property name="apache.bcel.lib" value="${apache.bcel.root}/lib"/>
+ <path id="apache.bcel.classpath">
+ <pathelement path="${apache.bcel.lib}/bcel.jar"/>
+ </path>
+
+ <!-- Apache Commons -->
+ <property name="apache.commons.root" value="${project.thirdparty}/apache-commons"/>
+ <property name="apache.commons.lib" value="${apache.commons.root}/lib"/>
+ <path id="apache.commons.classpath">
+ <pathelement path="${apache.commons.lib}/commons-collections.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-httpclient.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-pool.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-discovery.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-fileupload.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-lang-2.0.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-vfs.jar"/>
+ </path>
+
+ <!-- Properties used for transtion to thirdparty build -->
+ <property name="apache.collections.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.codec.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.beanutils.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.digester.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.httpclient.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.logging.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.pool.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.fileupload.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.lang.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.vfs.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.discovery.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.validator.lib" value="${apache.commons.root}/lib"/>
+ <property name="apache.logging.api.lib" value="${apache.commons.root}/lib"/>
+
+ <path id="apache.httpclient.classpath">
+ <pathelement path="${apache.commons.lib}/commons-httpclient.jar"/>
+ </path>
+
+ <path id="apache.logging.classpath">
+ <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
+ </path>
+
+ <path id="apache.beanutils.classpath">
+ <pathelement path="${apache.commons.lib}/commons-beanutils.jar"/>
+ </path>
+
+ <path id="apache.validator.classpath">
+ <pathelement path="${apache.commons.lib}/commons-validator-1.1.3.jar"/>
+ </path>
+
+ <!-- Apache Log4j -->
+ <property name="apache.log4j.root" value="${project.thirdparty}/apache-log4j"/>
+ <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
+ <path id="apache.log4j.classpath">
+ <pathelement path="${apache.log4j.lib}/log4j.jar"/>
+ </path>
+
+ <!-- Apache Lucene -->
+ <property name="apache.lucene.root"
+ value="${project.thirdparty}/apache-lucene"/>
+ <property name="apache.lucene.lib" value="${apache.lucene.root}/lib"/>
+ <path id="apache.lucene.classpath">
+ <pathelement path="${apache.lucene.lib}/lucene.jar"/>
+ </path>
+
+ <!-- Apache Myfaces -->
+ <property name="apache.myfaces.root"
+ value="${project.thirdparty}/apache-myfaces"/>
+ <property name="apache.myfaces.lib" value="${apache.myfaces.root}/lib"/>
+
+ <!-- Apache Tomcat 5.5.x -->
+ <property name="apache.tomcat55.root" value="${project.thirdparty}/apache-tomcat55"/>
+ <property name="apache.tomcat55.lib" value="${apache.tomcat55.root}"/>
+ <path id="apache.tomcat55.classpath">
+ <fileset dir="${apache.tomcat55.root}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+
+ <!-- Apache commons-el -->
+ <property name="commons.el.root" value="${apache.tomcat55.root}"/>
+ <property name="commons.el.lib" value="${apache.tomcat55.root}"/>
+ <path id="commons.el.classpath">
+ <pathelement path="${commons.el.lib}/commons-el.jar"/>
+ </path>
+
+ <!-- Apache Modeler -->
+ <property name="apache.modeler.root" value="${project.thirdparty}/apache-tomcat55"/>
+ <property name="apache.modeler.lib" value="${apache.modeler.root}"/>
+ <path id="apache.modeler.classpath">
+ <fileset dir="${apache.modeler.root}">
+ <include name="commons-modeler.jar" />
+ </fileset>
+ </path>
+
+ <!-- Apache Velocity -->
+ <property name="apache.velocity.root" value="${project.thirdparty}/apache-velocity"/>
+ <property name="apache.velocity.lib" value="${apache.velocity.root}/lib"/>
+ <path id="apache.velocity.classpath">
+ <pathelement path="${apache.velocity.lib}/velocity.jar"/>
+ </path>
+
+ <!-- Apache Xerces -->
+ <property name="apache.xerces.root" value="${project.thirdparty}/apache-xerces"/>
+ <property name="apache.xerces.lib" value="${apache.xerces.root}/lib"/>
+ <path id="apache.xerces.classpath">
+ <pathelement path="${apache.xerces.lib}/xml-apis.jar"/>
+ <pathelement path="${apache.xerces.lib}/xercesImpl.jar"/>
+ <pathelement path="${apache.xerces.lib}/resolver.jar"/>
+ </path>
+
+ <!-- Apache Xalan -->
+ <property name="apache.xalan.root" value="${project.thirdparty}/apache-xalan"/>
+ <property name="apache.xalan.lib" value="${apache.xalan.root}/lib"/>
+ <path id="apache.xalan.classpath">
+ <pathelement path="${apache.xalan.lib}/xalan.jar"/>
+ <path refid="apache.xerces.classpath"/>
+ </path>
+
+ <!-- Apache Scout -->
+ <property name="apache.scout.root" value="${project.thirdparty}/apache-scout"/>
+ <property name="apache.scout.lib" value="${apache.scout.root}/lib"/>
+ <path id="apache.scout.classpath">
+ <pathelement path="${apache.scout.lib}/scout.jar"/>
+ </path>
+
+ <!-- Apache Slide -->
+ <property name="apache.slide.root" value="${project.thirdparty}/apache-slide"/>
+ <property name="apache.slide.lib" value="${apache.slide.root}/client/lib"/>
+ <path id="apache.slide.classpath">
+ <pathelement path="${apache.slide.lib}/webdavlib.jar"/>
+ <pathelement path="${apache.slide.lib}/commons-httpclient.jar"/>
+ </path>
+
+ <!-- Apache JaxMe2 -->
+ <property name="apache.jaxme.root" value="${project.thirdparty}/apache-jaxme"/>
+ <property name="apache.jaxme.lib" value="${apache.jaxme.root}/lib"/>
+ <path id="apache.jaxme.classpath">
+ <pathelement path="${apache.jaxme.lib}/jaxmexs.jar"/>
+ </path>
+
+ <!-- Apache WSS4J -->
+ <property name="apache.wss4j.root" value="${project.thirdparty}/apache-wss4j"/>
+ <property name="apache.wss4j.lib" value="${apache.wss4j.root}/lib"/>
+ <path id="apache.wss4j.classpath">
+ <pathelement path="${apache.wss4j.lib}/wss4j.jar"/>
+ </path>
+
+ <!-- Apache XMLSec -->
+ <property name="apache.xmlsec.root" value="${project.thirdparty}/apache-xmlsec"/>
+ <property name="apache.xmlsec.lib" value="${apache.xmlsec.root}/lib"/>
+ <path id="apache.xmlsec.classpath">
+ <pathelement path="${apache.xmlsec.lib}/xmlsec.jar"/>
+ </path>
+
+ <!-- Bouncy Castle JCE Provider -->
+ <property name="bouncycastle.root" value="${project.thirdparty}/bouncycastle"/>
+ <property name="bouncycastle.lib" value="${bouncycastle.root}/lib"/>
+ <path id="bouncycastle.classpath">
+ <pathelement path="${bouncycastle.lib}/bcprov-jdk14-122.jar"/>
+ </path>
+
+ <!-- OpenSAML -->
+ <property name="opensaml.root" value="${project.thirdparty}/opensaml"/>
+ <property name="opensaml.lib" value="${opensaml.root}/lib"/>
+ <path id="opensaml.classpath">
+ <pathelement path="${opensaml.lib}/opensaml.jar"/>
+ </path>
+
+ <!-- GNU Regex -->
+ <property name="gnu.regexp.root" value="${project.thirdparty}/gnu-regexp"/>
+ <property name="gnu.regexp.lib" value="${gnu.regexp.root}/lib"/>
+ <path id="gnu.regexp.classpath">
+ <pathelement path="${gnu.regexp.lib}/gnu-regexp.jar"/>
+ </path>
+
+ <!-- GNU Getopt -->
+ <property name="gnu.getopt.root" value="${project.thirdparty}/gnu-getopt"/>
+ <property name="gnu.getopt.lib" value="${gnu.getopt.root}/lib"/>
+ <path id="gnu.getopt.classpath">
+ <pathelement path="${gnu.getopt.lib}/getopt.jar"/>
+ </path>
+
+ <!-- org.jdom -->
+ <property name="jdom.root" value="${project.thirdparty}/jdom-beta-7"/>
+ <property name="jdom.lib" value="${jdom.root}/lib"/>
+ <path id="jdom.classpath">
+ <pathelement path="${jdom.lib}/jdom.jar"/>
+ </path>
+
+ <!-- JBoss -->
+ <property name="jboss.external.root" value="${project.thirdparty}/jboss"/>
+ <property name="jboss.remoting.root" value="${jboss.external.root}/remoting"/>
+ <property name="jboss.remoting.lib" value="${jboss.remoting.root}/lib"/>
+ <path id="jboss.remoting.classpath">
+ <pathelement path="${jboss.remoting.lib}/jboss-remoting.jar"/>
+ </path>
+ <property name="jboss.serialization.root" value="${jboss.external.root}/serialization"/>
+ <property name="jboss.serialization.lib" value="${jboss.serialization.root}/lib"/>
+ <path id="jboss.serialization.classpath">
+ <pathelement path="${jboss.serialization.lib}/jboss-serialization.jar"/>
+ </path>
+ <property name="jboss.axis.root" value="${jboss.external.root}/axis"/>
+ <property name="jboss.axis.lib" value="${jboss.axis.root}/lib"/>
+ <path id="jboss.axis.classpath">
+ <pathelement path="${jboss.axis.lib}/axis-ws4ee.jar"/>
+ </path>
+
+ <!-- JUnit -->
+ <property name="junit.junit.root" value="${project.thirdparty}/junit-junit"/>
+ <property name="junit.junit.lib" value="${junit.junit.root}/lib"/>
+ <path id="junit.junit.classpath">
+ <pathelement path="${junit.junit.lib}/junit.jar"/>
+ </path>
+
+ <!-- EDU.oswego.cs.dl.util.concurrent -->
+ <property name="oswego.concurrent.root" value="${project.thirdparty}/oswego-concurrent"/>
+ <property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
+ <path id="oswego.concurrent.classpath">
+ <pathelement path="${oswego.concurrent.lib}/concurrent.jar"/>
+ </path>
+
+ <!-- org.xml.sax (SAX2 & SAX2 Extensions) -->
+ <property name="sax.root" value="${project.thirdparty}/xml-sax"/>
+ <property name="sax.lib" value="${sax.root}/lib"/>
+ <path id="sax.classpath">
+ <pathelement path="${sax.lib}/sax2.jar"/>
+ <pathelement path="${sax.lib}/sax2-ext.jar"/>
+ </path>
+
+ <!-- IBM WSDL4j -->
+ <property name="ibm.wsdl4j.root" value="${project.thirdparty}/ibm-wsdl4j"/>
+ <property name="ibm.wsdl4j.lib" value="${ibm.wsdl4j.root}/lib"/>
+ <path id="ibm.wsdl4j.classpath">
+ <pathelement path="${ibm.wsdl4j.lib}/wsdl4j.jar"/>
+ </path>
+
+ <!-- GJT JPL-Util -->
+ <property name="gjt.jpl-util.root" value="${project.thirdparty}/gjt-jpl-util"/>
+ <property name="gjt.jpl-util.lib" value="${gjt.jpl-util.root}/lib"/>
+ <path id="gjt.jpl-util.classpath">
+ <pathelement path="${gjt.jpl-util.lib}/jpl-util.jar"/>
+ <pathelement path="${gjt.jpl-util.lib}/jpl-pattern.jar"/>
+ </path>
+
+ <!-- Hypersonic SQL -->
+ <property name="hsqldb.hsqldb.root" value="${project.thirdparty}/hsqldb-hsqldb"/>
+ <property name="hsqldb.hsqldb.lib" value="${hsqldb.hsqldb.root}/lib"/>
+ <path id="hsqldb.hsqldb.classpath">
+ <pathelement path="${hsqldb.hsqldb.lib}/hsqldb.jar"/>
+ </path>
+
+ <!-- JacORB -->
+ <property name="jacorb.jacorb.root" value="${project.thirdparty}/jacorb-jacorb"/>
+ <property name="jacorb.jacorb.lib" value="${jacorb.jacorb.root}/lib"/>
+ <path id="jacorb.jacorb.classpath">
+ <pathelement path="${jacorb.jacorb.lib}/jacorb.jar"/>
+ </path>
+ <path id="jacorb.idl.classpath">
+ <path refid="apache.avalon.logkit.classpath"/>
+ <pathelement path="${jacorb.jacorb.lib}/idl.jar"/>
+ </path>
+ <property name="jacorb.idl.include" value="${jacorb.jacorb.root}/idl"/>
+ <property name="jacorb.jacorb.resources" value="${jacorb.jacorb.root}/conf/default"/>
+
+ <!-- JGroups -->
+ <property name="jgroups.jgroups.root" value="${project.thirdparty}/javagroups-javagroups"/>
+ <property name="jgroups.jgroups.lib" value="${jgroups.jgroups.root}/lib"/>
+ <path id="jgroups.jgroups.classpath">
+ <pathelement path="${jgroups.jgroups.lib}/jgroups.jar"/>
+ </path>
+
+ <!-- Sleepycat -->
+ <property name="sleepycat.root" value="${project.thirdparty}/sleepycat"/>
+ <property name="sleepycat.lib" value="${sleepycat.root}/lib"/>
+ <path id="sleepycat.classpath">
+ <pathelement path="${sleepycat.lib}/je.jar"/>
+ </path>
+
+
+ <!-- jUDDI -->
+ <property name="juddi.juddi.root" value="${project.thirdparty}/juddi-juddi"/>
+ <property name="juddi.juddi.lib" value="${juddi.juddi.root}/lib"/>
+ <path id="juddi.juddi.classpath">
+ <pathelement path="${juddi.juddi.lib}/juddi.jar"/>
+ </path>
+
+ <!-- JUnitEJB -->
+ <property name="junitejb.junitejb.root" value="${project.thirdparty}/junitejb/junitejb"/>
+ <property name="junitejb.junitejb.lib" value="${junitejb.junitejb.root}/lib"/>
+ <path id="junitejb.junitejb.classpath">
+ <pathelement path="${junitejb.junitejb.lib}/junitejb.jar"/>
+ </path>
+
+ <!-- Sun JavaBeans Activation Framework (JAF) -->
+ <property name="sun.jaf.root" value="${project.thirdparty}/sun-jaf"/>
+ <property name="sun.jaf.lib" value="${sun.jaf.root}/lib"/>
+ <path id="sun.jaf.classpath">
+ <pathelement path="${sun.jaf.lib}/activation.jar"/>
+ </path>
+
+ <!-- Sun JavaMail -->
+ <property name="sun.javamail.root" value="${project.thirdparty}/sun-javamail"/>
+ <property name="sun.javamail.lib" value="${sun.javamail.root}/lib"/>
+ <path id="sun.javamail.classpath">
+ <pathelement path="${sun.javamail.lib}/mail.jar"/>
+ </path>
+
+ <!-- Sun Java XML Parser (JAXP) -->
+ <property name="sun.jaxp.root" value="${project.thirdparty}/sun-jaxp"/>
+ <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
+ <path id="sun.jaxp.classpath">
+ <pathelement path="${sun.jaxp.lib}/jaxp.jar"/>
+ <pathelement path="${sun.jaxp.lib}/crimson.jar"/>
+ <pathelement path="${sun.jaxp.lib}/xalan.jar"/>
+ </path>
+
+ <!-- Sun Java Media Framework (JMF) -->
+ <property name="sun.jmf.root" value="${project.thirdparty}/sun-jmf"/>
+ <property name="sun.jmf.lib" value="${sun.jmf.root}/lib"/>
+ <path id="sun.jmf.classpath">
+ <pathelement path="${sun.jmf.lib}/jmf.jar"/>
+ </path>
+
+ <!-- Sun Java Management Extensions (JMX) -->
+ <property name="sun.jmx.root" value="${project.thirdparty}/sun-jmx"/>
+ <property name="sun.jmx.lib" value="${sun.jmx.root}/lib"/>
+ <path id="sun.jmx.classpath">
+ <pathelement path="${sun.jmx.lib}/jmxri.jar"/>
+ <pathelement path="${sun.jmx.lib}/jmxtools.jar"/>
+ </path>
+
+ <!-- Sun Java Servlet Technology -->
+ <property name="sun.servlet.root" value="${project.thirdparty}/sun-servlet"/>
+ <property name="sun.servlet.lib" value="${sun.servlet.root}/lib"/>
+ <path id="sun.servlet.classpath">
+ <pathelement path="${sun.servlet.lib}/servlet-api.jar"/>
+ <pathelement path="${sun.servlet.lib}/jsp-api.jar"/>
+ </path>
+
+ <!-- Sun Open Source XACML Implementation -->
+ <property name="sun.xacml.root" value="${project.thirdparty}/sun-xacml"/>
+ <property name="sun.xacml.lib" value="${sun.xacml.root}/lib"/>
+ <path id="sun.xacml.classpath">
+ <pathelement path="${sun.xacml.lib}/sunxacml.jar"/>
+ <pathelement path="${sun.xacml.lib}/sunxacml-support.jar"/>
+ </path>
+
+ <!-- JavaCC -->
+ <property name="sun.javacc.root" value="${project.thirdparty}/sun-javacc"/>
+ <property name="sun.javacc.lib" value="${sun.javacc.root}/lib"/>
+
+ <!-- BeanShell -->
+ <property name="beanshell.beanshell.root" value="${project.thirdparty}/beanshell-beanshell"/>
+ <property name="beanshell.beanshell.lib" value="${beanshell.beanshell.root}/lib"/>
+ <path id="beanshell.beanshell.classpath">
+ <fileset dir="${beanshell.beanshell.lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+
+ <!-- Joe SNMP lib -->
+ <property name="opennms.joesnmp.root" value="${project.thirdparty}/opennms/joesnmp"/>
+ <property name="opennms.joesnmp.lib" value="${opennms.joesnmp.root}/lib"/>
+ <path id="opennms.joesnmp.classpath">
+ <pathelement path="${opennms.joesnmp.lib}/joesnmp.jar"/>
+ </path>
+
+ <!-- XDoclet -->
+
+ <!--
+ | xdoclet has appended a version string to all their jars.
+ | I'm using jb4 so we don't have to track them so carefully
+ -->
+ <property name="xdoclet.version" value="jb4"/>
+
+ <!--
+
+ jason: it seems like this hack is better defaulting to the default in thirdparty, if you
+ want to build from CVS then change this to the value below in build/local.properties.
+
+ <!- - this may be overridden by the build/local.properties file to use version from cvs- ->
+ <property name="xdoclet.xdoclet.root" value="${project.root}/xdoclet/output"/>
+
+ -->
+ <property name="xdoclet.xdoclet.root" value="${project.thirdparty}/xdoclet-xdoclet"/>
+
+ <property name="xdoclet.xdoclet.lib" value="${xdoclet.xdoclet.root}/lib"/>
+ <path id="xdoclet.xdoclet.classpath">
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-xjavadoc-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-bea-module-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-ejb-module-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-java-module-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jboss-module-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jdo-module-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jmx-module-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-web-module-${xdoclet.version}.jar"/>
+ <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-xdoclet-module-${xdoclet.version}.jar"/>
+ <path refid="apache.commons.classpath"/>
+ <path refid="sun.servlet.classpath"/>
+ </path>
+ <path id="xdoclet.task.classpath">
+ <path refid="xdoclet.xdoclet.classpath"/>
+ </path>
+
+ <!-- Informa RSS -->
+ <property name="informa.rss.root" value="${project.thirdparty}/informa-rss"/>
+ <property name="informa.rss.lib" value="${informa.rss.root}/lib"/>
+ <path id="informa.rss.classpath">
+ <pathelement path="${informa.rss.lib}/informa.jar"/>
+ </path>
+
+ <!-- JRegex -->
+ <property name="jregex.jregex.root" value="${project.thirdparty}/jregex-jregex"/>
+ <property name="jregex.jregex.lib" value="${jregex.jregex.root}/lib"/>
+ <path id="jregex.jregex.classpath">
+ <pathelement path="${jregex.jregex.lib}/jregex.jar"/>
+ </path>
+
+ <!-- DNSJava -->
+ <property name="sourceforge.dnsjava.root" value="${project.thirdparty}/sourceforge-dnsjava"/>
+ <property name="sourceforge.dnsjava.lib" value="${sourceforge.dnsjava.root}/lib"/>
+ <path id="sourceforge.dnsjava.classpath">
+ <pathelement path="${sourceforge.dnsjava.lib}/dnsjava-1.4.3.jar"/>
+ </path>
+
+ <!-- M.Wutka's DTD parser -->
+ <property name="wutka.dtdparser.root" value="${project.thirdparty}/wutka-dtdparser"/>
+ <property name="wutka.dtdparser.lib" value="${wutka.dtdparser.root}/lib"/>
+ <path id="wutka.dtdparser.classpath">
+ <pathelement path="${wutka.dtdparser.lib}/dtdparser121.jar"/>
+ </path>
+
+ <!-- JFreeChart -->
+ <property name="jfreechart.jfreechart.root" value="${project.thirdparty}/jfreechart"/>
+ <property name="jfreechart.jfreechart.lib" value="${jfreechart.jfreechart.root}/lib"/>
+ <path id="jfreechart.jfreechart.classpath">
+ <fileset dir="${jfreechart.jfreechart.lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+
+ <!-- ebxmlrr -->
+ <property name="ebxmlrr.ebxmlrr.root" value="${project.thirdparty}/sun-ebxmlrr"/>
+ <property name="ebxmlrr.ebxmlrr.lib" value="${ebxmlrr.ebxmlrr.root}/lib"/>
+ <path id="ebxmlrr.ebxmlrr.classpath">
+ <pathelement path="${ebxmlrr.ebxmlrr.lib}/ebxmlrr.jar"/>
+ <pathelement path="${ebxmlrr.ebxmlrr.lib}/jaxr-client.jar"/>
+ </path>
+
+ <!-- ANTLR -->
+ <property name="antlr.antlr.root" value="${project.thirdparty}/antlr"/>
+ <property name="antlr.antlr.lib" value="${antlr.antlr.root}/lib"/>
+ <path id="antlr.antlr.classpath">
+ <pathelement path="${antlr.antlr.lib}/antlr-2.7.5H3.jar"/>
+ </path>
+
+ <!-- Apache Taglibs -->
+ <property name="apache.taglibs.root" value="${project.thirdparty}/apache-taglibs"/>
+ <property name="apache.taglibs.lib" value="${apache.taglibs.root}/lib"/>
+ <path id="apache.taglibs.classpath">
+ <pathelement path="${apache.taglibs.lib}/jstl-1.1.2.jar"/>
+ <pathelement path="${apache.taglibs.lib}/standard-1.1.2.jar"/>
+ </path>
+
+ <!-- Apache ORO -->
+ <property name="apache.oro.root" value="${project.thirdparty}/apache-oro"/>
+ <property name="apache.oro.lib" value="${apache.oro.root}/lib"/>
+ <path id="apache.oro.classpath">
+ <pathelement path="${apache.oro.lib}/jakarta-oro-2.0.8.jar"/>
+ </path>
+
+ <!-- Apache Struts -->
+ <property name="apache.struts.root" value="${project.thirdparty}/apache-struts"/>
+ <property name="apache.struts.lib" value="${apache.struts.root}/lib"/>
+ <path id="apache.struts.classpath">
+ <pathelement path="${apache.struts.lib}/struts-1.2.6.jar"/>
+ </path>
+
+ <!-- StAX -->
+ <property name="codehaus.stax.root" value="${project.thirdparty}/codehaus-stax"/>
+ <property name="codehaus.stax.lib" value="${codehaus.stax.root}/lib"/>
+ <path id="codehaus.stax.classpath">
+ <pathelement path="${codehaus.stax.lib}/stax-1.1.1.jar"/>
+ </path>
+
+ <!-- XMLUnit -->
+ <property name="xmlunit.xmlunit.root" value="${project.thirdparty}/xmlunit-xmlunit"/>
+ <property name="xmlunit.xmlunit.lib" value="${xmlunit.xmlunit.root}/lib"/>
+ <path id="xmlunit.xmlunit.classpath">
+ <pathelement path="${xmlunit.xmlunit.lib}/xmlunit1.0.jar"/>
+ </path>
+
+ <!-- easymock -->
+ <property name="easymock.easymock.root" value="${project.thirdparty}/easymock"/>
+ <property name="easymock.easymock.lib" value="${easymock.easymock.root}/lib/"/>
+ <property name="easymock.easymock.resources" value="${easymock.easymock.root}/resources/"/>
+ <path id="easymock.easymock.classpath">
+ <pathelement path="${easymock.easymock.lib}/easymockclassextension.jar"/>
+ <pathelement path="${easymock.easymock.lib}/easymock-1.1.jar"/>
+ </path>
+
+ <!-- struts-test-case -->
+ <property name="struts.test.case.root" value="${project.thirdparty}/struts-test-case"/>
+ <property name="struts.test.case.lib" value="${struts.test.case.root}/lib/"/>
+ <property name="struts.test.case.resources" value="${struts.test.case.root}/resources/"/>
+ <path id="struts.test.case.classpath">
+ <pathelement path="${struts.test.case.lib}/strutstest-2.1.3.jar"/>
+ </path>
+
+ <!-- cache -->
+ <property name="jboss.cache.root" value="${project.thirdparty}/jboss/cache"/>
+ <property name="jboss.cache.lib" value="${jboss.cache.root}/lib"/>
+ <path id="jboss.cache.classpath">
+ <pathelement path="${jboss.cache.lib}/jboss-cache.jar"/>
+ </path>
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/modules.ent 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/modules.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,178 +0,0 @@
-<!-- $Id$ -->
-
-<target name="configure-modules" unless="configure-modules.disabled">
-
- <!-- Cluster -->
- <property name="jboss.cluster.root" value="${project.root}/cluster/output"/>
- <property name="jboss.cluster.lib" value="${jboss.cluster.root}/lib"/>
- <path id="jboss.cluster.classpath">
- <pathelement path="${jboss.cluster.root}/classes"/>
- </path>
-
- <!-- Common -->
- <property name="jboss.common.root" value="${project.root}/common/output"/>
- <property name="jboss.common.lib" value="${jboss.common.root}/lib"/>
- <path id="jboss.common.classpath">
- <pathelement path="${jboss.common.lib}/jboss-common.jar"/>
- </path>
-
- <!-- Connector -->
- <property name="jboss.connector.root" value="${project.root}/connector/output"/>
- <property name="jboss.connector.lib" value="${jboss.connector.root}/lib"/>
- <path id="jboss.connector.classpath">
- <pathelement path="${jboss.connector.lib}/jboss-jca.jar"/>
- <pathelement path="${jboss.connector.lib}/local-ra-jdbc-libs.jar"/>
- </path>
-
- <!-- Iiop -->
- <property name="jboss.iiop.root" value="${project.root}/iiop/output"/>
- <property name="jboss.iiop.lib" value="${jboss.iiop.root}/lib"/>
- <path id="jboss.iiop.classpath">
- <pathelement path="${jboss.iiop.lib}/jboss-iiop.jar"/>
- </path>
-
- <!-- J2EE -->
- <property name="jboss.j2ee.root" value="${project.root}/j2ee/output"/>
- <property name="jboss.j2ee.lib" value="${jboss.j2ee.root}/lib"/>
- <path id="jboss.j2ee.classpath">
- <pathelement path="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
- </path>
-
- <!-- Jbossnet -->
- <property name="jboss.jbossnet.root" value="${project.root}/jboss.net/output"/>
- <property name="jboss.jbossnet.lib" value="${jboss.jbossnet.root}/lib"/>
- <!--path id="jboss.jbossnet.classpath">
- <pathelement path="${jboss.jbossnet.lib}/jboss-net.sar"/>
- </path-->
-
- <!-- Jetty -->
- <property name="jboss.jetty.root" value="${project.root}/jetty/output"/>
- <property name="jboss.jetty.lib" value="${jboss.jetty.root}/lib"/>
- <!--path id="jboss.jetty.classpath">
- <pathelement path="${jboss.jetty.lib}/??.sar"/>
- </path-->
- <path id="jetty.servlet.classpath">
- <pathelement path="${jboss.jetty.lib}/javax.servlet.jar"/>
- </path>
-
- <!-- JMX -->
- <property name="jboss.jmx.root" value="${project.root}/jmx/output"/>
- <property name="jboss.jmx.lib" value="${jboss.jmx.root}/lib"/>
- <path id="jboss.jmx.classpath">
- <pathelement path="${jboss.jmx.lib}/jboss-jmx.jar"/>
- </path>
-
- <!-- AOP -->
- <property name="jboss.aop.root" value="${project.root}/aop/output"/>
- <property name="jboss.aop.lib" value="${jboss.aop.root}/lib"/>
- <path id="jboss.aop.classpath">
- <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
- </path>
-
- <!-- Management -->
- <property name="jboss.management.root" value="${project.root}/management/output"/>
- <property name="jboss.management.lib" value="${jboss.management.root}/lib"/>
- <path id="jboss.management.classpath">
- <pathelement path="${jboss.management.lib}/jboss-jsr77.jar"/>
- <pathelement path="${jboss.management.lib}/jboss-management.jar"/>
- </path>
-
- <!-- Messaging -->
- <property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
- <property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
- <path id="jboss.messaging.classpath">
- <pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
- </path>
-
- <!-- Naming -->
- <property name="jboss.naming.root" value="${project.root}/naming/output"/>
- <property name="jboss.naming.lib" value="${jboss.naming.root}/lib"/>
- <path id="jboss.naming.classpath">
- <pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
- </path>
-
- <!-- Security -->
- <property name="jboss.security.root" value="${project.root}/security/output"/>
- <property name="jboss.security.lib" value="${jboss.security.root}/lib"/>
- <path id="jboss.security.classpath">
- <pathelement path="${jboss.security.lib}/jbosssx.jar"/>
- <pathelement path="${jboss.security.lib}/jboss-jaas.jar"/>
- </path>
-
- <!-- Server -->
- <property name="jboss.server.root" value="${project.root}/server/output"/>
- <property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
- <path id="jboss.server.classpath">
- <pathelement path="${jboss.server.lib}/jboss.jar"/>
- <pathelement path="${jboss.server.lib}/jmx-rmi-connector-client.jar"/>
- <pathelement path="${jboss.server.lib}/jmx-rmi-adaptor.jar"/>
- </path>
-
- <!-- System -->
- <property name="jboss.system.root" value="${project.root}/system/output"/>
- <property name="jboss.system.lib" value="${jboss.system.root}/lib"/>
- <path id="jboss.system.classpath">
- <pathelement path="${jboss.system.lib}/jboss-system.jar"/>
- </path>
- <property name="jboss.system.xdocletpath"
- value="${project.root}/system/src/main"/>
-
- <!-- Transaction -->
- <property name="jboss.transaction.root" value="${project.root}/transaction/output"/>
- <property name="jboss.transaction.lib" value="${jboss.transaction.root}/lib"/>
- <path id="jboss.transaction.classpath">
- <pathelement path="${jboss.transaction.lib}/jboss-transaction.jar"/>
- </path>
-
- <!-- Varia -->
- <property name="jboss.varia.root" value="${project.root}/varia/output"/>
- <property name="jboss.varia.lib" value="${jboss.varia.root}/lib"/>
- <path id="jboss.varia.classpath">
- <pathelement path="${jboss.varia.root}/classes"/>
- </path>
-
- <!-- Blocks -->
- <property name="jboss.blocks.root" value="${project.root}/blocks/output"/>
- <property name="jboss.blocks.lib" value="${jboss.blocks.root}/lib"/>
- <path id="jboss.blocks.classpath">
- <pathelement path="${jboss.blocks.lib}/jboss-blocks.jar"/>
- </path>
- <property name="jboss.blocks.source" value="${project.root}/blocks/src"/>
- <property name="jboss.blocks.source.java" value="${project.root}/blocks/src/main"/>
-
- <!-- EJB -->
- <property name="jboss.ejb.root" value="${project.root}/ejb/output"/>
- <property name="jboss.ejb.lib" value="${jboss.ejb.root}/lib"/>
- <path id="jboss.ejb.classpath">
- <pathelement path="${jboss.ejb.lib}/jboss-ejb.jar"/>
- </path>
-
- <!-- Nukes on JBoss -->
- <property name="jboss.nukes.root" value="${project.root}/nukes/output"/>
- <property name="jboss.nukes.lib" value="${jboss.nukes.root}/lib"/>
- <path id="jboss.nukes.classpath">
- <pathelement path="${jboss.nukes.lib}/nukes-lib.jar"/>
- </path>
-
- <!-- Nukes ON JBoss journal -->
- <property name="jboss.nukes-journal.root" value="${project.root}/journal/output"/>
- <property name="jboss.nukes-journal.lib" value="${jboss.nukes-journal.root}/lib"/>
- <path id="jboss.nukes-journal.classpath">
- <pathelement path="${jboss.nukes-journal.lib}/nukes-journal-lib.jar"/>
- </path>
-
- <!-- JBoss Media -->
- <property name="jboss.media.root" value="${project.root}/media/output"/>
- <property name="jboss.media.lib" value="${jboss.media.root}/lib"/>
- <path id="jboss.media.classpath">
- <pathelement path="${jboss.media.root}/classes"/>
- </path>
-
- <!-- JBoss Remoting -->
- <property name="jboss.remoting.root" value="${project.root}/remoting/output"/>
- <property name="jboss.remoting.lib" value="${jboss.remoting.root}/lib"/>
- <path id="jboss.remoting.classpath">
- <pathelement path="${jboss.remoting.root}/classes"/>
- </path>
-
-</target>
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/targets.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/targets.ent 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/targets.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,743 +0,0 @@
-<!-- $Id$ -->
-
-<!-- ================================================================== -->
-<!-- Initialization -->
-<!-- ================================================================== -->
-
-<!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
-<target name="_default:init" unless="init.disable" depends="_buildmagic:init">
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Compile -->
-<!-- ================================================================== -->
-
-<!-- Compile all class files -->
-<target name="_default:compile-classes" depends="init" unless="compile.disable">
- <mkdir dir="${build.classes}"/>
-
- <!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen.classes}"/>
-
- <!-- Remove classes which depend on changed files, so they will rebuild. -->
- <depend srcdir="${source.java}:${build.gen.classes}"
- destdir="${build.classes}"
- dump="${javac.depend.dump}"
- closure="${javac.depend.closure}">
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </depend>
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- 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}:${build.gen.classes}"/>
- <classpath refid="javac.classpath"/>
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </javac>
-</target>
-
-<!-- Compile all module test class files -->
-<target name="_default:compile-test-classes" depends="init" unless="compile.disable">
-
- <mkdir dir="${build.test}"/>
-
- <!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen.test}"/>
-
- <!-- Remove classes which depend on changed files, so they will rebuild. -->
- <depend srcdir="${source.test}:${build.gen.test}"
- destdir="${build.test}"
- dump="${javac.depend.dump}"
- closure="${javac.depend.closure}">
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </depend>
-
- <javac destdir="${build.test}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- 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.test}:${build.gen.test}"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </javac>
-</target>
-
-<!-- Compile manifests -->
-<target name="_default:compile-etc" depends="init" unless="compile.disable">
- <mkdir dir="${build.etc}"/>
- <copy todir="${build.etc}" filtering="yes">
- <fileset dir="${source.etc}">
- <include name="**"/>
- </fileset>
- </copy>
-</target>
-
-<!-- Compile resource files -->
-<target name="_default:compile-resources" depends="init" unless="compile.disable">
- <mkdir dir="${build.resources}"/>
- <copy todir="${build.resources}" filtering="yes">
- <fileset dir="${source.resources}">
- <patternset refid="compile-resources.filter.pattern"/>
- </fileset>
- </copy>
- <copy todir="${build.resources}" filtering="no">
- <fileset dir="${source.resources}">
- <patternset refid="compile-resources.pattern"/>
- </fileset>
- </copy>
-</target>
-
-<patternset id="compile-resources.filter.pattern">
- <include name="**/*"/>
-</patternset>
-
-<patternset id="compile-resources.pattern">
- <exclude name="INVALID_FILE_DOES_NOT_EXISTS"/>
-</patternset>
-
-<!-- Compile stylesheets files -->
-<target name="_default:compile-stylesheets" depends="init" unless="compile.disable">
- <mkdir dir="${build.stylesheets}"/>
- <copy todir="${build.stylesheets}" filtering="yes">
- <fileset dir="${source.stylesheets}">
- <include name="**/*"/>
- </fileset>
- </copy>
-</target>
-
-<!-- Compile bin scripts -->
-<target name="_default:compile-bin" depends="init" unless="compile.disable">
- <mkdir dir="${build.bin}"/>
- <copy todir="${build.bin}" filtering="yes">
- <fileset dir="${source.bin}">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- <call target="_default:fix-bin"/>
-</target>
-
-<target name="_default:fix-bin" depends="init">
- <fixcrlf srcdir="${build.bin}"
- eol="lf" eof="remove"
- includes="**/*.sh"/>
-
- <fixcrlf srcdir="${build.bin}"
- eol="crlf" eof="remove"
- includes="**/*.bat, **/*.cmd"/>
-
- <chmod perm="+x">
- <fileset dir="${build.bin}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
-</target>
-
-<target name="_default:compile-web" depends="init" unless="compile.disable">
- <mkdir dir="${build.web}"/>
- <copy todir="${build.web}" filtering="yes">
- <fileset dir="${source.web}">
- <patternset refid="compile-web.filter.pattern"/>
- </fileset>
- </copy>
- <copy todir="${build.web}" filtering="no">
- <fileset dir="${source.web}">
- <patternset refid="compile-web.pattern"/>
- </fileset>
- </copy>
-</target>
-
-<patternset id="compile-web.pattern">
- <exclude name="INVALID_FILE_DOES_NOT_EXISTS"/>
-</patternset>
-
-<patternset id="compile-web.filter.pattern">
- <include name="**/*"/>
-</patternset>
-
-<target name="_default:compile-checksums" depends="init" unless="compile.disable">
- <checksum>
- <fileset dir="${build.lib}">
- <include name="*.jar"/>
- <include name="*.zip"/>
- </fileset>
- </checksum>
-</target>
-
-<!-- Compile RMI stubs -->
-<target name="_default:compile-rmi" depends="init" unless="compile.disable">
- <rmic base="${build.classes}"
- verify="${rmic.verify}"
- iiop="${rmic.iiop}"
- iiopopts="${rmic.iiopops}"
- idl="${rmic.idl}"
- idlopts="${rmic.idlops}"
- debug="${rmic.debug}"
- stubVersion="${rmic.stubVersion}">
- <classpath refid="javac.classpath"/>
- <patternset refid="compile-rmi.pattern"/>
- </rmic>
-</target>
-
-<patternset id="compile-rmi.pattern">
- <exclude name="INVALID_FILE_DOES_NOT_EXISTS"/>
-</patternset>
-
-<!-- ================================================================== -->
-<!-- Tests -->
-<!-- ================================================================== -->
-<!-- default test target. To test a module, include
- <target name="tests" depends="_default:tests"/>
- in the module build file-->
-
- <target name="_default:tests" depends="compile" unless="tests.disable">
-<echo message="build.reports: ${build.reports}"/>
- <mkdir dir="${build.test}"/>
-
- <!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen.test}"/>
-
- <path id="tests.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/junit.jar"/>
- <pathelement path="${project.tools}/lib/optional.jar"/>
- <path refid="thirdparty.classpath"/>
-<!-- FIXME: Need to add at least log4j here, what else? -->
- <path refid="apache.log4j.classpath"/>
- </path>
-
- <!--default value, reset earlier if desired-->
- <property name="log4j.configuration" value="file:${project.root}/testsuite/src/resources/log4j.xml"/>
- <property name="test.pattern" value="**/*TestCase.class"/>
-
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.log}"/>
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <jvmarg value="${junit.jvm.options}"/>
- <sysproperty key="build.log" value="${build.log}"/>
- <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
- <sysproperty key="jbosstest.data.dir" value="${jbosstest.data.dir}"/>
-
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.test}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- </classpath>
-
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.test}">
- <include name="${test.pattern}"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <!-- end _default:tests-->
-
-<!-- ================================================================== -->
-<!-- Documents -->
-<!-- ================================================================== -->
-
-<target name="_default:docs" description="Builds all documentation."
- depends="docs-api,
- docs-todo"/>
-
-<!-- ======== -->
-<!-- JavaDocs -->
-<!-- ======== -->
-
-<target name="docs-javadocs-check" depends="init">
-
- <!-- if index.html is newer than the sources we are up to date -->
- <uptodate property="docs-javadocs.disable"
- targetfile="${build.api}/index.html">
- <srcfiles dir="${source.java}" includes="**/*.java"/>
- </uptodate>
- </target>
-
- <!-- Generate Javadoc if we are out of date -->
- <target name="docs-javadocs"
- depends="docs-javadocs-check"
- unless="docs-javadocs.disable">
-
- <mkdir dir="${build.api}"/>
- <javadoc packagenames="${javadoc.packages}"
- sourcepath="${source.classes}:${build.gen.classes}"
- destdir="${build.api}"
- classpathref="javadoc.classpath"
- windowtitle="${javadoc.windowtitle}"
- splitindex="${javadoc.splitindex}"
- author="${javadoc.author}"
- version="${javadoc.version}"
- public="${javadoc.public}"
- package="${javadoc.package}"
- protected="${javadoc.protected}"
- private="${javadoc.private}"
- use="${javadoc.use}"
- verbose="${javadoc.verbose}">
- <doctitle><![CDATA[<h1>${module.Name} API Documentation</h1>]]></doctitle>
- <bottom><![CDATA[
- <i>
- <div align="center">
- <font size="-1">Copyright © 2002 JBoss Group, LLC. All Rights Reserved.</font>
- </div>
- </i>
- ]]></bottom>
-
- <!--
- <link href="http://java.sun.com/j2se/1.3/docs/api"/>
- -->
- </javadoc>
-</target>
-
-<target name="docs-api" depends="docs-javadocs"/>
-
-<target name="javadocs" depends="docs-javadocs"/>
-
-<!-- ========= -->
-<!-- TODO Docs -->
-<!-- ========= -->
-
-<target name="docs-todo-check" depends="init">
-
- <!-- if index.html is newer than the sources we are up to date -->
- <uptodate property="docs-todo.disable"
- targetfile="${build.todo}/index.html">
- <srcfiles dir="${source.java}" includes="**/*.java"/>
- </uptodate>
- </target>
-
- <!-- Generate TODO list from @todo tags -->
- <target name="docs-todo"
- depends="docs-todo-check"
- unless="docs-todo.disable">
-
- <mkdir dir="${build.todo}"/>
- <todo destdir="${build.todo}">
- <fileset dir="${source.java}">
- <include name="**/*.java"/>
- </fileset>
-
- <info/>
- </todo>
-</target>
-
-<target name="todo" depends="docs-todo"/>
-
-<!-- ============== -->
-<!-- JMX MBean Docs -->
-<!-- ============== -->
-
-<target name="jmx-docs" depends="init">
-
- <mkdir dir="${build.jmx-doc}"/>
- <jmxdoclet destdir="${build.jmx-doc}"
- force="false"
- excludedtags="@version, at author">
- <fileset dir="${source.java}">
- <include name="**/*.java"/>
- </fileset>
- <jbossXmlDoc/>
- </jmxdoclet>
-
-</target>
-
-<!-- Generate the plain HTML jmx docs -->
-<target name="docs-jmx-html-plain" depends="jmx-docs">
-
- <!-- Force the use of SAXON XSLT -->
- <property system="true"
- name="javax.xml.transform.TransformerFactory"
- value="com.icl.saxon.TransformerFactoryImpl"/>
-
- <mkdir dir="${build.jmx-api}"/>
- <style style="${project.thirdparty}/oasis/docbook-xsl/html/docbook.xsl"
- processor="trax"
- extension=".html"
- basedir="${build.jmx-doc}"
- destdir="${build.jmx-api}">
- <include name="**/*.xml"/>
- <param name="quiet" expression="${oasis.docbook.xsl.chunker.quiet}"/>
- <param name="base.dir" expression="${build.jmx-api}${file.separator}"/>
- <xmlcatalog>
- <dtd
- publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
- location="${project.thirdparty}/oasis/docbook-xml/docbookx.dtd"/>
- </xmlcatalog>
- </style>
-
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Cleaning -->
-<!-- ================================================================== -->
-
-<!-- Clean up all build output -->
-<target name="_default:clean"
- description="Cleans up most generated files."
- depends="_buildmagic:clean">
-</target>
-
-<!-- Clean up all generated files -->
-<target name="_default:clobber"
- description="Cleans up all generated files."
- depends="_buildmagic:clobber, clean">
-</target>
-
-<target name="rebuild" depends="clean,most"/>
-
-
-<!-- ================================================================== -->
-<!-- Misc. -->
-<!-- ================================================================== -->
-
-<target name="_default:main"
- description="Executes the default target (most)."
- depends="most"/>
-
-<target name="_default:all"
- description="Builds everything."
- depends="most,docs"/>
-
-<target name="_default:most"
- description="Builds almost everything."
- depends="output"/>
-
-<target name="_default:help"
- description="Show this help message."
- depends="_buildmagic:help:standard"/>
-
-
-<!-- ================================================================== -->
-<!-- Install & Release -->
-<!-- ================================================================== -->
-
-<!--
- | These are almost never overriden, so no need to force module build.xml
- | to define them.
- -->
-
-<target name="release-zip"
- description="Builds a ZIP distribution."
- depends="output, _buildmagic:release:zip"/>
-
-<target name="release-tar"
- description="Builds a TAR distribution."
- depends="output, _buildmagic:release:tar"/>
-
-<target name="release-tgz"
- description="Builds a TAR-GZ distribution."
- depends="output, _buildmagic:release:tgz"/>
-
-<target name="release-all"
- description="Builds a distribution for each archive type."
- depends="release-zip, release-tgz"/>
-
-
- <!-- ================================================================== -->
- <!-- Project (build module) Targets -->
- <!-- ================================================================== -->
-
-<!-- jason: this needs to be cleaned up -->
-
-<target name="configure-project" unless="configure-project.disable">
-
- <!-- Bits for building source archives -->
- <patternset id="source.ignore">
- <exclude name="**/output/**"/>
- </patternset>
- <patternset id="source.free">
- <exclude name="tools/**"/>
- <exclude name="thirdparty/**"/>
- <include name="**"/>
- </patternset>
- <patternset id="source.external">
- <include name="tools/**"/>
- <include name="thirdparty/**"/>
- </patternset>
-
- <!-- Skip any missing modules and issue a warning -->
- <property name="executemodules.skipmissing" value="true"/>
-
- <!-- The header and footer displayed during each module execution -->
- <property name="executemodules.header"><![CDATA[
- ==============================================================
- ==
- == Executing '@TARGET@' in module '@MODULE@'...
- ==
- ==]]></property>
-
- <property name="executemodules.footer"><![CDATA[
- ==
- ==
- == Finished '@TARGET@' in module '@MODULE@'.
- ==
- ==============================================================
- ]]></property>
-
- <property name="executemodules.exportproperties">
- version.major,
- version.minor,
- version.revision,
- version.tag,
- version.name,
- version.cvstag,
-
- specification.title,
- specification.version,
- specification.vendor,
-
- implementation.title,
- implementation.version,
- implementation.vendor,
- implementation.vendor.id,
- implementation.url
- </property>
-
- <!-- Show the module configuration -->
- <echo>groups: ${groups}</echo>
- <echo>modules: ${modules}</echo>
-
- <property name="configure-project.disable" value="true" system="true"/>
-
-</target>
-
- <!-- ================================================================== -->
- <!-- Module Pass-through Targets -->
- <!-- ================================================================== -->
-
- <!--
- | These targets will execute all configured modules with the specified
- | target.
- -->
-
- <target name="modules-all" depends="_buildmagic:modules:all"/>
- <target name="modules-most" depends="_buildmagic:modules:most"/>
- <target name="modules-main" depends="_buildmagic:modules:main"/>
- <target name="modules-release" depends="_buildmagic:modules:release"/>
- <target name="modules-tests" depends="_buildmagic:modules:tests"/>
- <target name="modules-clean" depends="_buildmagic:modules:clean"/>
- <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
-
-
-<!-- ================================================================== -->
-<!-- Module Pass-through Targets -->
-<!-- ================================================================== -->
-
-<!-- Invoke the 'all' on all configured modules -->
-<target name="_buildmagic:modules:all" depends="init">
- <execmodules target="all"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'most' on all configured modules -->
-<target name="_buildmagic:modules:most" depends="init">
- <execmodules target="most"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'main' on all configured modules -->
-<target name="_buildmagic:modules:main" depends="init">
- <execmodules target="main"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'release' on all configured modules -->
-<target name="_buildmagic:modules:release" depends="init">
- <execmodules target="release"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'tests' on all configured modules -->
-<target name="_buildmagic:modules:tests" depends="init">
- <execmodules target="tests"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- <property name="build.reports" value="${project.root}/testsuite/output/reports"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clean' on all configured modules -->
-<target name="_buildmagic:modules:clean" depends="init">
- <execmodules target="clean"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clobber' on all configured modules -->
-<target name="_buildmagic:modules:clobber" depends="init">
- <execmodules target="clobber"
- modules="${modules}"
- root="${project.root}/@MODULE@"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module- at MODULE@- at TARGET@-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module- at MODULE@- at TARGET@"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-
- <!-- ================================================================== -->
- <!-- Source Archives -->
- <!-- ================================================================== -->
-
- <target name="source-free-zip" depends="init"
- description="Builds a ZIP free source distribution.">
- <mkdir dir="${module.output}"/>
- <zip zipfile="${module.output}/${release.id}-free-src.zip">
- <fileset dir="${project.root}">
- <patternset refid="source.ignore"/>
- <patternset refid="source.free"/>
- </fileset>
- </zip>
- </target>
-
- <target name="source-external-zip" depends="init"
- description="Builds a ZIP external source distribution.">
- <mkdir dir="${module.output}"/>
- <zip zipfile="${module.output}/${release.id}-external-src.zip">
- <fileset dir="${project.root}">
- <patternset refid="source.ignore"/>
- <patternset refid="source.external"/>
- </fileset>
- </zip>
- </target>
-
- <target name="source-zip" depends="source-free-zip, source-external-zip"
- description="Builds a ZIP source distribution."/>
-
- <target name="source-free-tar" depends="init"
- description="Builds a TAR free source distribution.">
- <mkdir dir="${module.output}"/>
- <tar tarfile="${module.output}/${release.id}-free-src.tar" longfile="gnu"
- basedir="${project.root}">
- <patternset refid="source.ignore"/>
- <patternset refid="source.free"/>
- </tar>
- </target>
-
- <target name="source-external-tar" depends="init"
- description="Builds a TAR external source distribution.">
- <mkdir dir="${module.output}"/>
- <tar tarfile="${module.output}/${release.id}-external-src.tar" longfile="gnu"
- basedir="${project.root}">
- <patternset refid="source.ignore"/>
- <patternset refid="source.external"/>
- </tar>
- </target>
-
- <target name="source-tar" depends="source-free-tar, source-external-tar"
- description="Builds a TAR source distribution."/>
-
- <target name="source-free-tgz" depends="source-free-tar"
- description="Builds a TAR-GZIP free source distribution.">
- <gzip src="${module.output}/${release.id}-free-src.tar"
- zipfile="${module.output}/${release.id}-free-src.tgz"/>
- </target>
-
- <target name="source-external-tgz" depends="source-external-tar"
- description="Builds a TAR-GZIP external source distribution.">
- <gzip src="${module.output}/${release.id}-external-src.tar"
- zipfile="${module.output}/${release.id}-external-src.tgz"/>
- </target>
-
- <target name="source-tgz" depends="source-free-tgz, source-external-tgz"
- description="Builds a TAR-GZIP source distribution."/>
-
- <target name="source-all"
- depends="source-tar, source-tgz, source-zip"
- description="Builds all source distributions."/>
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/targets.ent (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/targets.ent)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/targets.ent (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/targets.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,116 @@
+<!-- $Id$ -->
+<!--
+ $Log: targets.ent,v $
+ Revision 1.5 2004/11/24 02:07:36 starksm
+ Restore the tools module content after the errant removal
+
+ Revision 1.3 2004/03/29 19:49:17 ejort
+ Bring build into line with jboss-3.2
+
+ Revision 1.1.2.2 2003/12/07 22:12:53 ejort
+ Make a start on simplifying the build,
+ including incremental xdoclet MBean generation
+
+ Revision 1.1.2.1 2003/05/18 06:24:13 starksm
+
+ Standard targets
+-->
+
+ <!-- ================================================================== -->
+ <!-- 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>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jars"
+ description="Builds all jar files."
+ depends="_buildmagic:build-bypass-check"
+ unless="build-bypass.on">
+
+ <call target="compile"/>
+
+ <mkdir dir="${build.lib}"/>
+
+ <call target="module-jars"/>
+
+ <!-- Update the build marker to allow bypassing -->
+ <touch file="${build-bypass.marker}"/>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Install & Release -->
+ <!-- ================================================================== -->
+
+ <target name="install"
+ description="Install the structure for a release."
+ depends="all, _buildmagic:install:default"/>
+
+ <target name="release" depends="install"/>
+
+ <target name="release-zip"
+ description="Builds a ZIP distribution."
+ depends="release, _buildmagic:release:zip"/>
+
+ <target name="release-tar"
+ description="Builds a TAR distribution."
+ depends="release, _buildmagic:release:tar"/>
+
+ <target name="release-tgz"
+ description="Builds a TAR-GZ distribution."
+ depends="release, _buildmagic:release:tgz"/>
+
+ <target name="release-all"
+ description="Builds a distribution for each archive type."
+ depends="release-zip, release-tgz"/>
+
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <!-- Clean up all build output -->
+ <target name="clean"
+ description="Cleans up most generated files."
+ depends="_buildmagic:clean">
+ </target>
+
+ <!-- Clean up all generated files -->
+ <target name="clobber"
+ description="Cleans up all generated files."
+ depends="_buildmagic:clobber, clean">
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
+
+ <target name="main"
+ description="Executes the default target (most)."
+ depends="most"/>
+
+ <target name="all"
+ description="Builds everything."
+ depends="jars, docs"/>
+
+ <target name="most"
+ description="Builds almost everything."
+ depends="jars"/>
+
+ <target name="help"
+ description="Show this help message."
+ depends="_buildmagic:help:standard"/>
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/task.properties
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/task.properties 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/task.properties 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,83 +0,0 @@
-### ====================================================================== ###
-## ##
-## 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=off
-javac.optimize=on
-javac.deprecation=on
-javac.target=1.2
-javac.verbose=off
-javac.depend=off
-javac.source=1.3
-
-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
-
-### 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=
-
-junit.formatter.type=xml
-junit.formatter.usefile=true
-
-junit.batchtest.fork=${junit.fork}
-junit.batchtest.haltonerror=${junit.haltonerror}
-junit.batchtest.haltonfailure=${junit.haltonfailure}
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/task.properties (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/task.properties)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/task.properties (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/task.properties 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,83 @@
+### ====================================================================== ###
+## ##
+## 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=off
+javac.optimize=on
+javac.deprecation=on
+javac.target=1.2
+javac.verbose=off
+javac.depend=off
+javac.source=1.3
+
+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
+
+### 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=
+
+junit.formatter.type=xml
+junit.formatter.usefile=true
+
+junit.batchtest.fork=${junit.fork}
+junit.batchtest.haltonerror=${junit.haltonerror}
+junit.batchtest.haltonfailure=${junit.haltonfailure}
Deleted: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/tools.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/tools.ent 2008-08-19 22:06:02 UTC (rev 21628)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/tools.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -1,70 +0,0 @@
-<!-- $Id$ -->
-
-
-<target name="configure-tools" unless="configure-tools.disable">
-
- <call target="_configure:xdoclet:tasks" unless="_configure:xdoclet:tasks.done">
- <available file="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
- <available file="${xdoclet.xdoclet.lib}/xdoclet-jmx-module-${xdoclet.version}.jar"/>
- </call>
-
- <call target="_configure:xdoclet:ejbdoclet" unless="_configure:xdoclet:ejbdoclet.done">
- <available file="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
- <available file="${xdoclet.xdoclet.lib}/xdoclet-ejb-module-${xdoclet.version}.jar"/>
- <available file="${jboss.plastic.lib}/jboss-j2ee.jar"/>
- </call>
-
- <call target="_configure:xdoclet:webdoclet" unless="_configure:xdoclet:webdoclet.done">
- <available file="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
- <available file="${xdoclet.xdoclet.lib}/xdoclet-web-module-${xdoclet.version}.jar"/>
- <available file="${sun.servlet.lib}/servlet.jar"/>
- </call>
-
-</target>
-
-<target name="_configure:xdoclet:tasks">
-
- <path id="xdoclet.base.task.classpath">
- <path refid="xdoclet.xdoclet.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.ant.classpath"/>
- </path>
-
- <taskdef name="jmxdoclet"
- classname="xdoclet.modules.jmx.JMXDocletTask"
- classpathref="xdoclet.base.task.classpath"/>
-
- <taskdef name="todo"
- classname="xdoclet.modules.doc.DocumentDocletTask"
- classpathref="xdoclet.base.task.classpath"/>
-
- <property name="_configure:xdoclet:tasks.done" value="true" system="true"/>
-
-</target>
-
-<target name="_configure:xdoclet:ejbdoclet">
-
- <path id="ejbdoclet.task.classpath">
- <path refid="xdoclet.base.task.classpath"/>
- <path refid="jboss.plastic.classpath"/>
- </path>
-
- <taskdef name="ejbdoclet"
- classname="xdoclet.modules.ejb.EjbDocletTask"
- classpathref="ejbdoclet.task.classpath"/>
-
- <property name="_configure:xdoclet:ejbdoclet.done" value="true" system="true"/>
-</target>
-
-<target name="_configure:xdoclet:webdoclet">
- <path id="webdoclet.task.classpath">
- <path refid="xdoclet.base.task.classpath"/>
- <path refid="sun.servlet.classpath"/>
- </path>
-
- <taskdef name="webdoclet"
- classname="xdoclet.modules.web.WebDocletTask"
- classpathref="webdoclet.task.classpath"/>
-
- <property name="_configure:xdoclet:webdoclet.done" value="true" system="true"/>
-</target>
Copied: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/tools.ent (from rev 21759, labs/jbossbuild/buildmagic/trunk/tools/etc/buildfragments/tools.ent)
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/tools.ent (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/tools.ent 2008-08-25 19:56:03 UTC (rev 21890)
@@ -0,0 +1,70 @@
+<!-- $Id$ -->
+
+
+<target name="configure-tools" unless="configure-tools.disable">
+
+ <call target="_configure:xdoclet:tasks" unless="_configure:xdoclet:tasks.done">
+ <available file="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
+ <available file="${xdoclet.xdoclet.lib}/xdoclet-jmx-module-${xdoclet.version}.jar"/>
+ </call>
+
+ <call target="_configure:xdoclet:ejbdoclet" unless="_configure:xdoclet:ejbdoclet.done">
+ <available file="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
+ <available file="${xdoclet.xdoclet.lib}/xdoclet-ejb-module-${xdoclet.version}.jar"/>
+ <available file="${jboss.plastic.lib}/jboss-j2ee.jar"/>
+ </call>
+
+ <call target="_configure:xdoclet:webdoclet" unless="_configure:xdoclet:webdoclet.done">
+ <available file="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
+ <available file="${xdoclet.xdoclet.lib}/xdoclet-web-module-${xdoclet.version}.jar"/>
+ <available file="${sun.servlet.lib}/servlet.jar"/>
+ </call>
+
+</target>
+
+<!--<target name="_configure:xdoclet:tasks">
+
+ <path id="xdoclet.base.task.classpath">
+ <path refid="xdoclet.xdoclet.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="apache.ant.classpath"/>
+ </path>
+
+ <taskdef name="jmxdoclet"
+ classname="xdoclet.modules.jmx.JMXDocletTask"
+ classpathref="xdoclet.base.task.classpath"/>
+
+ <taskdef name="todo"
+ classname="xdoclet.modules.doc.DocumentDocletTask"
+ classpathref="xdoclet.base.task.classpath"/>
+
+ <property name="_configure:xdoclet:tasks.done" value="true" system="true"/>
+
+</target>-->
+
+<target name="_configure:xdoclet:ejbdoclet">
+
+ <path id="ejbdoclet.task.classpath">
+ <path refid="xdoclet.base.task.classpath"/>
+ <path refid="jboss.plastic.classpath"/>
+ </path>
+
+ <taskdef name="ejbdoclet"
+ classname="xdoclet.modules.ejb.EjbDocletTask"
+ classpathref="ejbdoclet.task.classpath"/>
+
+ <property name="_configure:xdoclet:ejbdoclet.done" value="true" system="true"/>
+</target>
+
+<target name="_configure:xdoclet:webdoclet">
+ <path id="webdoclet.task.classpath">
+ <path refid="xdoclet.base.task.classpath"/>
+ <path refid="sun.servlet.classpath"/>
+ </path>
+
+ <taskdef name="webdoclet"
+ classname="xdoclet.modules.web.WebDocletTask"
+ classpathref="webdoclet.task.classpath"/>
+
+ <property name="_configure:xdoclet:webdoclet.done" value="true" system="true"/>
+</target>
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/etc/xdoclet
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/etc/xdoclet/templates
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/examples
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
output
.settings
local.properties
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-antlr.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-antlr.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-bcel.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-bcel.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-bsf.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-bsf.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-log4j.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-log4j.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-oro.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-oro.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-regexp.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-regexp.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-resolver.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-apache-resolver.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-commons-logging.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-commons-net.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-commons-net.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-icontract.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-icontract.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jai.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jai.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-javamail.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-javamail.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jdepend.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jdepend.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jmf.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jmf.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jsch.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-jsch.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-junit.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-junit.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-launcher.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-launcher.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-netrexx.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-netrexx.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-nodeps.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-nodeps.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-starteam.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-starteam.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-stylebook.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-stylebook.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-swing.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-swing.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-trax.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-trax.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-vaj.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-vaj.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-weblogic.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-weblogic.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-xalan1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-xalan1.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-xslp.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/ant-xslp.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossbuild/buildmagic/trunk/tools/lib/ant.jar
===================================================================
(Binary files differ)
Modified: labs/jbossbuild/buildmagic/trunk/tools/lib/junit.jar
===================================================================
(Binary files differ)
Added: labs/jbossbuild/buildmagic/trunk/tools/lib/maven-ant-tasks-2.0.9.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/lib/maven-ant-tasks-2.0.9.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossbuild/buildmagic/trunk/tools/lib/optional.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossbuild/buildmagic/trunk/tools/lib/xalan.jar
===================================================================
(Binary files differ)
Modified: labs/jbossbuild/buildmagic/trunk/tools/lib/xercesImpl.jar
===================================================================
(Binary files differ)
Modified: labs/jbossbuild/buildmagic/trunk/tools/lib/xml-apis.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list