Author: thomas.diesler(a)jboss.com
Date: 2007-03-23 17:09:53 -0400 (Fri, 23 Mar 2007)
New Revision: 2677
Modified:
branches/jbossws-1.2.1/build/ant-import/build-deploy.xml
branches/jbossws-1.2.1/build/ant-import/build-hudson.xml
branches/jbossws-1.2.1/build/ant-import/build-setup.xml
branches/jbossws-1.2.1/build/hudson/hudson-home/config.xml
Log:
Fix bin-dist
Modified: branches/jbossws-1.2.1/build/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-1.2.1/build/ant-import/build-deploy.xml 2007-03-23 20:46:51 UTC (rev
2676)
+++ branches/jbossws-1.2.1/build/ant-import/build-deploy.xml 2007-03-23 21:09:53 UTC (rev
2677)
@@ -16,7 +16,7 @@
<target name="prepare">
<property file="ant.properties"/>
- <property name="etc.dir" value="install/etc"/>
+ <property name="build.etc.dir" value="install/etc"/>
<property name="core.output.lib.dir"
value="install/jbossws-core"/>
<property name="jboss40.output.lib.dir"
value="install/integration-jboss40"/>
<property name="jboss42.output.lib.dir"
value="install/integration-jboss42"/>
Modified: branches/jbossws-1.2.1/build/ant-import/build-hudson.xml
===================================================================
--- branches/jbossws-1.2.1/build/ant-import/build-hudson.xml 2007-03-23 20:46:51 UTC (rev
2676)
+++ branches/jbossws-1.2.1/build/ant-import/build-hudson.xml 2007-03-23 21:09:53 UTC (rev
2677)
@@ -80,30 +80,7 @@
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
- <fileset dir="${build.dir}/hudson/hudson-home">
- <include name="jobs/AS-5.0/**"/>
- <include name="jobs/AS-4.2/**"/>
- <include name="jobs/AS-4.0/**"/>
- <include name="jobs/AS-4.0.5/**"/>
- <include name="jobs/TC-5.5/**"/>
- <include name="jobs/JBWS-Samples-AS-5.0/**"/>
- <include name="jobs/JBWS-Samples-AS-4.2/**"/>
- <include name="jobs/JBWS-Samples-AS-4.0/**"/>
- <include name="jobs/JBWS-Samples-AS-4.0.5/**"/>
- <include name="jobs/JBWS-Samples-TC-5.5/**"/>
- <include name="jobs/JBWS-Tests-AS-5.0/**"/>
- <include name="jobs/JBWS-Tests-AS-4.2/**"/>
- <include name="jobs/JBWS-Tests-AS-4.0/**"/>
- <include name="jobs/JBWS-Tests-AS-4.0.5/**"/>
- <include name="jobs/JBWS-Tests-TC-5.5/**"/>
- <include name="jobs/JBAS-Tests-AS-5.0/**"/>
- <include name="jobs/JBAS-Tests-AS-4.2/**"/>
- <include name="jobs/JBAS-Tests-AS-4.0/**"/>
- <include name="jobs/Release-Matrix-Step1/**"/>
- <include name="jobs/Release-Matrix-Step2/**"/>
- <include name="users/**"/>
- <include name="*.xml"/>
- </fileset>
+ <fileset dir="${build.dir}/hudson/hudson-home"/>
<filterset>
<filter token="version.id" value="${version.id}"/>
<filter token="svn.basedir.local"
value="${svn.basedir.local}"/>
Modified: branches/jbossws-1.2.1/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-1.2.1/build/ant-import/build-setup.xml 2007-03-23 20:46:51 UTC (rev
2676)
+++ branches/jbossws-1.2.1/build/ant-import/build-setup.xml 2007-03-23 21:09:53 UTC (rev
2677)
@@ -31,7 +31,7 @@
<property name="core.dir"
value="${basedir}/../jbossws-core"/>
<property name="tests.dir"
value="${basedir}/../jbossws-tests"/>
- <property name="build.etc.dir"
value="${build.dir}/output/etc"/>
+ <property name="etc.dir" value="${build.dir}/output/etc"/>
<property name="thirdparty.dir"
value="${build.dir}/thirdparty"/>
<property name="jboss50.lib" value="${jboss50.home}/lib"/>
Modified: branches/jbossws-1.2.1/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-1.2.1/build/hudson/hudson-home/config.xml 2007-03-23 20:46:51 UTC
(rev 2676)
+++ branches/jbossws-1.2.1/build/hudson/hudson-home/config.xml 2007-03-23 21:09:53 UTC
(rev 2677)
@@ -34,7 +34,7 @@
<jobNames class="tree-set">
<no-comparator/>
<string>JBAS-Tests-AS-4.0</string>
- <!--string>JBAS-Tests-AS-4.0-jdk14</string-->
+ <string>JBAS-Tests-AS-4.0-jdk14</string>
<string>JBAS-Tests-AS-4.2</string>
<string>JBAS-Tests-AS-5.0</string>
</jobNames>
@@ -75,9 +75,9 @@
<jobNames class="tree-set">
<no-comparator/>
<string>JBWS-Tests-AS-4.0.5</string>
- <!--string>JBWS-Tests-AS-4.0.5-jdk14</string-->
+ <string>JBWS-Tests-AS-4.0.5-jdk14</string>
<string>JBWS-Tests-AS-4.0</string>
- <!--string>JBWS-Tests-AS-4.0-jdk14</string-->
+ <string>JBWS-Tests-AS-4.0-jdk14</string>
<string>JBWS-Tests-AS-4.2</string>
<string>JBWS-Tests-AS-5.0</string>
<string>JBWS-Tests-TC-5.5</string>
@@ -148,9 +148,9 @@
<string>AS-5.0</string>
<string>AS-4.2</string>
<string>AS-4.0</string>
- <!--string>AS-4.0-jdk14</string-->
+ <string>AS-4.0-jdk14</string>
<string>AS-4.0.5</string>
- <!--string>AS-4.0.5-jdk14</string-->
+ <string>AS-4.0.5-jdk14</string>
<string>TC-5.5</string>
</jobNames>
<name>Target Container</name>