JBossWS SVN: r3388 - in trunk/build/hudson/hudson-home/jobs: AS-5.0 and 18 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-02 07:46:47 -0400 (Sat, 02 Jun 2007)
New Revision: 3388
Modified:
trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
Log:
Keep 20 builds max
Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -63,8 +63,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -63,8 +63,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -100,8 +100,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Run the AS-4.2 webservice testsuite agains jbossws-(a)version.id@</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Run the AS-4.2 webservice testsuite agains jbossws-(a)version.id@</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -100,8 +100,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Run the AS-5.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Run the AS-5.0 webservice testsuite agains jbossws-(a)version.id@</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -87,8 +87,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -92,8 +92,12 @@
*/10 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -95,8 +95,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-native-(a)version.id@ against AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -95,8 +95,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-native-(a)version.id@ against AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -95,8 +95,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-sunri-(a)version.id@ against AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-sunri-(a)version.id@ against AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -95,8 +95,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-sunri-(a)version.id@ against AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-sunri-(a)version.id@ against AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -95,8 +95,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-xfire-(a)version.id@ against AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-xfire-(a)version.id@ against AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -95,8 +95,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-xfire-(a)version.id@ against AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-xfire-(a)version.id@ against AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -87,8 +87,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -87,8 +87,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -87,8 +87,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -87,8 +87,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -87,8 +87,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -87,8 +87,12 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -16,8 +16,12 @@
<spec>0 2 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
- <description>Build the relase matrix target containers.</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Build the relase matrix target containers.</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-02 11:46:47 UTC (rev 3388)
@@ -16,8 +16,12 @@
<spec>0 3 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
- <description>Run the entire JBossWS relase matrix</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
+ <description>Run the entire JBossWS relase matrix</description>
<actions class="vector"/>
</project>
\ No newline at end of file
17 years, 9 months
- 1
- 0
JBossWS SVN: r3387 - in trunk/build/hudson/hudson-home/jobs: AS-Tests-AS-5.0 and 14 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 18:34:58 -0400 (Fri, 01 Jun 2007)
New Revision: 3387
Modified:
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
Log:
Use WORKSPACE for http-spider
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -47,7 +47,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -47,7 +47,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -47,7 +47,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -47,7 +47,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -47,7 +47,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -47,7 +47,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
@@ -39,7 +39,7 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $JBWSDIR/spider.failed ]; then
+if [ -e $WORKSPACE/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
17 years, 9 months
- 1
- 0
JBossWS SVN: r3386 - trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 17:49:00 -0400 (Fri, 01 Jun 2007)
New Revision: 3386
Modified:
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
Log:
Run nightly at 3am
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-01 21:46:59 UTC (rev 3385)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-01 21:49:00 UTC (rev 3386)
@@ -13,7 +13,7 @@
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 4 * * *</spec>
+ <spec>0 3 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<description>Run the entire JBossWS relase matrix</description>
17 years, 9 months
- 1
- 0
JBossWS SVN: r3385 - trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 17:46:59 -0400 (Fri, 01 Jun 2007)
New Revision: 3385
Modified:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
Log:
Add reference to UMDM
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-06-01 21:29:33 UTC (rev 3384)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-06-01 21:46:59 UTC (rev 3385)
@@ -54,22 +54,13 @@
*/
public class PolicyMetaDataBuilderTestCase extends JBossWSTest
{
-
- private WSDLDefinitions readWsdl(String filename) throws Exception
- {
- File wsdlFile = new File(filename);
- assertTrue(wsdlFile.exists());
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL());
- assertNotNull(wsdlDefinitions);
- return wsdlDefinitions;
- }
-
public void testEndpointScopePolicies() throws Exception
{
- WSDLDefinitions wsdlDefinitions = readWsdl("resources/jaxws/wspolicy/TestService.wsdl");
+ UnifiedVirtualFile vfRoot = new URLLoaderAdapter(new File("resources/jaxws/wspolicy").toURL());
+ UnifiedMetaData umd = new UnifiedMetaData(vfRoot);
+
QName serviceName = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService");
- ServiceMetaData serviceMetaData = new ServiceMetaData(null, serviceName);
+ ServiceMetaData serviceMetaData = new ServiceMetaData(umd, serviceName);
QName portName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterfacePort");
QName portTypeName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterface");
EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, portName, portTypeName, Type.JAXWS);
@@ -81,6 +72,7 @@
PolicyDeployer deployer = PolicyDeployer.newInstance(map);
PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer);
+ WSDLDefinitions wsdlDefinitions = readWsdl("resources/jaxws/wspolicy/TestService.wsdl");
builder.processPolicyExtensions(epMetaData, wsdlDefinitions);
PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY);
@@ -155,4 +147,13 @@
|| ("uselessBindingPolicy".equalsIgnoreCase(id6) && "uselessBindingPolicy2".equalsIgnoreCase(id5)));
}
+ private WSDLDefinitions readWsdl(String filename) throws Exception
+ {
+ File wsdlFile = new File(filename);
+ assertTrue(wsdlFile.exists());
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL());
+ assertNotNull(wsdlDefinitions);
+ return wsdlDefinitions;
+ }
}
17 years, 9 months
- 1
- 0
JBossWS SVN: r3384 - in trunk: jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 17:29:33 -0400 (Fri, 01 Jun 2007)
New Revision: 3384
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
Log:
Use UnifiedVirtualFile to load policy resources
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-06-01 21:05:29 UTC (rev 3383)
+++ trunk/build/ant-import/build-testsuite.xml 2007-06-01 21:29:33 UTC (rev 3384)
@@ -149,7 +149,6 @@
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
- <pathelement location="${tests.output.dir}/resources/jaxws/wspolicy"/>
<path refid="tests.javac.classpath"/>
</path>
</target>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-06-01 21:05:29 UTC (rev 3383)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-06-01 21:29:33 UTC (rev 3384)
@@ -33,11 +33,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
import org.jboss.ws.extensions.policy.deployer.PolicyDeployer;
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
@@ -47,6 +47,7 @@
import org.jboss.ws.metadata.wsdl.WSDLInterface;
import org.jboss.ws.metadata.wsdl.WSDLProperty;
import org.jboss.ws.metadata.wsdl.WSDLService;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
/**
* A meta data builder for policies; handles checks for policy support
@@ -62,12 +63,12 @@
private boolean serverSide = true;
private boolean toolMode = false;
private PolicyDeployer customDeployer;
-
+
public PolicyMetaDataBuilder()
{
-
+
}
-
+
/**
* To be used for tests or whenever a custom deployer is required
*
@@ -77,77 +78,85 @@
{
this.customDeployer = customDeployer;
}
-
+
/**
* Creates a new PolicyMetaDataBuilder for server side policy processing.
*
* @param toolMode True if running WSProvideTask (no policy deployments)
* @return
*/
- public static PolicyMetaDataBuilder getServerSidePolicyMetaDataBuilder(boolean toolMode) {
+ public static PolicyMetaDataBuilder getServerSidePolicyMetaDataBuilder(boolean toolMode)
+ {
PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder();
builder.setServerSide(true);
builder.setToolMode(toolMode);
return builder;
}
-
+
/**
* Creates a new PolicyMetaDataBuilder for client side policy processing.
*
* @return
*/
- public static PolicyMetaDataBuilder getClientSidePolicyMetaDataBuilder() {
+ public static PolicyMetaDataBuilder getClientSidePolicyMetaDataBuilder()
+ {
PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder();
builder.setServerSide(false);
return builder;
}
-
+
public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi)
{
- for (org.jboss.ws.extensions.policy.annotation.Policy policy : sepClass.getAnnotation(PolicyAttachment.class).value())
+ UnifiedVirtualFile vfRoot = epMetaData.getServiceMetaData().getUnifiedMetaData().getRootFile();
+ for (org.jboss.ws.extensions.policy.annotation.Policy anPolicy : sepClass.getAnnotation(PolicyAttachment.class).value())
{
InputStream is = null;
try
{
- DOMPolicyReader reader = (DOMPolicyReader) PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
- if (toolMode)
- {
- is = Thread.currentThread().getContextClassLoader().getResourceAsStream(policy.policyFileLocation());
- } else
- {
- is = udi.getMetaDataFileURL(policy.policyFileLocation()).openStream();
- }
+ String policyFileLocation = anPolicy.policyFileLocation();
+ if (policyFileLocation.length() == 0)
+ throw new IllegalStateException("Cannot obtain @Policy.policyFileLocation");
+
+ // The root virtual file is the uniform way to obtain resources
+ // It should work in all containers, server/client side
+ UnifiedVirtualFile vfPolicyFile = vfRoot.findChild(policyFileLocation);
+ is = vfPolicyFile.toURL().openStream();
+
+ DOMPolicyReader reader = (DOMPolicyReader)PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
Policy unnormalizedPolicy = reader.readPolicy(is);
Policy normPolicy = (Policy)unnormalizedPolicy.normalize();
- log.info("Deploying Annotated Policy = "+policy.policyFileLocation());
- PolicyScopeLevel scope = policy.scope();
- if (PolicyScopeLevel.WSDL_PORT.equals(scope) || PolicyScopeLevel.WSDL_PORT_TYPE.equals(scope) ||
- PolicyScopeLevel.WSDL_BINDING.equals(scope))
+ log.info("Deploying Annotated Policy = " + policyFileLocation);
+ PolicyScopeLevel scope = anPolicy.scope();
+ if (PolicyScopeLevel.WSDL_PORT.equals(scope) || PolicyScopeLevel.WSDL_PORT_TYPE.equals(scope) || PolicyScopeLevel.WSDL_BINDING.equals(scope))
{
deployPolicy(normPolicy, scope, epMetaData);
}
else
{
- throw new WSException("Policy scope "+scope+" not supported yet!");
+ throw new WSException("Policy scope " + scope + " not supported yet!");
}
}
catch (Exception e)
{
- e.printStackTrace();
- } finally
+ log.error(e);
+ }
+ finally
{
- try
+ try
{
is.close();
- } catch (Exception e) {}
+ }
+ catch (Exception e)
+ {
+ }
}
}
}
-
+
public void processPolicyExtensions(EndpointMetaData epMetaData, WSDLDefinitions wsdlDefinitions)
{
//Collect all policies defined in our wsdl definitions
- DOMPolicyReader reader = (DOMPolicyReader) PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
+ DOMPolicyReader reader = (DOMPolicyReader)PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
PolicyRegistry localPolicyRegistry = new PolicyRegistry();
for (WSDLExtensibilityElement policyElement : wsdlDefinitions.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY))
{
@@ -166,14 +175,17 @@
}
else
{
- log.warn("Cannot get port '"+epMetaData.getPortName()+"' from the given wsdl definitions! Eventual policies attached to this port won't be considered.");
+ log
+ .warn("Cannot get port '" + epMetaData.getPortName()
+ + "' from the given wsdl definitions! Eventual policies attached to this port won't be considered.");
}
}
else
{
- log.warn("Cannot get service '"+epMetaData.getServiceMetaData().getServiceName()+"' from the given wsdl definitions! Eventual policies attached to this service won't be considered.");
+ log.warn("Cannot get service '" + epMetaData.getServiceMetaData().getServiceName()
+ + "' from the given wsdl definitions! Eventual policies attached to this service won't be considered.");
}
-
+
//Binding scope
WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(epMetaData.getPortTypeName());
if (wsdlBinding != null)
@@ -183,9 +195,10 @@
}
else
{
- log.warn("Cannot get binding for portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions! Eventual policies attached to this binding won't be considered.");
+ log.warn("Cannot get binding for portType '" + epMetaData.getPortTypeName()
+ + "' from the given wsdl definitions! Eventual policies attached to this binding won't be considered.");
}
-
+
//PortType scope
WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(epMetaData.getPortTypeName());
if (wsdlInterface != null)
@@ -195,13 +208,14 @@
}
else
{
- log.warn("Cannot get portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions! Eventual policies attached to this portType won't be considered.");
+ log.warn("Cannot get portType '" + epMetaData.getPortTypeName()
+ + "' from the given wsdl definitions! Eventual policies attached to this portType won't be considered.");
}
}
-
+
private void processPolicies(WSDLProperty policyProp, PolicyScopeLevel scope, PolicyRegistry localPolicies, ExtensibleMetaData extMetaData)
{
- if (policyProp!=null && policyProp.getValue()!=null)
+ if (policyProp != null && policyProp.getValue() != null)
{
StringTokenizer st = new StringTokenizer(policyProp.getValue(), ", ", false);
while (st.hasMoreTokens())
@@ -211,12 +225,12 @@
}
}
}
-
+
private void processPolicies(List<WSDLExtensibilityElement> policyReferences, PolicyScopeLevel scope, PolicyRegistry localPolicies, ExtensibleMetaData extMetaData)
{
if (policyReferences != null && policyReferences.size() != 0)
{
- DOMPolicyReader reader = (DOMPolicyReader) PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
+ DOMPolicyReader reader = (DOMPolicyReader)PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
for (WSDLExtensibilityElement element : policyReferences)
{
PolicyReference policyRef = reader.readPolicyReference(element.getElement());
@@ -224,7 +238,7 @@
}
}
}
-
+
private Policy resolvePolicyReference(PolicyReference policyRef, PolicyRegistry localPolicies)
{
Policy normPolicy;
@@ -239,7 +253,7 @@
}
return normPolicy;
}
-
+
private void deployPolicy(Policy policy, PolicyScopeLevel scope, ExtensibleMetaData extMetaData)
{
PolicyDeployer deployer;
@@ -264,8 +278,7 @@
deployPolicyClientSide(policy, scope, extMetaData, deployer);
}
}
-
-
+
private void deployPolicyServerSide(Policy policy, PolicyScopeLevel scope, ExtensibleMetaData extMetaData, PolicyDeployer deployer)
{
PolicyMetaExtension ext = (PolicyMetaExtension)extMetaData.getExtension(Constants.URI_WS_POLICY);
@@ -277,15 +290,14 @@
try
{
Policy deployedPolicy = deployer.deployServerside(policy, extMetaData);
- ext.addPolicy(scope,deployedPolicy);
+ ext.addPolicy(scope, deployedPolicy);
}
catch (UnsupportedPolicy e)
{
log.warn("Policy Not supported:" + policy.getPolicyURI());
}
}
-
-
+
private void deployPolicyClientSide(Policy policy, PolicyScopeLevel scope, ExtensibleMetaData extMetaData, PolicyDeployer deployer)
{
PolicyMetaExtension ext = (PolicyMetaExtension)extMetaData.getExtension(Constants.URI_WS_POLICY);
@@ -301,7 +313,7 @@
}
catch (UnsupportedPolicy e)
{
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled())
{
log.debug("Policy Not supported:" + policy.getPolicyURI());
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-06-01 21:05:29 UTC (rev 3383)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-06-01 21:29:33 UTC (rev 3384)
@@ -36,9 +36,12 @@
import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension;
+import org.jboss.ws.integration.URLLoaderAdapter;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
@@ -51,7 +54,7 @@
*/
public class PolicyMetaDataBuilderTestCase extends JBossWSTest
{
-
+
private WSDLDefinitions readWsdl(String filename) throws Exception
{
File wsdlFile = new File(filename);
@@ -61,7 +64,7 @@
assertNotNull(wsdlDefinitions);
return wsdlDefinitions;
}
-
+
public void testEndpointScopePolicies() throws Exception
{
WSDLDefinitions wsdlDefinitions = readWsdl("resources/jaxws/wspolicy/TestService.wsdl");
@@ -69,17 +72,17 @@
ServiceMetaData serviceMetaData = new ServiceMetaData(null, serviceName);
QName portName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterfacePort");
QName portTypeName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterface");
- EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData,portName,portTypeName,Type.JAXWS);
-
- Map<String,Class> map = new HashMap<String,Class>();
+ EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, portName, portTypeName, Type.JAXWS);
+
+ Map<String, Class> map = new HashMap<String, Class>();
map.put("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", NopAssertionDeployer.class);
map.put("http://www.fabrikam123.example.com/stock", NopAssertionDeployer.class);
map.put("http://schemas.xmlsoap.org/ws/2005/07/securitypolicy", NopAssertionDeployer.class);
PolicyDeployer deployer = PolicyDeployer.newInstance(map);
PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer);
-
+
builder.processPolicyExtensions(epMetaData, wsdlDefinitions);
-
+
PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY);
Collection<Policy> bindingPolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_BINDING);
assertNotNull(bindingPolicies);
@@ -87,65 +90,69 @@
Iterator<Policy> bindingPoliciesIterator = bindingPolicies.iterator();
String id1 = bindingPoliciesIterator.next().getId();
String id2 = bindingPoliciesIterator.next().getId();
- assertTrue(("RmPolicy".equalsIgnoreCase(id1) && "X509EndpointPolicy".equalsIgnoreCase(id2)) ||
- ("RmPolicy".equalsIgnoreCase(id2) && "X509EndpointPolicy".equalsIgnoreCase(id1)));
-
+ assertTrue(("RmPolicy".equalsIgnoreCase(id1) && "X509EndpointPolicy".equalsIgnoreCase(id2))
+ || ("RmPolicy".equalsIgnoreCase(id2) && "X509EndpointPolicy".equalsIgnoreCase(id1)));
+
Collection<Policy> portPolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT);
assertNotNull(portPolicies);
assertEquals(1, portPolicies.size());
assertEquals("uselessPortPolicy", portPolicies.iterator().next().getId());
-
+
Collection<Policy> portTypePolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT_TYPE);
assertNotNull(portTypePolicies);
assertEquals(2, portTypePolicies.size());
Iterator<Policy> portTypePoliciesIterator = portTypePolicies.iterator();
String id3 = portTypePoliciesIterator.next().getId();
String id4 = portTypePoliciesIterator.next().getId();
- assertTrue(("uselessPortTypePolicy".equalsIgnoreCase(id3) && "uselessPortTypePolicy2".equalsIgnoreCase(id4)) ||
- ("uselessPortTypePolicy".equalsIgnoreCase(id4) && "uselessPortTypePolicy2".equalsIgnoreCase(id3)));
+ assertTrue(("uselessPortTypePolicy".equalsIgnoreCase(id3) && "uselessPortTypePolicy2".equalsIgnoreCase(id4))
+ || ("uselessPortTypePolicy".equalsIgnoreCase(id4) && "uselessPortTypePolicy2".equalsIgnoreCase(id3)));
}
-
-
+
public void testAnnotationEndpointScopePolicies() throws Exception
{
- Map<String,Class> map = new HashMap<String,Class>();
+ Map<String, Class> map = new HashMap<String, Class>();
map.put("http://www.fabrikam123.example.com/stock", NopAssertionDeployer.class);
PolicyDeployer deployer = PolicyDeployer.newInstance(map);
PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer);
builder.setToolMode(true);
+
+ UnifiedVirtualFile vfRoot = new URLLoaderAdapter(new File("resources/jaxws/wspolicy").toURL());
+ UnifiedMetaData umd = new UnifiedMetaData(vfRoot);
+ ServiceMetaData serviceMetaData = new ServiceMetaData(umd, new QName("dummyServiceName"));
+ umd.addService(serviceMetaData);
+ EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, new QName("dummyPortName"), new QName("dummyPortTypeName"), Type.JAXWS);
+ serviceMetaData.addEndpoint(epMetaData);
- EndpointMetaData epMetaData = new ServerEndpointMetaData(null, new QName("dummyPortName"),
- new QName("dummyPortTypeName"), Type.JAXWS);
builder.processPolicyAnnotations(epMetaData, TestMultipleEndpointPolicy.class, null);
-
+
PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY);
-
+
Collection<Policy> portPolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT);
assertNotNull(portPolicies);
assertEquals(2, portPolicies.size());
Iterator<Policy> portPoliciesIterator = portPolicies.iterator();
String id1 = portPoliciesIterator.next().getId();
String id2 = portPoliciesIterator.next().getId();
- assertTrue(("uselessPortPolicy".equalsIgnoreCase(id1) && "uselessPortPolicy2".equalsIgnoreCase(id2)) ||
- ("uselessPortPolicy".equalsIgnoreCase(id2) && "uselessPortPolicy2".equalsIgnoreCase(id1)));
-
+ assertTrue(("uselessPortPolicy".equalsIgnoreCase(id1) && "uselessPortPolicy2".equalsIgnoreCase(id2))
+ || ("uselessPortPolicy".equalsIgnoreCase(id2) && "uselessPortPolicy2".equalsIgnoreCase(id1)));
+
Collection<Policy> portTypePolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT_TYPE);
assertNotNull(portTypePolicies);
assertEquals(2, portTypePolicies.size());
Iterator<Policy> portTypePoliciesIterator = portTypePolicies.iterator();
String id3 = portTypePoliciesIterator.next().getId();
String id4 = portTypePoliciesIterator.next().getId();
- assertTrue(("uselessPortTypePolicy".equalsIgnoreCase(id3) && "uselessPortTypePolicy2".equalsIgnoreCase(id4)) ||
- ("uselessPortTypePolicy".equalsIgnoreCase(id4) && "uselessPortTypePolicy2".equalsIgnoreCase(id3)));
-
+ assertTrue(("uselessPortTypePolicy".equalsIgnoreCase(id3) && "uselessPortTypePolicy2".equalsIgnoreCase(id4))
+ || ("uselessPortTypePolicy".equalsIgnoreCase(id4) && "uselessPortTypePolicy2".equalsIgnoreCase(id3)));
+
Collection<Policy> bindingPolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_BINDING);
assertNotNull(bindingPolicies);
assertEquals(2, bindingPolicies.size());
Iterator<Policy> bindingPoliciesIterator = bindingPolicies.iterator();
String id5 = bindingPoliciesIterator.next().getId();
String id6 = bindingPoliciesIterator.next().getId();
- assertTrue(("uselessBindingPolicy".equalsIgnoreCase(id5) && "uselessBindingPolicy2".equalsIgnoreCase(id6)) ||
- ("uselessBindingPolicy".equalsIgnoreCase(id6) && "uselessBindingPolicy2".equalsIgnoreCase(id5)));
+ assertTrue(("uselessBindingPolicy".equalsIgnoreCase(id5) && "uselessBindingPolicy2".equalsIgnoreCase(id6))
+ || ("uselessBindingPolicy".equalsIgnoreCase(id6) && "uselessBindingPolicy2".equalsIgnoreCase(id5)));
}
-
+
}
17 years, 9 months
- 1
- 0
JBossWS SVN: r3383 - trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 17:05:29 -0400 (Fri, 01 Jun 2007)
New Revision: 3383
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
Log:
Format using JBossWSCodeStyle. No functional change
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-06-01 20:57:18 UTC (rev 3382)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-06-01 21:05:29 UTC (rev 3383)
@@ -41,75 +41,74 @@
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
-
-
/**
* @author Stefano Maestri <mailto:stefano.maestri@javalinux.it>
*
* since 27/04/2007
*/
-public class PolicyDeployer
+public class PolicyDeployer
{
private final static Logger log = Logger.getLogger(PolicyDeployer.class);
private static PolicyDeployer me;
private Map<String, Class> domainDeployerMap = new HashMap<String, Class>();
-
- static {
+ static
+ {
me = new PolicyDeployer();
- me.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd",WSSecurityAssertionDeployer.class);
+ me.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd", WSSecurityAssertionDeployer.class);
}
-
+
//hide constructor
PolicyDeployer()
{
}
-
- public static PolicyDeployer getInstance()
+
+ public static PolicyDeployer getInstance()
{
return me;
}
-
+
//for test
- public static PolicyDeployer newInstance(Map<String,Class> customDomainMap)
+ public static PolicyDeployer newInstance(Map<String, Class> customDomainMap)
{
PolicyDeployer instance = new PolicyDeployer();
instance.domainDeployerMap = customDomainMap;
return instance;
-
+
}
-
+
//for tools
- public static PolicyDeployer newInstanceForTools()
+ public static PolicyDeployer newInstanceForTools()
{
- PolicyDeployer instance = new PolicyDeployer();
+ PolicyDeployer instance = new PolicyDeployer();
instance.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd", NopAssertionDeployer.class);
return instance;
-
+
}
-
+
@SuppressWarnings("unchecked")
public Policy deployServerside(Policy policy, ExtensibleMetaData extMetaData) throws UnsupportedPolicy
{
- if (policy == null) throw new WSException("Cannot deploy null policy!");
-
+ if (policy == null)
+ throw new WSException("Cannot deploy null policy!");
+
List<Assertion> returnedPolicyTerms = new LinkedList<Assertion>();
-
- if (! policy.isNormalized())
+
+ if (!policy.isNormalized())
{
policy = (Policy)policy.normalize();
}
-
+
//in normal form we have just one wsp:ExactlyOne element containg unbounded wsp:All (alternative)
- XorCompositeAssertion exactlyOne = (XorCompositeAssertion) policy.getTerms().get(0);
- log.debug("####"+ exactlyOne.getClass());
- log.debug("####"+ exactlyOne.getTerms());
- for (AndCompositeAssertion alternative: (List<AndCompositeAssertion>) exactlyOne.getTerms() )
+ XorCompositeAssertion exactlyOne = (XorCompositeAssertion)policy.getTerms().get(0);
+ log.debug("####" + exactlyOne.getClass());
+ log.debug("####" + exactlyOne.getTerms());
+ for (AndCompositeAssertion alternative : (List<AndCompositeAssertion>)exactlyOne.getTerms())
{
log.debug("alternative");
try
{
- deployAlternativeServerSide(alternative,extMetaData);
+ deployAlternativeServerSide(alternative, extMetaData);
returnedPolicyTerms.add(alternative);
}
catch (UnsupportedAlternative e)
@@ -117,9 +116,9 @@
log.debug("Unsupported Alternative");
//policy is unsupported only if it have all alternative unsupported
}
-
+
}
- if (returnedPolicyTerms.size() == 0)
+ if (returnedPolicyTerms.size() == 0)
{
if (log.isDebugEnabled())
{
@@ -131,7 +130,7 @@
policy.addTerms(returnedPolicyTerms);
return policy;
}
-
+
/**
* Policy deployer method for client side: delegates to the right domain deployer
* and fails if one or more policy assertions are not supported.
@@ -143,53 +142,54 @@
@SuppressWarnings("unchecked")
public void deployClientSide(Policy policy, ExtensibleMetaData extMetaData) throws UnsupportedPolicy
{
- if (policy == null) throw new WSException("Cannot deploy null policy!");
-
- if (! policy.isNormalized())
+ if (policy == null)
+ throw new WSException("Cannot deploy null policy!");
+
+ if (!policy.isNormalized())
{
policy = (Policy)policy.normalize();
}
//in normal form we have just one wsp:ExactlyOne element containg unbounded wsp:All (alternative)
- XorCompositeAssertion exactlyOne = (XorCompositeAssertion) policy.getTerms().get(0);
- for (AndCompositeAssertion alternative: (List<AndCompositeAssertion>) exactlyOne.getTerms() )
+ XorCompositeAssertion exactlyOne = (XorCompositeAssertion)policy.getTerms().get(0);
+ for (AndCompositeAssertion alternative : (List<AndCompositeAssertion>)exactlyOne.getTerms())
{
- for (Assertion assertion : (List<Assertion>) alternative.getTerms())
+ for (Assertion assertion : (List<Assertion>)alternative.getTerms())
{
if (assertion instanceof PrimitiveAssertion)
{
try
{
- deployAssertionClientSide((PrimitiveAssertion) assertion, extMetaData);
+ deployAssertionClientSide((PrimitiveAssertion)assertion, extMetaData);
}
catch (UnsupportedAssertion e)
{
log.error("Unsupported assertion!");
throw new UnsupportedPolicy();
}
- }
+ }
else if (assertion instanceof Policy) //inner policy to be verified
{
- deployClientSide((Policy) assertion, extMetaData);
+ deployClientSide((Policy)assertion, extMetaData);
}
}
}
}
-
+
@SuppressWarnings("unchecked")
private void deployAlternativeServerSide(AndCompositeAssertion alternative, ExtensibleMetaData extMetaData) throws UnsupportedAlternative
{
- for (Assertion assertion : (List<Assertion>) alternative.getTerms())
+ for (Assertion assertion : (List<Assertion>)alternative.getTerms())
{
-
+
try
{
if (assertion instanceof PrimitiveAssertion)
{
- deployAssertionServerSide((PrimitiveAssertion) assertion,extMetaData);
- }
+ deployAssertionServerSide((PrimitiveAssertion)assertion, extMetaData);
+ }
else if (assertion instanceof Policy) //inner policy to be verified
{
- deployServerside((Policy) assertion, extMetaData);
+ deployServerside((Policy)assertion, extMetaData);
}
else
{
@@ -199,7 +199,7 @@
}
throw new UnsupportedAlternative();
}
-
+
}
catch (UnsupportedAssertion e)
{
@@ -213,17 +213,17 @@
}
}
}
-
- private void deployAssertionServerSide(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertion
+
+ private void deployAssertionServerSide(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertion
{
AssertionDeployer deployer = getDomainDeployerInstance(assertion.getName().getNamespaceURI());
- deployer.deployServerSide(assertion,extMetaData);
- }
-
- private void deployAssertionClientSide(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertion
+ deployer.deployServerSide(assertion, extMetaData);
+ }
+
+ private void deployAssertionClientSide(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertion
{
AssertionDeployer deployer = getDomainDeployerInstance(assertion.getName().getNamespaceURI());
- deployer.deployClientSide(assertion,extMetaData);
+ deployer.deployClientSide(assertion, extMetaData);
}
/**
@@ -233,19 +233,22 @@
*/
private AssertionDeployer getDomainDeployerInstance(String namespace) throws UnsupportedAssertion
{
- try {
- if (! domainDeployerMap.containsKey(namespace) )
+ try
+ {
+ if (!domainDeployerMap.containsKey(namespace))
{
if (log.isDebugEnabled())
{
- log.debug("Unknown namespace:"+namespace+"...Assertion not supported");
+ log.debug("Unknown namespace:" + namespace + "...Assertion not supported");
}
throw new UnsupportedAssertion();
}
- return (AssertionDeployer) (domainDeployerMap.get(namespace)).newInstance();
- } catch (Exception e) {
-
- throw new UnsupportedAssertion();
+ return (AssertionDeployer)(domainDeployerMap.get(namespace)).newInstance();
}
+ catch (Exception e)
+ {
+
+ throw new UnsupportedAssertion();
+ }
}
}
17 years, 9 months
- 1
- 0
JBossWS SVN: r3382 - in trunk/build/hudson/hudson-home/jobs: AS-Tests-AS-5.0 and 14 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 16:57:18 -0400 (Fri, 01 Jun 2007)
New Revision: 3382
Modified:
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
Log:
Fix AS-Tests
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,22 +38,24 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
fi
+echo "Success"
#
# build the testsuite
#
cd $JBOSS_INSTANCE/../../../testsuite
-./build.sh clean main
+./build.sh -Dnode0=$JBOSS_BINDADDR clean main
#
# execute tests
#
-./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,22 +38,24 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
fi
+echo "Success"
#
# build the testsuite
#
cd $JBOSS_INSTANCE/../../../testsuite
-./build.sh clean main
+./build.sh -Dnode0=$JBOSS_BINDADDR clean main
#
# execute tests
#
-./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-01 20:57:18 UTC (rev 3382)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $JBWSDIR/spider.failed ]; then
echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
17 years, 9 months
- 1
- 0
JBossWS SVN: r3381 - in trunk: build/hudson/hudson-home/jobs/AS-Tests-AS-5.0 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 15:59:34 -0400 (Fri, 01 Jun 2007)
New Revision: 3381
Modified:
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
trunk/integration/xfire/src/main/etc/bindist-build.xml
Log:
Fix xfire bin-dist
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
@@ -71,6 +71,9 @@
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>test-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 19:59:34 UTC (rev 3381)
@@ -71,6 +71,9 @@
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>test-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-01 19:59:34 UTC (rev 3381)
@@ -33,7 +33,7 @@
<delete dir="${bindist.dir}"/>
<mkdir dir="${bindist.build.dir}"/>
<mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
+ <mkdir dir="${bindist.lib.dir}/client"/>
<mkdir dir="${bindist.docs.dir}"/>
<mkdir dir="${bindist.tests.dir}"/>
@@ -106,9 +106,14 @@
<include name="jbossws-xfire50.sar"/>
<include name="jbossws-xfire50-deployer.zip"/>
</fileset>
-
- <!-- TODO: Verify this doesnt clash -->
<fileset dir="${int.xfire.dir}/thirdparty"/>
+ </copy>
+
+ <!--
+ Cannot use XFire client
+ [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
+ -->
+ <copy todir="${bindist.lib.dir}/client" overwrite="true">
<fileset dir="${int.sunri.dir}/thirdparty"/>
</copy>
Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 19:59:34 UTC (rev 3381)
@@ -85,8 +85,7 @@
<!--
Cannot use XFire client
[JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
- -->
-
+ -->
<path id="sunri.classpath">
<pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
<pathelement location="${thirdparty.dir}/client/http.jar"/>
17 years, 9 months
- 1
- 0
JBossWS SVN: r3380 - in trunk: build/hudson/hudson-home/jobs/Distro-Native-AS-4.2 and 14 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 15:21:31 -0400 (Fri, 01 Jun 2007)
New Revision: 3380
Added:
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
Removed:
trunk/integration/native/ant-import/build-distro.xml
trunk/integration/sunri/ant-import/build-distro.xml
trunk/integration/xfire/ant-import/build-distro.xml
Modified:
trunk/build/ant-import/build-release.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/etc/bindist-build.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/src/main/etc/bindist-build.xml
trunk/integration/xfire/build.xml
trunk/integration/xfire/src/main/etc/bindist-build.xml
Log:
Fix build-bin-dist
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/ant-import/build-release.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -13,9 +13,6 @@
<project>
- <property name="build.bin.dist" value="${build.output.dir}/bin-dist"/>
- <property name="build.src.dist" value="${build.output.dir}/src-dist"/>
-
<target name="release-all" depends="all,release-to-repository,release-to-portal" description="Release JBossWS">
<echo message="*********************************************"/>
<echo message="* Released: jbossws-${version.id}"/>
@@ -76,137 +73,19 @@
<!-- Build distributions -->
<!-- ================================================================== -->
- <!-- Build the bin dist -->
- <target name="build-bin-dist" depends="jars,build-samples,build-javadoc"
- description="Build the binary distribution">
-
- <property name="install.bin.dir" value="${build.bin.dist}/install/bin"/>
- <property name="install.etc.dir" value="${build.bin.dist}/install/etc"/>
- <property name="install.core.dir" value="${build.bin.dist}/install/jbossws-core"/>
- <property name="install.jboss40.dir" value="${build.bin.dist}/install/integration-jboss40"/>
- <property name="install.jboss42.dir" value="${build.bin.dist}/install/integration-jboss42"/>
- <property name="install.jboss50.dir" value="${build.bin.dist}/install/integration-jboss50"/>
- <property name="install.tomcat.dir" value="${build.bin.dist}/install/integration-tomcat"/>
- <property name="install.thirdparty.dir" value="${build.bin.dist}/install/thirdparty"/>
-
- <mkdir dir="${install.etc.dir}"/>
- <mkdir dir="${install.core.dir}"/>
- <mkdir dir="${install.jboss40.dir}"/>
- <mkdir dir="${install.jboss42.dir}"/>
- <mkdir dir="${install.jboss50.dir}"/>
- <mkdir dir="${install.tomcat.dir}"/>
- <mkdir dir="${install.thirdparty.dir}"/>
-
- <copy todir="${build.bin.dist}" file="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
- <copy todir="${build.bin.dist}" filtering="true" overwrite="true">
- <fileset dir="${build.dir}/dist"/>
- <filterset>
- <filtersfile file="${build.dir}/version.properties"/>
- </filterset>
- </copy>
- <copy tofile="${build.bin.dist}/build.xml" file="${build.dir}/ant-import/build-deploy.xml"/>
-
- <!-- samples -->
- <copy todir="${build.bin.dist}" file="${build.output.dir}/${samples.target}.zip" overwrite="true"/>
-
- <!-- javadoc -->
- <copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/>
-
- <!-- bin -->
- <copy todir="${install.bin.dir}">
- <fileset dir="${build.etc.dir}">
- <include name="*.bat"/>
- <include name="*.sh"/>
- </fileset>
- </copy>
-
- <!-- etc -->
- <copy todir="${install.etc.dir}">
- <fileset dir="${build.etc.dir}">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- Install Core -->
- <copy todir="${install.core.dir}" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jbossws-client.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
-
- <!-- Install Thirdparty -->
- <copy todir="${install.thirdparty.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="activation.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="jaxb-*.jar"/>
- <include name="juddi-service.sar"/>
- <include name="mail.jar"/>
- <include name="serializer.jar"/>
- <include name="stax-api.jar"/>
- <include name="wstx.jar"/>
- <include name="xalan.jar"/>
- <include name="xercesImpl.jar"/>
- </fileset>
- </copy>
-
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/>
- <copy todir="${install.jboss42.dir}" file="${jboss42.output.lib.dir}/jbossws42.sar"/>
- <copy todir="${install.jboss40.dir}">
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40.sar"/>
- <include name="jbossws40-jdk14.sar"/>
- <include name="jbossws14-client.jar"/>
- <include name="jboss-jaxws14.jar"/>
- </fileset>
- </copy>
-
- <!-- Install Tomcat -->
- <copy todir="${install.tomcat.dir}" overwrite="true">
- <fileset dir="${tomcat.output.lib.dir}">
- <include name="jbossws-tomcat-integration.jar"/>
- <include name="jbossws-thirdparty.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.tomcat.dir}" overwrite="true">
- <fileset dir="${tomcat.output.lib.dir}" includes="jbossws.war"/>
- </copy>
-
- <zip destfile="${build.output.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
- </target>
-
<!-- Build the src dist -->
<target name="build-src-dist" description="Build the source distribution">
+ <property name="build.src.dist" value="${build.dir}/output/src-dist"/>
+ <delete dir="${build.src.dist}/jbossws-src-${version.id}"/>
<mkdir dir="${build.src.dist}/jbossws-src-${version.id}"/>
<copy todir="${build.src.dist}/jbossws-src-${version.id}">
- <fileset dir="${basedir}/..">
- <include name="build/ant.properties.example"/>
- <include name="build/version.properties"/>
- <include name="build/build.xml"/>
- <include name="build/ant-import/**"/>
- <include name="build/etc/**"/>
- <include name="jbossws-core/src/**"/>
- <include name="jbossws-core/build.xml"/>
- <include name="jbossws-docs/user-guide/**"/>
- <include name="jbossws-tests/ant-import/**"/>
- <include name="jbossws-tests/src/**"/>
- <include name="jbossws-tests/build.xml"/>
- <include name="integration-jboss50/src/**"/>
- <include name="integration-jboss50/build.xml"/>
- <include name="integration-jboss42/src/**"/>
- <include name="integration-jboss42/build.xml"/>
- <include name="integration-jboss40/src/**"/>
- <include name="integration-jboss40/build.xml"/>
- <include name="integration-tomcat/src/**"/>
- <include name="integration-tomcat/build.xml"/>
+ <fileset dir="${basedir}">
+ <exclude name="*.md5"/>
+ <exclude name="**/output*/**"/>
+ <exclude name="**/thirdparty/**"/>
</fileset>
</copy>
- <zip destfile="${build.output.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
+ <zip destfile="${build.dir}/output/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
includes="jbossws-src-${version.id}/**"/>
</target>
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Copied: trunk/integration/native/ant-import/build-bin-dist.xml (from rev 3378, trunk/integration/native/ant-import/build-distro.xml)
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml (rev 0)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -0,0 +1,134 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/XFire -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars" description="Build the binary distribution">
+
+ <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${spi.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-core.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-native42.sar"/>
+ <include name="jbossws-native50.sar"/>
+ <include name="jbossws-native50-deployer.zip"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="juddi-service.sar"/>
+ <include name="policy.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.native.dir}/src/test"/>
+ </copy>
+
+ <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip">
+ <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Deleted: trunk/integration/native/ant-import/build-distro.xml
===================================================================
--- trunk/integration/native/ant-import/build-distro.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/native/ant-import/build-distro.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -1,134 +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>
-
- <!-- ================================================================== -->
- <!-- Binary distribution JBossWS/XFire -->
- <!-- ================================================================== -->
-
- <target name="binary-dist" depends="jars" description="Build the binary distribution">
-
- <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
- <filterset>
- <filtersfile file="${build.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/>
- <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${build.dir}">
- <include name="version.properties"/>
- </fileset>
- <fileset dir="${build.dir}/ant-import">
- <include name="build-testsuite.xml"/>
- </fileset>
- <fileset dir="${int.native.dir}/ant-import">
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- <fileset dir="${spi.dir}/ant-import">
- <include name="macros-deploy-spi.xml"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
- <fileset dir="${testsuite.dir}/ant-import">
- <include name="build-jars-jaxws.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${build.dir}/etc">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
- <include name="getopt.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="${int.native.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-native42.sar"/>
- <include name="jbossws-native50.sar"/>
- <include name="jbossws-native50-deployer.zip"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="juddi-service.sar"/>
- <include name="policy.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${testsuite.dir}/src"/>
- <fileset dir="${int.native.dir}/src/test"/>
- </copy>
-
- <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip">
- <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/>
- </zip>
- </target>
-
-</project>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/native/build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -15,8 +15,8 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.native.dir}/ant-import/build-bin-dist.xml"/>
<import file="${int.native.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.native.dir}/ant-import/build-distro.xml"/>
<import file="${int.native.dir}/ant-import/build-release.xml"/>
<import file="${int.native.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.native.dir}/ant-import/build-thirdparty.xml"/>
@@ -231,6 +231,6 @@
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
</project>
Modified: trunk/integration/native/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -21,7 +21,7 @@
<property name="bin.dir" value="${basedir}/bin"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
@@ -138,13 +138,14 @@
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
</target>
<!-- Remove jbossws/native from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
<macro-undeploy-native50/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy jbossws/native to jboss42 -->
@@ -157,16 +158,18 @@
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
- <macro-deploy-spi
+
+ <macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
</target>
<!-- Remove jbossws/native from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
<macro-undeploy-native42/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
<!-- ================================================================== -->
Copied: trunk/integration/sunri/ant-import/build-bin-dist.xml (from rev 3378, trunk/integration/sunri/ant-import/build-distro.xml)
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml (rev 0)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -0,0 +1,122 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/SunRI -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars" description="Build the binary distribution">
+
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+
+ <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${spi.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-sunri42.sar"/>
+ <include name="jbossws-sunri50.sar"/>
+ <include name="jbossws-sunri50-deployer.zip"/>
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/thirdparty"/>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.sunri.dir}/src/test"/>
+ </copy>
+
+ <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip">
+ <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Deleted: trunk/integration/sunri/ant-import/build-distro.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -1,122 +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>
-
- <!-- ================================================================== -->
- <!-- Binary distribution JBossWS/SunRI -->
- <!-- ================================================================== -->
-
- <target name="binary-dist" depends="jars" description="Build the binary distribution">
-
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
-
- <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
- <filterset>
- <filtersfile file="${build.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/>
- <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${build.dir}">
- <include name="version.properties"/>
- </fileset>
- <fileset dir="${build.dir}/ant-import">
- <include name="build-testsuite.xml"/>
- </fileset>
- <fileset dir="${int.native.dir}/ant-import">
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- <fileset dir="${spi.dir}/ant-import">
- <include name="macros-deploy-spi.xml"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
- <fileset dir="${testsuite.dir}/ant-import">
- <include name="build-jars-jaxws.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${build.dir}/etc">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
- <include name="getopt.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-sunri42.sar"/>
- <include name="jbossws-sunri50.sar"/>
- <include name="jbossws-sunri50-deployer.zip"/>
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/thirdparty"/>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${testsuite.dir}/src"/>
- <fileset dir="${int.sunri.dir}/src/test"/>
- </copy>
-
- <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip">
- <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/>
- </zip>
- </target>
-
-</project>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/sunri/build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -15,8 +15,8 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.sunri.dir}/ant-import/build-bin-dist.xml"/>
<import file="${int.sunri.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.sunri.dir}/ant-import/build-distro.xml"/>
<import file="${int.sunri.dir}/ant-import/build-release.xml"/>
<import file="${int.sunri.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.sunri.dir}/ant-import/build-thirdparty.xml"/>
@@ -255,6 +255,6 @@
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
</project>
Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -20,7 +20,7 @@
<property name="build.dir" value="${basedir}/build"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
@@ -145,13 +145,14 @@
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy jbossws/sunri to jboss42 -->
@@ -167,13 +168,14 @@
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
</target>
<!-- Remove jbossws/sunri from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
<macro-undeploy-sunri42/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
<!-- ================================================================== -->
Copied: trunk/integration/xfire/ant-import/build-bin-dist.xml (from rev 3378, trunk/integration/xfire/ant-import/build-distro.xml)
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml (rev 0)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -0,0 +1,126 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/XFire -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars" description="Build the binary distribution">
+
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
+
+ <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${spi.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-xfire42.sar"/>
+ <include name="jbossws-xfire50.sar"/>
+ <include name="jbossws-xfire50-deployer.zip"/>
+ </fileset>
+
+ <!-- TODO: Verify this doesnt clash -->
+ <fileset dir="${int.xfire.dir}/thirdparty"/>
+ <fileset dir="${int.sunri.dir}/thirdparty"/>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.xfire.dir}/src/test"/>
+ </copy>
+
+ <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip">
+ <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Deleted: trunk/integration/xfire/ant-import/build-distro.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -1,126 +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>
-
- <!-- ================================================================== -->
- <!-- Binary distribution JBossWS/XFire -->
- <!-- ================================================================== -->
-
- <target name="binary-dist" depends="jars" description="Build the binary distribution">
-
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
-
- <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
- <filterset>
- <filtersfile file="${build.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
- <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${build.dir}">
- <include name="version.properties"/>
- </fileset>
- <fileset dir="${build.dir}/ant-import">
- <include name="build-testsuite.xml"/>
- </fileset>
- <fileset dir="${int.native.dir}/ant-import">
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- <fileset dir="${spi.dir}/ant-import">
- <include name="macros-deploy-spi.xml"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
- <fileset dir="${testsuite.dir}/ant-import">
- <include name="build-jars-jaxws.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${build.dir}/etc">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
- <include name="getopt.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-xfire42.sar"/>
- <include name="jbossws-xfire50.sar"/>
- <include name="jbossws-xfire50-deployer.zip"/>
- </fileset>
-
- <!-- TODO: Verify this doesnt clash -->
- <fileset dir="${int.xfire.dir}/thirdparty"/>
- <fileset dir="${int.sunri.dir}/thirdparty"/>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${testsuite.dir}/src"/>
- <fileset dir="${int.xfire.dir}/src/test"/>
- </copy>
-
- <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip">
- <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/>
- </zip>
- </target>
-
-</project>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/xfire/build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -15,8 +15,8 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.xfire.dir}/ant-import/build-bin-dist.xml"/>
<import file="${int.xfire.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.xfire.dir}/ant-import/build-distro.xml"/>
<import file="${int.xfire.dir}/ant-import/build-release.xml"/>
<import file="${int.xfire.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.xfire.dir}/ant-import/build-thirdparty.xml"/>
@@ -241,6 +241,6 @@
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
</project>
Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -21,7 +21,7 @@
<property name="bin.dir" value="${basedir}/bin"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
@@ -161,16 +161,18 @@
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
</target>
<!-- Remove jbossws/xfire from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
<macro-undeploy-xfire50/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy jbossws/xfire to jboss42 -->
@@ -182,16 +184,18 @@
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
</target>
<!-- Remove jbossws/xfire from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
<macro-undeploy-xfire42/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
<!-- ================================================================== -->
17 years, 9 months
- 1
- 0
JBossWS SVN: r3379 - in trunk: integration/native/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 14:40:32 -0400 (Fri, 01 Jun 2007)
New Revision: 3379
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
Log:
Fix container integration deployment
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/build/ant-import/build-testsuite.xml 2007-06-01 18:40:32 UTC (rev 3379)
@@ -97,7 +97,6 @@
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/jbossws-integration-tools.jar"/>
<pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/servlet-api.jar"/>
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 18:40:32 UTC (rev 3379)
@@ -124,6 +124,8 @@
<attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+
+ <!-- CLIENT JARS -->
<copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
@@ -133,7 +135,6 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
@@ -145,7 +146,12 @@
<include name="policy.jar"/>
</fileset>
</copy>
+
+ <!-- SERVER JARS -->
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
<fileset dir="@{corelibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -165,6 +171,8 @@
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
<delete>
+
+ <!-- CLIENT JARS -->
<fileset dir="${jboss42.home}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -175,13 +183,14 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
<include name="jbossws-jboss42.jar"/>
<include name="policy.jar"/>
<include name="wsdl4j.jar"/>
<!-- remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
+
+ <!-- SERVER JARS -->
<fileset dir="${jboss42.home}/lib">
<!-- remove only, do not deploy -->
<include name="jbossws-integration.jar"/>
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-06-01 18:40:32 UTC (rev 3379)
@@ -45,9 +45,6 @@
</fileset>
</copy>
<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss50.jar"/>
</fileset>
@@ -72,7 +69,6 @@
<include name="jbossws-jboss50.jar"/>
</fileset>
<fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
<include name="jbossws-jboss50.jar"/>
</fileset>
</delete>
@@ -109,9 +105,6 @@
</fileset>
</copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
@@ -133,7 +126,6 @@
<include name="jbossws-jboss42.jar"/>
</fileset>
<fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
<include name="jbossws-jboss42.jar"/>
</fileset>
</delete>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-01 18:40:32 UTC (rev 3379)
@@ -186,7 +186,6 @@
<classpath location="${thirdparty.dir}/commons-logging.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
- <classpath location="${core.dir}/output/lib/jbossws-integration-tools.jar"/>
</taskdef>
<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
17 years, 9 months
- 1
- 0