7:17 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:17:56 -0400 (Sat, 12 Apr 2008)
New Revision: 6381
Added:
framework/trunk/ant-import/
framework/trunk/ant-import/build-hudson.xml
Removed:
framework/trunk/version.properties
Modified:
framework/trunk/.classpath
framework/trunk/ant.properties.example
framework/trunk/build.xml
Log:
Resurect hudson setup
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/.classpath 2008-04-12 12:17:56 UTC (rev 6381)
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
<classpathentry kind="var"
path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar"/>
+ <classpathentry combineaccessrules="false" exported="true"
kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" exported="true"
kind="src" path="/spi"/>
<classpathentry kind="output" path="target/eclipse"/>
</classpath>
Added: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml (rev 0)
+++ framework/trunk/ant-import/build-hudson.xml 2008-04-12 12:17:56 UTC (rev 6381)
@@ -0,0 +1,172 @@
+<?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.dir}/thirdparty"/>
+ <mkdir dir="${framework.dir}/output"/>
+ <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.dir}/output/svn-info.xml">
+ <arg line="info"/>
+ <arg line="--xml"/>
+ </exec>
+ <xmlproperty file="${framework.dir}/output/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>
+ -->
+
+ <mkdir dir="${framework.dir}/output"/>
+ <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${framework.dir}/output/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>
Property changes on: framework/trunk/ant-import/build-hudson.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/ant.properties.example
===================================================================
--- framework/trunk/ant.properties.example 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/ant.properties.example 2008-04-12 12:17:56 UTC (rev 6381)
@@ -4,4 +4,54 @@
# $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
\ No newline at end of file
+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
Modified: framework/trunk/build.xml
===================================================================
--- framework/trunk/build.xml 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/build.xml 2008-04-12 12:17:56 UTC (rev 6381)
@@ -12,42 +12,44 @@
<!-- $Id$ -->
<project name="JBossWS-Framework" default="main"
basedir=".">
-
- <!-- ================================================================== -->
- <!-- 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">
-
- <!-- 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="${framework.dir}/ant.properties"/>
-
- <xmlproperty file="${framework.dir}/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 -->
- <!-- ================================================================== -->
+ <import file="${basedir}/ant-import/build-hudson.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- 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">
+
+ <!-- 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="${framework.dir}/ant.properties"/>
+
+ <xmlproperty file="${framework.dir}/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"/>
@@ -59,19 +61,21 @@
<!-- jboss/jbossws-framework -->
<property name="jboss.repository.dir"
value="${jboss.local.repository}/jboss"/>
<mkdir
dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar"
tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework.jar"
overwrite="true"/>
- <copy
file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"
tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework-src.jar"
overwrite="true"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar"
tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework.jar"
+ overwrite="true"/>
+ <copy
file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"
+
tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework-src.jar"
overwrite="true"/>
<copy file="${framework.target.dir}/etc/component-info.xml"
tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml"
overwrite="true"/>
- </target>
+ </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"/>
-
+
+ <target name="main" description="Executes the default target
(install)." depends="install"/>
+
</project>
Deleted: framework/trunk/version.properties
===================================================================
--- framework/trunk/version.properties 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/version.properties 2008-04-12 12:17:56 UTC (rev 6381)
@@ -1,35 +0,0 @@
-
-# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-3.0
-
-version.id=3.0.2.DEV
-repository.id=snapshot
-
-implementation.title=JBoss Web Services - Framework
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Thirdparty library versions
-jbossws-common=1.0.4.GA
-jbossws-spi=1.0.2.GA
-
-junit=3.8.1
-dom4j=1.6.1
-ibm-wsdl4j=1.6.2
-jboss-common-core=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3Update1
-jboss-microcontainer=2.0.0.Beta3
-jboss-jbossxb=1.0.0.GA
-sun-jaf=1.1
-sun-jaxb=2.1.4
-sun-jaxrpc=1.1
-sun-jaxws=2.1.1
-
-# Hudson setup
-apache-tomcat=5.5.20
-sun-hudson=1.160