[jboss-cvs] JBossAS SVN: r92447 - in trunk: testsuite and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 17 17:21:31 EDT 2009
Author: pgier
Date: 2009-08-17 17:21:31 -0400 (Mon, 17 Aug 2009)
New Revision: 92447
Added:
trunk/testsuite/imports/task.properties
Modified:
trunk/build/build.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
Log:
[JBBUILD-538] Remove use of buildmagic version.properties and version-info.xml.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-08-17 21:21:17 UTC (rev 92446)
+++ trunk/build/build.xml 2009-08-17 21:21:31 UTC (rev 92447)
@@ -35,11 +35,11 @@
</target>
- <target name="init-thirdparty-dependencies" depends="init"
- description="Initialize thirdparty dependency configuration">
+ <target name="init-dependencies" depends="init"
+ description="Initialize dependency configuration">
<!-- Set a default file to use to define the thirdparty dependencies. -->
- <property name="thirdparty.pom.file" location="pom.xml"/>
+ <property name="dist.pom.file" location="pom.xml"/>
<!--
- Initialize properties for each dependency in the thirdparty pom
@@ -50,7 +50,7 @@
scopes="compile, runtime"
addArtifactFileSetRefs="true"
cacheDependencyRefs="true">
- <pom file="${thirdparty.pom.file}"/>
+ <pom file="${dist.pom.file}"/>
</maven:dependencies>
<mapper id="remove-versions" classpathref="maven-ant-tasks.classpath"
@@ -74,20 +74,19 @@
<property name="project.tools" value="${project.root}/tools"/>
<!-- Setup the build timestamp & build identifer properties -->
- <tstamp>
+ <!--<tstamp>
<format property="build.number" pattern="yyyyMMddHHmm"/>
<format property="YEAR" pattern="yyyy"/>
</tstamp>
- <property name="build.id" value="${build.number}"/>
+ <property name="build.id" value="${build.number}"/>-->
<!-- Version identifiers for the server. -->
- <property file="${project.tools}/etc/buildmagic/version.properties"/>
-
+ <xmlproperty file="../pom.xml" prefix="pom"/>
<!-- Module name(s) & version -->
<property name="dist.module.name" value="jboss"/>
<property name="dist.module.Name" value="JBoss Build"/>
- <property name="dist.module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="dist.module.version" value="${pom.project.version}"/>
<property name="dist.module.output" value="${basedir}/output"/>
<!-- Install/Release structure -->
@@ -181,7 +180,7 @@
<!-- ================================================================== -->
<target name="install-modules" description="Install each app server module to the distribution"
- depends="init-thirdparty-dependencies,
+ depends="init-dependencies,
module-main,
module-system,
module-system-jmx,
@@ -1937,11 +1936,10 @@
</copy>
</target>
- <!-- ============================================================== -->
- <!-- Thirdparty dependencies consumed directly from the repository -->
- <!-- ============================================================== -->
+ <!-- ========================================================================== -->
+ <!-- Thirdparty dependencies consumed directly from the local maven repository -->
+ <!-- ========================================================================== -->
-
<target name="thirdparty" description="Copy thirdparty dependencies from the repository">
<mkdir dir="${install.common.lib}"/>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-08-17 21:21:17 UTC (rev 92446)
+++ trunk/testsuite/build.xml 2009-08-17 21:21:31 UTC (rev 92447)
@@ -19,10 +19,11 @@
<dirname property="project.root" file="${basedir}"/>
<property name="project.tools" value="${project.root}/tools"/>
- <import file="${project.tools}/etc/buildmagic/version-info.xml"/>
+ <xmlproperty file="../pom.xml" prefix="pom"/>
+ <property name="version" value="${pom.project.version}"/>
<!-- Load common task properties -->
- <property file="${project.tools}/etc/buildmagic/task.properties"/>
+ <property file="imports/task.properties"/>
<!-- Setup the module environment. -->
<property name="module.root" value="${basedir}"/>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2009-08-17 21:21:17 UTC (rev 92446)
+++ trunk/testsuite/imports/server-config.xml 2009-08-17 21:21:31 UTC (rev 92447)
@@ -5,7 +5,6 @@
<project name="server-config" default="help"
xmlns:server="http://jboss.org/ns/test/ant/server">
- <property name="version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
<!-- Use the ${/} platform seperator in jboss.dist, jboss.test.deploy.dir as
this is used in the security policy file property references and needs to
be valid for the platform.
Added: trunk/testsuite/imports/task.properties
===================================================================
--- trunk/testsuite/imports/task.properties (rev 0)
+++ trunk/testsuite/imports/task.properties 2009-08-17 21:21:31 UTC (rev 92447)
@@ -0,0 +1,91 @@
+### ====================================================================== ###
+## ##
+## Default Task Properties ##
+## ##
+### ====================================================================== ###
+
+### $Id$ ###
+
+### Javac Defaults ###
+
+javac.includes=**/*.java
+javac.excludes=
+javac.defaultexcludes=yes
+
+javac.boot.classpath=${sun.boot.classpath}
+javac.classpath=${classpath}
+
+javac.debug=on
+javac.optimize=on
+javac.deprecation=on
+javac.target=1.5
+javac.verbose=off
+javac.depend=off
+javac.source=1.5
+
+javac.include.ant.runtime=no
+javac.include.java.runtime=no
+javac.fail.onerror=true
+
+classpath=
+classpath.local=
+classpath.thirdparty=
+
+### Javadoc Defaults ###
+
+javadoc.classpath=${javac.classpath}
+javadoc.sourcepath=
+javadoc.source.path=
+javadoc.source.files=
+
+javadoc.public=false
+javadoc.package=false
+javadoc.protected=true
+javadoc.private=false
+javadoc.version=true
+javadoc.author=true
+javadoc.use=true
+javadoc.verbose=false
+
+javadoc.windowtitle=${module.Name} API
+javadoc.doctitle=${module.Name}
+javadoc.splitindex=no
+
+### MBean Defaults ###
+mbean.includes=
+mbean.excludes=
+
+### Jar Defaults ###
+jar.server.includes=
+jar.client.includes=
+
+### RMIC Defaults ###
+
+rmic.base=${build.classes}
+rmic.stubVersion=1.2
+rmic.verify=true
+rmic.sourcebase=
+rmic.debug=false
+rmic.iiop=false
+rmic.iiopopts=
+rmic.idl=false
+rmic.idlopts=
+rmic.includes=
+rmic.excludes=
+
+### JUnit Defaults ###
+
+junit.printsummary=true
+junit.haltonerror=false
+junit.haltonfailure=false
+junit.fork=true
+junit.timeout=300000
+junit.jvm=java
+junit.jvm.options=-Dnone
+
+junit.formatter.type=xml
+junit.formatter.usefile=true
+
+junit.batchtest.fork=${junit.fork}
+junit.batchtest.haltonerror=${junit.haltonerror}
+junit.batchtest.haltonfailure=${junit.haltonfailure}
Property changes on: trunk/testsuite/imports/task.properties
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list