2:51 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 03:51:42 -0400 (Mon, 14 Apr 2008)
New Revision: 6404
Added:
framework/trunk/framework/ant/
framework/trunk/framework/ant/build-install.xml
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/build.xml
framework/trunk/testsuite/
framework/trunk/testsuite/test/
Removed:
framework/trunk/ant.properties.example
framework/trunk/build.xml
framework/trunk/externals/
framework/trunk/hudson/build-hudson.xml
framework/trunk/testsuite/test/
Modified:
framework/trunk/
framework/trunk/framework/pom.xml
framework/trunk/hudson/
Log:
Remove dependency on ant for install target
Property changes on: framework/trunk
___________________________________________________________________
Name: svn:ignore
- ant.properties
Deleted: framework/trunk/ant.properties.example
===================================================================
--- framework/trunk/ant.properties.example 2008-04-14 06:56:25 UTC (rev 6403)
+++ framework/trunk/ant.properties.example 2008-04-14 07:51:42 UTC (rev 6404)
@@ -1,57 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# JBossWS local repository
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# JBoss remote repository
-jboss.repository=http://repository.jboss.org
-
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
-# Hudson QA Environment
-hudson.username=changeme
-hudson.password=changeme
-
-hudson.root=/usr/share/java/workspace
-hudson.host=jbws.dyndns.org
-hudson.admin.port=8150
-hudson.http.port=8180
-
-hudson.native.url=https://svn.jboss.org/repos/jbossws/stack/native/trunk
-hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk
-hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
-
-hudson.jboss421.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA
-hudson.jboss421.build=jboss-4.2.1.GA
-hudson.jboss421.rev=HEAD
-
-hudson.jboss422.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA
-hudson.jboss422.build=jboss-4.2.2.GA
-hudson.jboss422.rev=HEAD
-
-hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss423.build=jboss-4.2.3.GA
-hudson.jboss423.rev=HEAD
-
-hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4
-hudson.jboss500.build=jboss-5.0.0.Beta4
-hudson.jboss500.rev=HEAD
-
-hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss501.build=jboss-5.0.0.CR1
-hudson.jboss501.rev=HEAD
-
-hudson.mail.recipients=
-hudson.smtp.host=localhost
-
-# Hudson setup
-apache-tomcat=5.5.20
-sun-hudson=1.160
\ No newline at end of file
Deleted: framework/trunk/build.xml
===================================================================
--- framework/trunk/build.xml 2008-04-14 06:56:25 UTC (rev 6403)
+++ framework/trunk/build.xml 2008-04-14 07:51:42 UTC (rev 6404)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project name="JBossWS-Framework" default="main"
basedir=".">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="framework.dir"
value="${basedir}/framework"/>
- <property name="framework.etc.dir"
value="${framework.dir}/src/main/etc"/>
- <property name="framework.target.dir"
value="${framework.dir}/target"/>
-
- <import file="${basedir}/hudson/build-hudson.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
-
- <!-- Check if ant.properties is available -->
- <available property="ant.properties.available"
file="${basedir}/ant.properties"/>
- <fail message="Cannot find ant.properties. Did you copy/edit
ant.properties.example?" unless="ant.properties.available"/>
-
- <property file="${basedir}/ant.properties"/>
-
- <xmlproperty file="${basedir}/pom.xml"/>
- <property name="version.id" value="${project.version}"/>
- <property name="repository.id"
value="${project.version}"/>
-
- <echo message="version.id=${version.id}"/>
- <echo message="repository.id=${repository.id}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Installation -->
- <!-- ================================================================== -->
-
- <!-- Install to jboss.local.repository -->
- <target name="install" depends="init" description="Install
to jboss.local.repository">
-
- <!-- Check if the target jar is available -->
- <available property="jbossws.framework.jar.available"
file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/>
- <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run
'mvn package'?" unless="jbossws.framework.jar.available"/>
-
- <!-- Check if the source jar is available -->
- <available property="jbossws.framework.sources.jar.available"
file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/>
- <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did
you run 'mvn source:jar'?"
unless="jbossws.framework.sources.jar.available"/>
-
- <!-- jboss/jbossws-framework -->
- <property name="jboss.repository.dir"
value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/>
- <mkdir dir="${jboss.repository.dir}/lib"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar"
tofile="${jboss.repository.dir}//lib/jbossws-framework.jar"
overwrite="true"/>
- <copy
file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"
tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar"
overwrite="true"/>
- <copy
file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip"
tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip"
overwrite="true"/>
- <copy file="${framework.target.dir}/etc/component-info.xml"
tofile="${jboss.repository.dir}/component-info.xml"
overwrite="true"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="init" description="Cleans up
most generated files.">
- <delete dir="${framework.target.dir}"/>
- </target>
-
- <target name="main" description="Executes the default target
(install)." depends="install"/>
-
-</project>
Added: framework/trunk/framework/ant/build-install.xml
===================================================================
--- framework/trunk/framework/ant/build-install.xml (rev 0)
+++ framework/trunk/framework/ant/build-install.xml 2008-04-14 07:51:42 UTC (rev 6404)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="framework.dir" value="${basedir}"/>
+ <property name="framework.etc.dir"
value="${framework.dir}/src/main/etc"/>
+ <property name="framework.target.dir"
value="${framework.dir}/target"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ <echo message="version.id=${version.id}"/>
+ <echo message="repository.id=${repository.id}"/>
+ <echo message="jboss.local.repository=${jboss.local.repository}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Installation -->
+ <!-- ================================================================== -->
+
+ <!-- Install to jboss.local.repository -->
+ <target name="install" depends="init" description="Install
to jboss.local.repository">
+
+ <!-- Check if the target jar is available -->
+ <available property="jbossws.framework.jar.available"
file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/>
+ <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run
'mvn package'?" unless="jbossws.framework.jar.available"/>
+
+ <!-- Check if the source jar is available -->
+ <available property="jbossws.framework.sources.jar.available"
file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/>
+ <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did
you run 'mvn source:jar'?"
unless="jbossws.framework.sources.jar.available"/>
+
+ <!-- jboss/jbossws-framework -->
+ <property name="jboss.repository.dir"
value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/>
+ <mkdir dir="${jboss.repository.dir}/lib"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar"
tofile="${jboss.repository.dir}//lib/jbossws-framework.jar"
overwrite="true"/>
+ <copy
file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"
tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar"
overwrite="true"/>
+ <copy
file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip"
tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip"
overwrite="true"/>
+ <copy file="${framework.target.dir}/etc/component-info.xml"
tofile="${jboss.repository.dir}/component-info.xml"
overwrite="true"/>
+ </target>
+
+</project>
Property changes on: framework/trunk/framework/ant/build-install.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/framework/pom.xml
===================================================================
--- framework/trunk/framework/pom.xml 2008-04-14 06:56:25 UTC (rev 6403)
+++ framework/trunk/framework/pom.xml 2008-04-14 07:51:42 UTC (rev 6404)
@@ -16,6 +16,7 @@
<properties>
<jbossws-common>3.0.0-SNAPSHOT</jbossws-common>
<jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi>
+
<jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
</properties>
<!-- Dependencies -->
@@ -63,6 +64,25 @@
</resources>
<plugins>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks description="Install artifacts to the jboss local
repository">
+ <property name="version.id"
value="${project.version}"/>
+ <property name="repository.id"
value="${project.version}"/>
+ <property name="jboss.local.repository"
value="${jboss.local.repository}"/>
+ <ant antfile="ant/build-install.xml"
target="install"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -70,13 +90,13 @@
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
</executions>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Property changes on: framework/trunk/hudson
___________________________________________________________________
Name: svn:ignore
+ ant.properties
target
Added: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example (rev 0)
+++ framework/trunk/hudson/ant.properties.example 2008-04-14 07:51:42 UTC (rev 6404)
@@ -0,0 +1,54 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# JBoss remote repository
+jboss.repository=http://repository.jboss.org
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# JDK settings
+#java.home.jdk16=/usr/java/jdk1.6
+
+# Hudson QA Environment
+hudson.username=hudson
+hudson.password=deadbeefjboss
+
+hudson.root=/home/tdiesler/workspace
+hudson.host=jbws.dyndns.org
+hudson.admin.port=8150
+hudson.http.port=8180
+
+hudson.native.url=https://svn.jboss.org/repos/jbossws/stack/native/trunk
+hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk
+hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
+
+hudson.jboss421.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA
+hudson.jboss421.build=jboss-4.2.1.GA
+hudson.jboss421.rev=HEAD
+
+hudson.jboss422.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA
+hudson.jboss422.build=jboss-4.2.2.GA
+hudson.jboss422.rev=HEAD
+
+hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
+hudson.jboss423.build=jboss-4.2.3.GA
+hudson.jboss423.rev=HEAD
+
+hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4
+hudson.jboss500.build=jboss-5.0.0.Beta4
+hudson.jboss500.rev=HEAD
+
+hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk
+hudson.jboss501.build=jboss-5.0.0.CR1
+hudson.jboss501.rev=HEAD
+
+hudson.mail.recipients=
+hudson.smtp.host=localhost
+
+# Hudson setup
+apache-tomcat=5.5.20
+sun-hudson=1.160
\ No newline at end of file
Deleted: framework/trunk/hudson/build-hudson.xml
===================================================================
--- framework/trunk/hudson/build-hudson.xml 2008-04-14 06:56:25 UTC (rev 6403)
+++ framework/trunk/hudson/build-hudson.xml 2008-04-14 07:51:42 UTC (rev 6404)
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <target name="init-hudson" depends="init">
-
- <property name="hudson.tomcat"
value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/>
- <property name="hudson.home"
value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/>
- <echo/>
- <echo message="hudson.root = ${hudson.root}"/>
- <echo message="hudson.home = ${hudson.home}"/>
- <echo/>
-
- <available file="${hudson.root}"
property="hudson.root.available"/>
- <available file="${hudson.tomcat}"
property="hudson.tomcat.available"/>
- <fail message="Hudson root not available"
unless="hudson.root.available"/>
-
- <property name="hudson.username.${hudson.username}"
value="true"/>
- <fail message="Cannot use default hudson username: ${hudson.username}"
if="hudson.username.changeme"/>
- <property name="hudson.password.${hudson.password}"
value="true"/>
- <fail message="Cannot use default hudson password: ${hudson.password}"
if="hudson.password.changeme"/>
-
- <property name="thirdparty.dir"
value="${framework.target.dir}/thirdparty"/>
- <mkdir dir="${thirdparty.dir}"/>
-
- </target>
-
- <!--
- Setup the Hudson Tomcat instance
- -->
- <target name="hudson-tomcat-setup" depends="init-hudson"
unless="hudson.tomcat.available">
-
- <get
src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip"
dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war"
dest="${thirdparty.dir}/hudson.war" usetimestamp="true"
verbose="true"/>
-
- <mkdir dir="${hudson.root}"/>
- <unzip src="${thirdparty.dir}/apache-tomcat.zip"
dest="${hudson.root}"/>
- <move file="${hudson.root}/apache-tomcat-${apache-tomcat}"
tofile="${hudson.tomcat}"/>
- <chmod perm="+x">
- <fileset dir="${hudson.tomcat}/bin">
- <include name="*.sh"/>
- </fileset>
- </chmod>
-
- <!-- Configure Tomcat -->
- <copy todir="${hudson.tomcat}/webapps"
file="${thirdparty.dir}/hudson.war"/>
- <copy todir="${hudson.tomcat}" overwrite="true">
- <fileset dir="${framework.dir}/hudson/apache-tomcat">
- <include name="**/*.xml"/>
- </fileset>
- <filterset>
- <filtersfile file="${framework.dir}/ant.properties"/>
- <filter token="hudson.home" value="${hudson.home}"/>
- </filterset>
- </copy>
- </target>
-
- <!--
- Update the Hudson version
- -->
- <target name="hudson-update" depends="init-hudson">
-
- <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war"
dest="${thirdparty.dir}/hudson.war" usetimestamp="false"
verbose="true"/>
-
- <delete dir="${hudson.tomcat}/webapps/hudson"/>
- <copy todir="${hudson.tomcat}/webapps"
file="${thirdparty.dir}/hudson.war"/>
- </target>
-
- <!--
- Setup the Hudson QA environment
- -->
- <target name="hudson-setup"
depends="init-hudson,hudson-tomcat-setup"
- description="Setup the Hudson QA environment">
-
- <!-- get the svn url -->
- <exec dir="${framework.dir}" executable="svn"
failonerror="true" output="${framework.target.dir}/svn-info.xml">
- <arg line="info"/>
- <arg line="--xml"/>
- </exec>
- <xmlproperty file="${framework.target.dir}/svn-info.xml"/>
- <property name="hudson.framework.url"
value="${info.entry.url}"/>
-
- <!-- Configure Hudson -->
- <copy todir="${hudson.home}" overwrite="true">
- <fileset dir="${framework.dir}/hudson/hudson-home">
- <include name="jobs/*/config.xml"/>
- <include name="users/*/config.xml"/>
- <include name="*.xml"/>
- </fileset>
- <filterset>
- <filter token="hudson.framework.url"
value="${hudson.framework.url}"/>
- <filter token="hudson.home" value="${hudson.home}"/>
- <filter token="version.id" value="${version.id}"/>
- <filtersfile file="${framework.dir}/ant.properties"/>
- </filterset>
- </copy>
- <chmod perm="g+w">
- <fileset dir="${hudson.home}">
- <include name="jobs/*/config.xml"/>
- <include name="users/*/config.xml"/>
- <include name="*.xml"/>
- </fileset>
- </chmod>
-
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson setup successfully *"/>
- <echo message="* ant hudson-start *"/>
- <echo message="*************************************"/>
- <echo/>
-
- </target>
-
- <target name="hudson-stop" depends="init-hudson"
description="Stops the Hudson QA environment">
-
- <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true">
- <arg line="stop"/>
- </exec>
-
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson stopped successfully *"/>
- <echo message="* ant hudson-start *"/>
- <echo message="*************************************"/>
- <echo/>
-
- </target>
-
- <target name="hudson-start" depends="init-hudson"
description="Start the Hudson QA environment">
-
- <property environment="env"/>
- <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}"
if="env.JBOSS_REPOSITORY"/>
-
- <!-- When working with group-access files and directories, it is common to use
'umask 2'
- <exec executable="umask">
- <arg value="2"/>
- </exec>
- -->
-
- <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${framework.target.dir}/hudson.log">
- <env key="CATALINA_OPTS" value="-Xmx512m
-Djava.awt.headless=true"/>
- <arg line="start"/>
- </exec>
- <chmod perm="g+w">
- <fileset dir="${hudson.tomcat}">
- <include name="logs/**"/>
- </fileset>
- </chmod>
-
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson started successfully *"/>
- <echo message="* http://localhost:${hudson.http.port}/hudson
*"/>
- <echo message="*************************************"/>
- <echo/>
-
- </target>
-
-</project>
Copied: framework/trunk/hudson/build.xml (from rev 6402,
framework/trunk/hudson/build-hudson.xml)
===================================================================
--- framework/trunk/hudson/build.xml (rev 0)
+++ framework/trunk/hudson/build.xml 2008-04-14 07:51:42 UTC (rev 6404)
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <property name="hudson.dir" value="${basedir}"/>
+ <property name="hudson.target.dir"
value="${hudson.dir}/target"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available"
file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit
ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${basedir}/ant.properties"/>
+
+ <xmlproperty file="${basedir}/../pom.xml"/>
+ <property name="version.id" value="${project.version}"/>
+ <property name="repository.id"
value="${project.version}"/>
+
+ <echo message="version.id=${version.id}"/>
+ <echo message="repository.id=${repository.id}"/>
+ </target>
+
+ <target name="init-hudson" depends="init">
+
+ <property name="hudson.tomcat"
value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/>
+ <property name="hudson.home"
value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/>
+ <echo/>
+ <echo message="hudson.root = ${hudson.root}"/>
+ <echo message="hudson.home = ${hudson.home}"/>
+ <echo/>
+
+ <available file="${hudson.root}"
property="hudson.root.available"/>
+ <available file="${hudson.tomcat}"
property="hudson.tomcat.available"/>
+ <fail message="Hudson root not available"
unless="hudson.root.available"/>
+
+ <property name="hudson.username.${hudson.username}"
value="true"/>
+ <fail message="Cannot use default hudson username: ${hudson.username}"
if="hudson.username.changeme"/>
+ <property name="hudson.password.${hudson.password}"
value="true"/>
+ <fail message="Cannot use default hudson password: ${hudson.password}"
if="hudson.password.changeme"/>
+
+ <property name="thirdparty.dir"
value="${hudson.target.dir}/thirdparty"/>
+ <mkdir dir="${thirdparty.dir}"/>
+
+ </target>
+
+ <!--
+ Setup the Hudson Tomcat instance
+ -->
+ <target name="hudson-tomcat-setup" depends="init-hudson"
unless="hudson.tomcat.available">
+
+ <get
src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip"
dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war"
dest="${thirdparty.dir}/hudson.war" usetimestamp="true"
verbose="true"/>
+
+ <mkdir dir="${hudson.root}"/>
+ <unzip src="${thirdparty.dir}/apache-tomcat.zip"
dest="${hudson.root}"/>
+ <move file="${hudson.root}/apache-tomcat-${apache-tomcat}"
tofile="${hudson.tomcat}"/>
+ <chmod perm="+x">
+ <fileset dir="${hudson.tomcat}/bin">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- Configure Tomcat -->
+ <copy todir="${hudson.tomcat}/webapps"
file="${thirdparty.dir}/hudson.war"/>
+ <copy todir="${hudson.tomcat}" overwrite="true">
+ <fileset dir="${hudson.dir}/apache-tomcat">
+ <include name="**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filtersfile file="${hudson.dir}/ant.properties"/>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!--
+ Update the Hudson version
+ -->
+ <target name="hudson-update" depends="init-hudson">
+
+ <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war"
dest="${thirdparty.dir}/hudson.war" usetimestamp="false"
verbose="true"/>
+
+ <delete dir="${hudson.tomcat}/webapps/hudson"/>
+ <copy todir="${hudson.tomcat}/webapps"
file="${thirdparty.dir}/hudson.war"/>
+ </target>
+
+ <!--
+ Setup the Hudson QA environment
+ -->
+ <target name="hudson-setup"
depends="init-hudson,hudson-tomcat-setup"
+ description="Setup the Hudson QA environment">
+
+ <!-- get the svn url -->
+ <exec dir="${hudson.dir}" executable="svn"
failonerror="true" output="${hudson.target.dir}/svn-info.xml">
+ <arg line="info"/>
+ <arg line="--xml"/>
+ </exec>
+ <xmlproperty file="${hudson.target.dir}/svn-info.xml"/>
+ <property name="hudson.framework.url"
value="${info.entry.url}"/>
+
+ <!-- Configure Hudson -->
+ <copy todir="${hudson.home}" overwrite="true">
+ <fileset dir="${hudson.dir}/hudson-home">
+ <include name="jobs/*/config.xml"/>
+ <include name="users/*/config.xml"/>
+ <include name="*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="hudson.framework.url"
value="${hudson.framework.url}"/>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ <filter token="version.id" value="${version.id}"/>
+ <filtersfile file="${hudson.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <chmod perm="g+w">
+ <fileset dir="${hudson.home}">
+ <include name="jobs/*/config.xml"/>
+ <include name="users/*/config.xml"/>
+ <include name="*.xml"/>
+ </fileset>
+ </chmod>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson setup successfully *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-stop" depends="init-hudson"
description="Stops the Hudson QA environment">
+
+ <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true">
+ <arg line="stop"/>
+ </exec>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson stopped successfully *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-start" depends="init-hudson"
description="Start the Hudson QA environment">
+
+ <property environment="env"/>
+ <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}"
if="env.JBOSS_REPOSITORY"/>
+
+ <!-- When working with group-access files and directories, it is common to use
'umask 2'
+ <exec executable="umask">
+ <arg value="2"/>
+ </exec>
+ -->
+
+ <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${hudson.target.dir}/hudson.log">
+ <env key="CATALINA_OPTS" value="-Xmx512m
-Djava.awt.headless=true"/>
+ <arg line="start"/>
+ </exec>
+ <chmod perm="g+w">
+ <fileset dir="${hudson.tomcat}">
+ <include name="logs/**"/>
+ </fileset>
+ </chmod>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson started successfully *"/>
+ <echo message="* http://localhost:${hudson.http.port}/hudson
*"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+</project>
Copied: framework/trunk/testsuite (from rev 6402, framework/trunk/externals)
Copied: framework/trunk/testsuite/test (from rev 6403, framework/trunk/externals/test)