Author: thomas.diesler(a)jboss.com
Date: 2007-05-30 15:20:13 -0400 (Wed, 30 May 2007)
New Revision: 3312
Modified:
branches/jbossws-2.0/build/ant-import/build-hudson.xml
branches/jbossws-2.0/build/ant.properties.example
branches/jbossws-2.0/build/hudson/apache-tomcat/conf/server.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
branches/jbossws-2.0/build/hudson/jboss/bin/jboss.sh
branches/jbossws-2.0/jbossws-tests/build.xml
branches/jbossws-2.0/jbossws-tests/src/etc/jndi.properties
Log:
Use jboss bind addr
Modified: branches/jbossws-2.0/build/ant-import/build-hudson.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-hudson.xml 2007-05-30 17:21:05 UTC (rev
3311)
+++ branches/jbossws-2.0/build/ant-import/build-hudson.xml 2007-05-30 19:20:13 UTC (rev
3312)
@@ -134,7 +134,7 @@
<echo/>
<echo message="*************************************"/>
<echo message="* Hudson started successfully *"/>
- <echo message="*
http://localhost:${hudson.port}/hudson *"/>
+ <echo message="*
http://localhost:${hudson.http.port}/hudson
*"/>
<echo message="*************************************"/>
<echo/>
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-05-30 17:21:05 UTC (rev 3311)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-05-30 19:20:13 UTC (rev 3312)
@@ -4,7 +4,7 @@
# $Id$
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
+#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
@@ -25,11 +25,14 @@
hudson.root=/home/tdiesler/workspace
hudson.host=jbws.dyndns.org
-hudson.port=8180
+hudson.admin.port=8150
+hudson.http.port=8180
hudson.jdk15=/usr/java/jdk1.5
hudson.jdk14=/usr/java/jdk1.4
+hudson.jboss.bindaddr=localhost
+
hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
hudson.jboss50.build=jboss-5.0.0.Beta2
hudson.jboss50.rev=HEAD
Modified: branches/jbossws-2.0/build/hudson/apache-tomcat/conf/server.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/apache-tomcat/conf/server.xml 2007-05-30 17:21:05
UTC (rev 3311)
+++ branches/jbossws-2.0/build/hudson/apache-tomcat/conf/server.xml 2007-05-30 19:20:13
UTC (rev 3312)
@@ -1,5 +1,5 @@
-<Server port="8105" shutdown="SHUTDOWN">
+<Server port="@hudson.admin.port(a)" shutdown="SHUTDOWN">
<!-- Comment these entries out to disable JMX MBeans support used for the
administration web application -->
@@ -25,7 +25,7 @@
<Service name="Catalina">
<!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector port="@hudson.port(a)" maxHttpHeaderSize="8192"
maxThreads="150"
+ <Connector port="@hudson.http.port(a)" maxHttpHeaderSize="8192"
maxThreads="150"
minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" redirectPort="8443"
acceptCount="100"
connectionTimeout="20000" disableUploadTimeout="true"/>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -33,7 +34,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# build the testsuite
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -35,7 +36,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# build the testsuite
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -33,7 +34,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# build the testsuite
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50
-Djboss50.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -33,7 +34,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# build the testsuite
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -27,7 +28,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50
-Djboss50.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -27,7 +28,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -27,7 +28,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50
-Djboss50.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -27,7 +28,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -13,8 +13,9 @@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE
-Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE
-Dtomcat.home=$TOMCAT_INSTANCE"
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=$JBOSS40_INSTANCE
#
@@ -38,7 +39,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute samples
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -13,7 +13,7 @@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE
-Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE
-Dtomcat.home=$TOMCAT_INSTANCE"
JBOSS_INSTANCE=$JBOSS40_INSTANCE
@@ -38,7 +38,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute samples
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -13,8 +13,9 @@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE
-Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE
-Dtomcat.home=$TOMCAT_INSTANCE"
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=$JBOSS42_INSTANCE
#
@@ -38,7 +39,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute samples
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -13,8 +13,9 @@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=jboss50
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE
-Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE
-Dtomcat.home=$TOMCAT_INSTANCE"
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=$JBOSS50_INSTANCE
#
@@ -38,7 +39,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute samples
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -13,7 +13,7 @@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=tomcat
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@ -Djbossws.integration.target=tomcat
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
#
# copy ant.properties
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -32,7 +33,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -34,7 +35,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -32,7 +33,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5-jdk14/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
-ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -34,7 +35,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -32,7 +33,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -10,8 +10,9 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_BINDADDR=(a)hudson.jboss.bindaddr@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50
-Djboss50.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@
-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
# copy ant.properties
@@ -32,7 +33,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
#
# execute tests
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
===================================================================
---
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-05-30
17:21:05 UTC (rev 3311)
+++
branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-05-30
19:20:13 UTC (rev 3312)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=tomcat
-Dtomcat.home=$TOMCAT_INSTANCE"
+ENVIRONMENT=&quot;-Dnode0=(a)hudson.jboss.bindaddr@ -Djbossws.integration.target=tomcat
-Dtomcat.home=$TOMCAT_INSTANCE"
#
# copy ant.properties
Modified: branches/jbossws-2.0/build/hudson/jboss/bin/jboss.sh
===================================================================
--- branches/jbossws-2.0/build/hudson/jboss/bin/jboss.sh 2007-05-30 17:21:05 UTC (rev
3311)
+++ branches/jbossws-2.0/build/hudson/jboss/bin/jboss.sh 2007-05-30 19:20:13 UTC (rev
3312)
@@ -3,9 +3,11 @@
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
JBOSS_HOME="$1"
-export JBOSS_HOME
+JBOSS_BINDADDR="$3"
CMD="$2"
+export JBOSS_HOME
+
#
# Helper to complain.
#
@@ -23,7 +25,7 @@
# This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
# It relies on bash specific features
# Do you want to hide jboss output?
- /bin/bash $DIRNAME/runjboss.sh &
+ /bin/bash $DIRNAME/runjboss.sh -b $JBOSS_BINDADDR &
sleep 20
;;
stop)
Modified: branches/jbossws-2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/build.xml 2007-05-30 17:21:05 UTC (rev 3311)
+++ branches/jbossws-2.0/jbossws-tests/build.xml 2007-05-30 19:20:13 UTC (rev 3312)
@@ -392,8 +392,15 @@
<!-- Copy resources -->
<target name="copy-resources" depends="init"
description="Copy the deployment resources.">
- <copy todir="${tests.output.dir}/classes"
file="${tests.etc.dir}/jndi.properties"/>
- <copy todir="${tests.output.dir}/classes"
file="${tests.etc.dir}/log4j.xml"/>
+ <copy todir="${tests.output.dir}/classes">
+ <fileset dir="${tests.etc.dir}">
+ <include name="jndi.properties"/>
+ <include name="log4j.xml"/>
+ </fileset>
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
<!-- copy handler definitions -->
<copy todir="${tests.output.dir}/classes">
Modified: branches/jbossws-2.0/jbossws-tests/src/etc/jndi.properties
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/etc/jndi.properties 2007-05-30 17:21:05 UTC
(rev 3311)
+++ branches/jbossws-2.0/jbossws-tests/src/etc/jndi.properties 2007-05-30 19:20:13 UTC
(rev 3312)
@@ -1,3 +1,3 @@
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
+java.naming.provider.url=jnp://@hudson.jboss.bindaddr@:1099
\ No newline at end of file