JBossWS SVN: r2126 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs: JBWS-Local-Sanity-AS-5.0 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-26 03:42:36 -0500 (Fri, 26 Jan 2007)
New Revision: 2126
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml
Removed:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
Log:
Add sanity tests-samples
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0 (from rev 2124, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0)
Deleted: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml 2007-01-26 08:21:45 UTC (rev 2124)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 08:42:36 UTC (rev 2126)
@@ -1,70 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Local-Sanity-JAXWS-AS-5.0
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=(a)svn.basedir.local@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-cd $SVNBASEDIR/build
-ant $ENVIRONMENT deploy-jboss50
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT -Dtest=jaxws/samples test 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basedir.local(a)/jbossws-tests/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>
- Build and test the local jbossws-(a)version.id@ against AS-5.0
- <p/>
- Local SVN dir: @svn.basedir.local@
- </description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml (from rev 2125, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml)
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml (rev 0)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 08:42:36 UTC (rev 2126)
@@ -0,0 +1,77 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Local-Sanity-AS-5.0
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=(a)svn.basedir.local@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss50
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT tests-samples 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>
+ Build and test the local jbossws-(a)version.id@ against AS-5.0
+ <p/>
+ Local SVN dir: @svn.basedir.local@
+ </description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:26:33 UTC (rev 2125)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:42:36 UTC (rev 2126)
@@ -37,6 +37,13 @@
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports
+
+#
# stop jbossas
#
$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
@@ -45,7 +52,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basedir.local(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>test-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:26:33 UTC (rev 2125)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:42:36 UTC (rev 2126)
@@ -37,6 +37,13 @@
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports
+
+#
# stop jbossas
#
$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
@@ -45,7 +52,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basedir.local(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>test-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
17 years, 9 months
- 1
- 0
JBossWS SVN: r2125 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs: JBWS-Local-Sanity-JAXWS-AS-5.0 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-26 03:26:33 -0500 (Fri, 26 Jan 2007)
New Revision: 2125
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml
Log:
Add tests-report to sanity tests
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml 2007-01-26 08:21:45 UTC (rev 2124)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml 2007-01-26 08:26:33 UTC (rev 2125)
@@ -33,7 +33,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT -Dtest=jaxrpc/samples test 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT -Dtest=jaxrpc/samples test tests-report 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml 2007-01-26 08:21:45 UTC (rev 2124)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml 2007-01-26 08:26:33 UTC (rev 2125)
@@ -33,7 +33,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT -Dtest=jaxws/samples test 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT -Dtest=jaxws/samples test tests-report 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
17 years, 9 months
- 1
- 0
JBossWS SVN: r2124 - in branches/jbossws-1.2.0/build/hudson/hudson-home: jobs and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-26 03:21:45 -0500 (Fri, 26 Jan 2007)
New Revision: 2124
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml
Log:
Add jaxws sanity
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 08:21:45 UTC (rev 2124)
@@ -32,8 +32,10 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>JBWS-Local-Sanity-JAXWS-AS-5.0</string>
+ <string>JBWS-Local-Sanity-JAXRPC-AS-5.0</string>
+ <string>JBWS-Local-Tests-AS-5.0</string>
<string>JBWS-Local-Tests-AS-4.2</string>
- <string>JBWS-Local-Tests-AS-5.0</string>
</jobNames>
<name>JBossWS Local Testsuite</name>
<description>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml 2007-01-26 08:21:45 UTC (rev 2124)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-Local-Tests-AS-5.0
+MODULE=JBWS-Local-Sanity-JAXRPC-AS-5.0
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
@@ -22,7 +22,7 @@
# deploy to jboss
#
cd $SVNBASEDIR/build
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT deploy-jboss50
#
# start jbossas
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0 (from rev 2123, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXWS-AS-5.0/config.xml 2007-01-26 08:21:45 UTC (rev 2124)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-Local-Tests-AS-5.0
+MODULE=JBWS-Local-Sanity-JAXWS-AS-5.0
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
@@ -22,7 +22,7 @@
# deploy to jboss
#
cd $SVNBASEDIR/build
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -33,7 +33,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT -Dtest=jaxrpc/samples test 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT -Dtest=jaxws/samples test 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
17 years, 9 months
- 1
- 0
JBossWS SVN: r2123 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs: JBWS-Local-Sanity-JAXRPC-AS-5.0 and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-26 03:16:32 -0500 (Fri, 26 Jan 2007)
New Revision: 2123
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
Log:
Add jaxrpc sanity
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0 (from rev 2122, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-JAXRPC-AS-5.0/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
@@ -33,7 +33,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT -Dtest=jaxrpc/samples test 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
@@ -33,7 +33,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
@@ -33,7 +33,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
@@ -38,7 +38,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
@@ -40,7 +40,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
@@ -38,7 +38,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-26 08:16:32 UTC (rev 2123)
@@ -38,7 +38,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
17 years, 9 months
- 1
- 0
JBossWS SVN: r2122 - in branches/jbossws-1.2.0/build: hudson/hudson-home and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-26 03:06:30 -0500 (Fri, 26 Jan 2007)
New Revision: 2122
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/
Modified:
branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
Log:
Add views and local jobs
Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-26 07:16:33 UTC (rev 2121)
+++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-26 08:06:30 UTC (rev 2122)
@@ -66,6 +66,9 @@
<exec executable="basename" outputproperty="svn.basename">
<arg value="${svn.url}"/>
</exec>
+ <exec executable="dirname" outputproperty="svn.basedir.local">
+ <arg value="${basedir}"/>
+ </exec>
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
@@ -74,6 +77,7 @@
</fileset>
<filterset>
<filter token="version.id" value="${version.id}"/>
+ <filter token="svn.basedir.local" value="${svn.basedir.local}"/>
<filter token="svn.basename" value="${svn.basename}"/>
<filter token="svn.url" value="${svn.url}"/>
<filter token="hudson.home" value="${hudson.home}"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 07:16:33 UTC (rev 2121)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
@@ -6,23 +6,50 @@
<slaves/>
<quietPeriod>5</quietPeriod>
<views>
+
+ <!-- JBossAS Testsuite -->
<view>
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>AS-4.0</string>
- <string>AS-4.0-jdk14</string>
- <string>AS-4.2</string>
- <string>AS-5.0</string>
- <string>TC-5.5</string>
+ <string>JBAS-Tests-AS-4.0</string>
+ <string>JBAS-Tests-AS-4.0-jdk14</string>
+ <string>JBAS-Tests-AS-4.2</string>
+ <string>JBAS-Tests-AS-5.0</string>
</jobNames>
- <name>Target Container</name>
- <description>Build the supported target container. A successful build is a prerequisite for any testrun that targets the container.</description>
+ <name>JBossAS Testsuite</name>
+ <description>
+<![CDATA[
+ Run the JBossAS webservice testsuite.
+ <p/>
+ Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a>
+]]>
+ </description>
</view>
+
+ <!-- JBossWS Local Testsuite -->
<view>
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>JBWS-Local-Tests-AS-4.2</string>
+ <string>JBWS-Local-Tests-AS-5.0</string>
+ </jobNames>
+ <name>JBossWS Local Testsuite</name>
+ <description>
+<![CDATA[
+ Run the JBossWS local testsuite.
+ <p/>
+ Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a>
+]]>
+ </description>
+ </view>
+
+ <!-- JBossWS Testsuite -->
+ <view>
+ <owner reference="../../.."/>
+ <jobNames class="tree-set">
+ <no-comparator/>
<string>JBWS-Tests-AS-4.0</string>
<string>JBWS-Tests-AS-4.0-jdk14</string>
<string>JBWS-Tests-AS-4.2</string>
@@ -30,24 +57,37 @@
<string>JBWS-Tests-TC-5.5</string>
</jobNames>
<name>JBossWS Testsuite</name>
- <description>Run the JBossWS testsuite.
-<p/>
-Make sure you have sucessfuly build the <a href="/hudson/view/Target Container">Target Container</a></description>
+ <description>
+<![CDATA[
+ Run the JBossWS testsuite.
+ <p/>
+ Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a>
+]]>
+ </description>
</view>
+
+ <!-- JBossWS Samples -->
<view>
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>JBAS-Tests-AS-4.0</string>
- <string>JBAS-Tests-AS-4.0-jdk14</string>
- <string>JBAS-Tests-AS-4.2</string>
- <string>JBAS-Tests-AS-5.0</string>
+ <string>JBWS-Samples-AS-4.0</string>
+ <string>JBWS-Samples-AS-4.0-jdk14</string>
+ <string>JBWS-Samples-AS-4.2</string>
+ <string>JBWS-Samples-AS-5.0</string>
+ <string>JBWS-Samples-TC-5.5</string>
</jobNames>
- <name>JBossAS Testsuite</name>
- <description>Run the JBossAS webservice testsuite.
-<p/>
-Make sure you have sucessfuly build the <a href="/hudson/view/Target Container">Target Container</a></description>
+ <name>JBossWS Samples</name>
+ <description>
+<![CDATA[
+ Run the JBossWS samples.
+ <p/>
+ Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a>
+]]>
+ </description>
</view>
+
+ <!-- Release QA -->
<view>
<owner reference="../../.."/>
<jobNames class="tree-set">
@@ -56,32 +96,40 @@
<string>Release-Matrix-Step2</string>
</jobNames>
<name>Release QA</name>
- <description>A collection of jobs that covers the JBossWS release matrix
-<p/>
-
-<table border=1>
-<tr><th> </th><th>JBWS-Tests</th><th>JBAS-Tests</th><th>JBWS-Samples</th></tr>
-<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr>
-<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr>
-</table></description>
+ <description>
+<![CDATA[
+A collection of jobs that covers the JBossWS release matrix.
+<p/>
+<table border=1>
+<tr><th> </th><th>JBWS-Tests</th><th>JBAS-Tests</th><th>JBWS-Samples</th></tr>
+<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
+<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr>
+<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr>
+</table>
+]]>
+ </description>
</view>
+
+ <!-- Target Container -->
<view>
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>JBWS-Samples-AS-4.0</string>
- <string>JBWS-Samples-AS-4.0-jdk14</string>
- <string>JBWS-Samples-AS-4.2</string>
- <string>JBWS-Samples-AS-5.0</string>
- <string>JBWS-Samples-TC-5.5</string>
+ <string>AS-4.0</string>
+ <string>AS-4.0-jdk14</string>
+ <string>AS-4.2</string>
+ <string>AS-5.0</string>
+ <string>TC-5.5</string>
</jobNames>
- <name>JBossWS Samples</name>
- <description>Run the JBossWS samples.
-<p/>
-Make sure you have sucessfuly build the <a href="/hudson/view/Target Container">Target Container</a></description>
+ <name>Target Container</name>
+ <description>
+<![CDATA[
+ Build the supported target container. A successful build is a prerequisite for any testrun that targets the container.
+]]>
+ </description>
</view>
+
</views>
</hudson>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2 (from rev 2119, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-25 20:59:07 UTC (rev 2119)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
@@ -6,20 +6,14 @@
#
# Module settings
#
-MODULE=JBWS-Tests-AS-4.2
+MODULE=JBWS-Local-Tests-AS-4.2
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+SVNBASEDIR=(a)svn.basedir.local@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
# stop jbossas
#
$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
@@ -27,6 +21,7 @@
#
# deploy to jboss
#
+cd $SVNBASEDIR/build
ant $ENVIRONMENT clean deploy-jboss42
#
@@ -50,7 +45,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>@svn.basedir.local(a)/jbossws-tests/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
@@ -59,15 +54,16 @@
</hudson.tasks.Mailer>
</publishers>
<buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
+ <scm class="hudson.scm.NullSCM"/>
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <description>
+ Build and test the local jbossws-(a)version.id@ against AS-4.2
+ <p/>
+ Local SVN dir: @svn.basedir.local@
+ </description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0 (from rev 2119, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-25 20:59:07 UTC (rev 2119)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
@@ -6,20 +6,14 @@
#
# Module settings
#
-MODULE=JBWS-Tests-AS-5.0
+MODULE=JBWS-Local-Tests-AS-5.0
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+SVNBASEDIR=(a)svn.basedir.local@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
# stop jbossas
#
$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
@@ -27,6 +21,7 @@
#
# deploy to jboss
#
+cd $SVNBASEDIR/build
ant $ENVIRONMENT clean deploy-jboss50
#
@@ -50,7 +45,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>@svn.basedir.local(a)/jbossws-tests/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
@@ -59,15 +54,16 @@
</hudson.tasks.Mailer>
</publishers>
<buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
+ <scm class="hudson.scm.NullSCM"/>
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <description>
+ Build and test the local jbossws-(a)version.id@ against AS-5.0
+ <p/>
+ Local SVN dir: @svn.basedir.local@
+ </description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 07:16:33 UTC (rev 2121)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 08:06:30 UTC (rev 2122)
@@ -14,7 +14,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build the relase matrix target container</description>
+ <description>Build the relase matrix target containers.</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
17 years, 9 months
- 1
- 0
JBossWS SVN: r2121 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-26 02:16:33 -0500 (Fri, 26 Jan 2007)
New Revision: 2121
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml
Log:
remove revious tomcat setup
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 07:14:49 UTC (rev 2120)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 07:16:33 UTC (rev 2121)
@@ -12,6 +12,7 @@
#
# copy tomcat installation
#
+rm -rf $WORKSPACE/apache-tomcat
cp -r @hudson.home@/../apache-tomcat $WORKSPACE
rm -rf $WORKSPACE/apache-tomcat/webapps/hudson*
rm -rf $WORKSPACE/apache-tomcat/work
17 years, 9 months
- 1
- 0
JBossWS SVN: r2120 - branches/jbossws-1.2.0/build/hudson/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-26 02:14:49 -0500 (Fri, 26 Jan 2007)
New Revision: 2120
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
Log:
Add views
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-25 20:59:07 UTC (rev 2119)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 07:14:49 UTC (rev 2120)
@@ -2,11 +2,86 @@
<hudson>
<numExecutors>1</numExecutors>
<useSecurity>false</useSecurity>
- <systemMessage><!--a href="http://labs.jboss.com/portal/jbossws">
-<img src="http://labs.jboss.com/file-access/default/theme/images/spotligh... border=0/>
-</a--></systemMessage>
<jdks/>
<slaves/>
<quietPeriod>5</quietPeriod>
- <views/>
+ <views>
+ <view>
+ <owner reference="../../.."/>
+ <jobNames class="tree-set">
+ <no-comparator/>
+ <string>AS-4.0</string>
+ <string>AS-4.0-jdk14</string>
+ <string>AS-4.2</string>
+ <string>AS-5.0</string>
+ <string>TC-5.5</string>
+ </jobNames>
+ <name>Target Container</name>
+ <description>Build the supported target container. A successful build is a prerequisite for any testrun that targets the container.</description>
+ </view>
+ <view>
+ <owner reference="../../.."/>
+ <jobNames class="tree-set">
+ <no-comparator/>
+ <string>JBWS-Tests-AS-4.0</string>
+ <string>JBWS-Tests-AS-4.0-jdk14</string>
+ <string>JBWS-Tests-AS-4.2</string>
+ <string>JBWS-Tests-AS-5.0</string>
+ <string>JBWS-Tests-TC-5.5</string>
+ </jobNames>
+ <name>JBossWS Testsuite</name>
+ <description>Run the JBossWS testsuite.
+<p/>
+Make sure you have sucessfuly build the <a href="/hudson/view/Target Container">Target Container</a></description>
+ </view>
+ <view>
+ <owner reference="../../.."/>
+ <jobNames class="tree-set">
+ <no-comparator/>
+ <string>JBAS-Tests-AS-4.0</string>
+ <string>JBAS-Tests-AS-4.0-jdk14</string>
+ <string>JBAS-Tests-AS-4.2</string>
+ <string>JBAS-Tests-AS-5.0</string>
+ </jobNames>
+ <name>JBossAS Testsuite</name>
+ <description>Run the JBossAS webservice testsuite.
+<p/>
+Make sure you have sucessfuly build the <a href="/hudson/view/Target Container">Target Container</a></description>
+ </view>
+ <view>
+ <owner reference="../../.."/>
+ <jobNames class="tree-set">
+ <no-comparator/>
+ <string>Release-Matrix-Step1</string>
+ <string>Release-Matrix-Step2</string>
+ </jobNames>
+ <name>Release QA</name>
+ <description>A collection of jobs that covers the JBossWS release matrix
+<p/>
+
+<table border=1>
+<tr><th> </th><th>JBWS-Tests</th><th>JBAS-Tests</th><th>JBWS-Samples</th></tr>
+<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
+<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr>
+<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr>
+</table></description>
+ </view>
+ <view>
+ <owner reference="../../.."/>
+ <jobNames class="tree-set">
+ <no-comparator/>
+ <string>JBWS-Samples-AS-4.0</string>
+ <string>JBWS-Samples-AS-4.0-jdk14</string>
+ <string>JBWS-Samples-AS-4.2</string>
+ <string>JBWS-Samples-AS-5.0</string>
+ <string>JBWS-Samples-TC-5.5</string>
+ </jobNames>
+ <name>JBossWS Samples</name>
+ <description>Run the JBossWS samples.
+<p/>
+Make sure you have sucessfuly build the <a href="/hudson/view/Target Container">Target Container</a></description>
+ </view>
+ </views>
</hudson>
\ No newline at end of file
![src="http://labs.jboss.com/file-access/default/theme/images/spotligh...](http://src="http://labs.jboss.com/file-access/default/theme/images/spotlight_jbossws1.jpg%22){kind=link}
17 years, 9 months
- 1
- 0
JBossWS SVN: r2119 - in trunk/jbossws-tests: src/main/java/org/jboss/test/ws/interop/microsoft and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-25 15:59:07 -0500 (Thu, 25 Jan 2007)
New Revision: 2119
Removed:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/
trunk/jbossws-tests/src/main/resources/interop/microsoft/security/
Modified:
trunk/jbossws-tests/ant-import/build-interop-jars.xml
Log:
Remove legacy interop code
Modified: trunk/jbossws-tests/ant-import/build-interop-jars.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-interop-jars.xml 2007-01-25 20:55:44 UTC (rev 2118)
+++ trunk/jbossws-tests/ant-import/build-interop-jars.xml 2007-01-25 20:59:07 UTC (rev 2119)
@@ -256,156 +256,6 @@
</fileset>
</war>
- <!-- wsa10 client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsa10-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/addressing/wsa10/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/addressing/wsa10/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/addressing/wsa10/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- wsaTestService.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-wsa10-service.war"
- webxml="${test.resources.dir}/interop/microsoft/addressing/wsaTestService/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/addressing/wsaTestService/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/addressing/wsaTestService/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/addressing/wsaTestService">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- wsa10 client se06-->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-wsa10_sep06-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- wsaTestService_sep06.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-wsa10-service_sep06.war"
- webxml="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- wsse10 sign client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsse10-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/security/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- wsse10Sign.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-wsse10Sign.war"
- webxml="${test.resources.dir}/interop/microsoft/security/wsse10/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/security/wsse10/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- <include name="jboss-web.xml"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/security/wsse10">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- wsse10Encrypt client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/security/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10Encrypt/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10Encrypt/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- wsse10Encrypt.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-wsse10Encrypt.war"
- webxml="${test.resources.dir}/interop/microsoft/security/wsse10Encrypt/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10Encrypt/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- <include name="jboss-web.xml"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/security/wsse10Encrypt">
- <include name="*.*"/>
- </fileset>
- </war>
-
<!-- mtom-utf8.war -->
<war warfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8.war"
webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF/web.xml">
17 years, 9 months
- 1
- 0
JBossWS SVN: r2118 - in trunk: build/ant-import and 67 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-25 15:55:44 -0500 (Thu, 25 Jan 2007)
New Revision: 2118
Added:
trunk/build/ant-import/build-hudson.xml
trunk/build/etc/jboss.sh
trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/
trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/AS-5.0/
trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
trunk/build/hudson/hudson-home/jobs/TC-5.5/
trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerClient.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerServer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Echo.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EchoResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/IPingService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/ObjectFactory.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Ping.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingService10.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/TestService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/package-info.java
trunk/jbossws-tests/src/main/resources/interop/wsse/
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/jboss-wsse-client.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-web.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-wsse-server.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Alice.cer
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Bob.cer
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.cer
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.pfx
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.jks
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.pfx
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/bob.pfx
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.cer
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.pfx
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.cer
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.pfx
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/wsse10.truststore
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/wsdl0.wsdl
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd0.xsd
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd1.xsd
trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd2.xsd
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/jboss-wsse-client.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-web.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-wsse-server.xml
trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt
Removed:
trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerInbound.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerOutbound.java
Modified:
trunk/build/ant-import/build-samples.xml
trunk/build/ant-import/build-setup.xml
trunk/build/ant-import/build-thirdparty.xml
trunk/build/ant.properties.example
trunk/build/build.xml
trunk/build/hudson/apache-tomcat/conf/server.xml
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml
trunk/build/version.properties
trunk/integration-jboss40/build.xml
trunk/integration-jboss42/build.xml
trunk/integration-jboss50/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerInbound.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerOutbound.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml
trunk/jbossws-core/src/main/resources/samples/ant.properties.example
trunk/jbossws-core/src/main/resources/samples/build.xml
trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml
trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml
trunk/jbossws-core/src/main/resources/samples/version.properties
trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
trunk/jbossws-tests/src/main/resources/common/config/jaxws-endpoint-config.xml
Log:
Added VFS root to UMD. Implemented missing ws-security parts for JAX-WS. Migrated interop security tests. Merged changes from branch 1.2.0 (basically pre/post handlers execution.).
Copied: trunk/build/ant-import/build-hudson.xml (from rev 2109, branches/jbossws-1.2.0/build/ant-import/build-hudson.xml)
===================================================================
--- trunk/build/ant-import/build-hudson.xml (rev 0)
+++ trunk/build/ant-import/build-hudson.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,124 @@
+<?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 default="main" basedir="../build" name="JBossWS-Hudson">
+
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+
+ <target name="init-hudson" depends="prepare">
+
+ <property name="hudson.tomcat" value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/>
+ <property name="hudson.home" value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/>
+ <echo/>
+ <echo message="hudson.root = ${hudson.root}"/>
+ <echo message="hudson.home = ${hudson.home}"/>
+ <echo/>
+
+ <available file="${hudson.root}" property="hudson.root.available"/>
+ <available file="${hudson.tomcat}" property="hudson.tomcat.available"/>
+ <fail message="Hudson root not available" unless="hudson.root.available"/>
+ </target>
+
+ <!--
+ Setup the Hudson Tomcat instance
+ -->
+ <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available">
+
+ <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${hudson.root}"/>
+ <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/>
+ <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/>
+ <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/>
+ <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/>
+
+ <!-- Configure Tomcat -->
+ <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
+ <copy todir="${hudson.tomcat}">
+ <fileset dir="${build.dir}/hudson/apache-tomcat">
+ <include name="**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ <filter token="hudson.port" value="${hudson.port}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!--
+ Setup the Hudson QA environment
+ -->
+ <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup"
+ description="Setup the Hudson QA environment">
+
+ <exec executable="basename" outputproperty="svn.basename">
+ <arg value="${svn.url}"/>
+ </exec>
+
+ <!-- Configure Hudson -->
+ <copy todir="${hudson.home}" overwrite="true">
+ <fileset dir="${build.dir}/hudson/hudson-home">
+ <include name="**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="version.id" value="${version.id}"/>
+ <filter token="svn.basename" value="${svn.basename}"/>
+ <filter token="svn.url" value="${svn.url}"/>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson setup sucessfuly *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment">
+
+ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true">
+ <arg line="stop"/>
+ </exec>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson stoped sucessfuly *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment">
+
+ <mkdir dir="${build.output.dir}"/>
+ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${build.output.dir}/hudson.log">
+ <arg line="start"/>
+ </exec>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson started sucessfuly *"/>
+ <echo message="* http://localhost:${hudson.port}/hudson *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+</project>
Modified: trunk/build/ant-import/build-samples.xml
===================================================================
--- trunk/build/ant-import/build-samples.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/ant-import/build-samples.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -36,6 +36,12 @@
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
+ <fileset dir="${core.output.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
<fileset dir="${jboss50.output.lib.dir}">
<include name="jbossws-jboss50-integration.jar"/>
</fileset>
@@ -264,19 +270,6 @@
<fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel" />
</copy>
- <!-- samples/wseventing -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/wseventing"/>
- </copy>
-
<!-- samples/wssecurity -->
<mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/java"/>
<mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/>
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/ant-import/build-setup.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -60,10 +60,6 @@
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
- <property name="hudson.root" value="${jbossws.hudson.root}/jbossws-hudson-${version.id}"/>
- <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/>
- <property name="hudson.home" value="${hudson.root}/hudson-home"/>
-
<available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
<available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/>
<available property="jboss40.available" file="${jboss40.client}/jboss-client.jar"/>
@@ -79,11 +75,19 @@
<target name="prepare">
+ <!-- get the svn url -->
+ <mkdir dir="${build.output.dir}"/>
+ <exec dir="${build.dir}/.." executable="svn" failonerror="true" output="${build.output.dir}/svn-info.xml">
+ <arg line="info"/>
+ <arg line="--xml"/>
+ </exec>
+ <xmlproperty file="${build.output.dir}/svn-info.xml"/>
+ <property name="svn.url" value="${info.entry.url}"/>
+
<echo message="jboss50.home = ${jboss50.home}"/>
<echo message="jboss42.home = ${jboss42.home}"/>
<echo message="jboss40.home = ${jboss40.home}"/>
<echo message="tomcat.home = ${tomcat.home}"/>
- <echo/>
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
@@ -102,7 +106,7 @@
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
-
+
</target>
</project>
\ No newline at end of file
Modified: trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- trunk/build/ant-import/build-thirdparty.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/ant-import/build-thirdparty.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -128,6 +128,18 @@
<path refid="core.classpath"/>
</path>
+ <!-- The compile classpath for jboss40 integration -->
+ <path id="jboss40.integration.classpath">
+ <pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
+ <pathelement location="${jboss40.lib}/jboss-system.jar"/>
+ <pathelement location="${jboss40.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <path refid="core.classpath"/>
+ </path>
+
<!-- The compile classpath for jboss42 integration -->
<path id="tomcat.integration.classpath">
<path refid="core.classpath"/>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/ant.properties.example 2007-01-25 20:55:44 UTC (rev 2118)
@@ -3,10 +3,6 @@
#
# $Id$
-# JBossWS Hudson Root
-#jbossws.hudson.root=/home/tdiesler/workspace
-jbossws.hudson.mail=jbossws-dev(a)lists.jboss.com
-
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
@@ -19,10 +15,49 @@
jboss.server.instance=default
# Optional Tomcat Home
-tomcat.home=/usr/java/tomcat
+#tomcat.home=/usr/java/tomcat
tomcat.manager.username=manager
tomcat.manager.password=manager
+<<<<<<< .working
+# Hudson QA Environment
+hudson.root=/home/tdiesler/workspac
+hudson.port=8180
+
+hudson.jdk15=/usr/java/jdk1.5
+hudson.jdk14=/usr/java/jdk1.4
+
+hudson.jboss50.build=jboss-5.0.0.Beta2
+hudson.jboss42.build=jboss-4.2.0.CR1
+hudson.jboss40.build=jboss-4.0.5.SP1
+
+hudson.jboss50.rev=HEAD
+hudson.jboss42.rev=HEAD
+hudson.jboss40.rev=HEAD
+
+hudson.mail.recipients=thomas.diesler(a)jboss.com
+hudson.smtp.host=pobox-2.corp.redhat.com
+
+=======
+# Hudson QA Environment
+hudson.root=/home/tdiesler/workspace
+hudson.port=8180
+
+hudson.jdk15=/usr/java/jdk1.5
+hudson.jdk14=/usr/java/jdk1.4
+
+hudson.jboss50.build=jboss-5.0.0.Beta2
+hudson.jboss42.build=jboss-4.2.0.CR1
+hudson.jboss40.build=jboss-4.0.5.SP1
+
+hudson.jboss50.rev=HEAD
+hudson.jboss42.rev=HEAD
+hudson.jboss40.rev=HEAD
+
+hudson.mail.recipients=thomas.diesler(a)jboss.com
+hudson.smtp.host=pobox-2.corp.redhat.com
+
+>>>>>>> .merge-rechts.r2111
# JBoss Repository
#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
jboss.repository=http://repository.jboss.com
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/build.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -17,6 +17,7 @@
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-samples.xml"/>
+ <import file="${basedir}/ant-import/build-hudson.xml"/>
<import file="${basedir}/../integration-jboss40/build.xml"/>
<import file="${basedir}/../integration-jboss42/build.xml"/>
<import file="${basedir}/../integration-jboss50/build.xml"/>
Copied: trunk/build/etc/jboss.sh (from rev 2109, branches/jbossws-1.2.0/build/etc/jboss.sh)
===================================================================
--- trunk/build/etc/jboss.sh (rev 0)
+++ trunk/build/etc/jboss.sh 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+PROGNAME=`basename $0`
+JBOSS_HOME="$1"
+CMD="$2"
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "$PROGNAME: $*"
+}
+
+if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then
+ warn "Cannot find: $JBOSS_HOME/bin/run.sh"
+ exit 1
+fi
+
+case "$CMD" in
+start)
+ chmod +x $JBOSS_HOME/bin/run.sh
+ $JBOSS_HOME/bin/run.sh > /dev/null &
+ sleep 20
+ ;;
+stop)
+ chmod +x $JBOSS_HOME/bin/shutdown.sh
+ $JBOSS_HOME/bin/shutdown.sh -S > /dev/null &
+ ;;
+restart)
+ $0 stop
+ $0 start
+ ;;
+*)
+ echo "usage: $0 jboss_instance (start|stop|restart|help)"
+esac
\ No newline at end of file
Modified: trunk/build/hudson/apache-tomcat/conf/server.xml
===================================================================
--- trunk/build/hudson/apache-tomcat/conf/server.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/hudson/apache-tomcat/conf/server.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -25,10 +25,11 @@
<Service name="Catalina">
<!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector port="8180" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" redirectPort="8443" acceptCount="100"
+ <Connector port="@hudson.port@" maxHttpHeaderSize="8192" maxThreads="150"
+ minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
connectionTimeout="20000" disableUploadTimeout="true"/>
-
<!-- Define the top level container in our container hierarchy -->
<Engine name="Catalina" defaultHost="localhost">
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/hudson/hudson-home/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson>
- <numExecutors>2</numExecutors>
+ <numExecutors>1</numExecutors>
<useSecurity>false</useSecurity>
<systemMessage><!--a href="http://labs.jboss.com/portal/jbossws">
<img src="http://labs.jboss.com/file-access/default/theme/images/spotligh... border=0/>
Modified: trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
===================================================================
--- trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.tasks.Mailer-DescriptorImpl>
- <defaultSuffix>openj.net</defaultSuffix>
- <hudsonUrl>http://localhost:8180/hudson/</hudsonUrl>
- <adminAddress>heiko(a)openj.net</adminAddress>
- <smtpHost>openj.net</smtpHost>
+ <defaultSuffix>jboss.com</defaultSuffix>
+ <hudsonUrl>http://localhost:@hudson.port@/hudson/</hudsonUrl>
+ <adminAddress>thomas.diesler(a)jboss.com</adminAddress>
+ <smtpHost>@hudson.smtp.host@</smtpHost>
</hudson.tasks.Mailer-DescriptorImpl>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -2,34 +2,51 @@
<project>
<builders class="vector">
<hudson.tasks.Shell>
- <command>cd Branch_4_0
-rm -f thirdparty/libraries.ent
-./build/build.sh clean
-./build/build.sh
+ <command>
+#
+# Module settings
+#
+MODULE=AS-4.0
+SVNBASE=Branch_4_0
#
-# patch
+# checkout with an explicit version
+#
+if [ -d "$SVNBASE" ]; then
+ svn up -r(a)hudson.jboss40.rev@ $SVNBASE
+else
+ svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE
+fi
+
#
-chmod +x build/output/jboss-4.0.5.SP1-ejb3/bin/*.sh</command>
+# build jboss
+#
+cd $SVNBASE
+rm -f thirdparty/libraries.ent
+./build/build.sh clean main
+
+#
+# build the testsuite
+#
+cd testsuite
+./build.sh main
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail.recipients@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
<buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>https://svn.jboss.org/repos/jbossas/branches/Branch_4_0</modules>
- <useUpdate>true</useUpdate>
- </scm>
+ <scm class="hudson.scm.NullSCM"/>
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>@hudson.home(a)/jobs/AS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3</description>
+ <description>Build AS-4.0</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14)
Deleted: trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=AS-4.0-jdk14
-SVNBASE=Branch_4_0
-
-#
-# checkout with an explicit version
-#
-if [ -d "$SVNBASE" ]; then
- svn up -r(a)hudson.jboss40.rev@ $SVNBASE
-else
- svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE
-fi
-
-export JAVA_HOME=(a)hudson.jdk14@
-
-#
-# build jboss
-#
-cd $SVNBASE
-rm -f thirdparty/libraries.ent
-./build/build.sh clean main
-
-#
-# build the testsuite
-#
-cd testsuite
-./build.sh main
- </command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build AS-4.0 with jdk-1.4</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-4.0-jdk14
+SVNBASE=Branch_4_0
+
+#
+# checkout with an explicit version
+#
+if [ -d "$SVNBASE" ]; then
+ svn up -r(a)hudson.jboss40.rev@ $SVNBASE
+else
+ svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE
+fi
+
+export JAVA_HOME=(a)hudson.jdk14@
+
+#
+# build jboss
+#
+cd $SVNBASE
+rm -f thirdparty/libraries.ent
+./build/build.sh clean main
+
+#
+# build the testsuite
+#
+cd testsuite
+./build.sh main
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build AS-4.0 with jdk-1.4</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -2,34 +2,51 @@
<project>
<builders class="vector">
<hudson.tasks.Shell>
- <command>cd Branch_4_2
+ <command>
+#
+# Module settings
+#
+MODULE=AS-4.2
+SVNBASE=Branch_4_2
+
+#
+# checkout with an explicit version
+#
+if [ -d "$SVNBASE" ]; then
+ svn up -r(a)hudson.jboss42.rev@ $SVNBASE
+else
+ svn co -r(a)hudson.jboss42.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE
+fi
+
+#
+# build jboss
+#
+cd $SVNBASE
rm -f thirdparty/libraries.ent
-./build/build.sh clean
-./build/build.sh
-
+./build/build.sh clean main
+
#
-# patch
-#
-chmod +x build/output/jboss-4.2.0.CR1-ejb3/bin/*.sh</command>
+# build the testsuite
+#
+cd testsuite
+./build.sh main
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail.recipients@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
<buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>https://svn.jboss.org/repos/jbossas/branches/Branch_4_2</modules>
- <useUpdate>true</useUpdate>
- </scm>
+ <scm class="hudson.scm.NullSCM"/>
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>@hudson.home(a)/jobs/AS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3</description>
+ <description>Build AS-4.2</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: trunk/build/hudson/hudson-home/jobs/AS-5.0 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0)
Deleted: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=AS-5.0
-SVNBASE=trunk
-
-#
-# checkout with an explicit version
-#
-if [ -d "$SVNBASE" ]; then
- svn up -r(a)hudson.jboss50.rev@ $SVNBASE
-else
- svn co -r(a)hudson.jboss50.rev@ https://svn.jboss.org/repos/jbossas/$SVNBASE
-fi
-
-#
-# build jboss
-#
-cd $SVNBASE
-rm -f thirdparty/libraries.ent
-./build/build.sh clean main
-
-#
-# build the testsuite
-#
-cd testsuite
-./build.sh main
- </command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build AS-5.0</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-5.0
+SVNBASE=trunk
+
+#
+# checkout with an explicit version
+#
+if [ -d "$SVNBASE" ]; then
+ svn up -r(a)hudson.jboss50.rev@ $SVNBASE
+else
+ svn co -r(a)hudson.jboss50.rev@ https://svn.jboss.org/repos/jbossas/$SVNBASE
+fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+rm -f thirdparty/libraries.ent
+./build/build.sh clean main
+
+#
+# build the testsuite
+#
+cd testsuite
+./build.sh main
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build AS-5.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0)
Deleted: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBAS-Tests-AS-4.0
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-cd $SVNBASEDIR/build
-ant $ENVIRONMENT deploy-jboss40
-
-#
-# build the testsuite
-#
-cd $JBOSS_INSTANCE/../../../testsuite
-./build.sh clean main
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# copy the test reports
-#
-rm -rf $WORKSPACE/test-reports
-mkdir $WORKSPACE/test-reports
-cp -r ./output/reports/*.xml $WORKSPACE/test-reports
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </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>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,174 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-4.0
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss40
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -f $WORKSPACE/test-reports/*
+cp ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-4.0
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss40
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14)
Deleted: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,89 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBAS-Tests-AS-4.0-jdk14
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-cd $SVNBASEDIR/build
-ant $ENVIRONMENT deploy-jboss40-jdk14
-
-export JAVA_HOME=(a)hudson.jdk14@
-
-#
-# build the testsuite
-#
-cd $JBOSS_INSTANCE/../../../testsuite
-./build.sh clean main
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# copy the test reports
-#
-rm -rf $WORKSPACE/test-reports
-mkdir $WORKSPACE/test-reports
-cp -r ./output/reports/*.xml $WORKSPACE/test-reports
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </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>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,178 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-4.0-jdk14
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss40-jdk14
+
+export JAVA_HOME=(a)hudson.jdk14@
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -f $WORKSPACE/test-reports/*
+cp ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-4.0-jdk14
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss40-jdk14
+
+export JAVA_HOME=(a)hudson.jdk14@
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2)
Deleted: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBAS-Tests-AS-4.2
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-cd $SVNBASEDIR/build
-ant $ENVIRONMENT deploy-jboss42
-
-#
-# build the testsuite
-#
-cd $JBOSS_INSTANCE/../../../testsuite
-./build.sh clean main
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# copy the test reports
-#
-rm -rf $WORKSPACE/test-reports
-mkdir $WORKSPACE/test-reports
-cp -r ./output/reports/*.xml $WORKSPACE/test-reports
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </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>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Run the AS-4.2 webservice testsuite agains jbossws-(a)version.id@</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,174 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-4.2
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss42
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -f $WORKSPACE/test-reports/*
+cp ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-4.2 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-4.2
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss42
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-4.2 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0)
Deleted: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBAS-Tests-AS-5.0
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-cd $SVNBASEDIR/build
-ant $ENVIRONMENT deploy-jboss50
-
-#
-# build the testsuite
-#
-cd $JBOSS_INSTANCE/../../../testsuite
-./build.sh clean main
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# copy the test reports
-#
-rm -rf $WORKSPACE/test-reports
-mkdir $WORKSPACE/test-reports
-cp -r ./output/reports/*.xml $WORKSPACE/test-reports
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </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>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Run the AS-5.0 webservice testsuite agains jbossws-(a)version.id@</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,174 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-5.0
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss50
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -f $WORKSPACE/test-reports/*
+cp ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-5.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBAS-Tests-AS-5.0
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $SVNBASEDIR/build
+ant $ENVIRONMENT deploy-jboss50
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh clean main
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </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>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the AS-5.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,79 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Samples-AS-4.0
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
-
-JBOSS_INSTANCE=$JBOSS40_INSTANCE
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build jbossws samples
-#
-ant $ENVIRONMENT clean deploy-jboss40 build-samples
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute samples
-#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.0</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,159 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-AS-4.0
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+
+JBOSS_INSTANCE=$JBOSS40_INSTANCE
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build jbossws samples
+#
+ant $ENVIRONMENT clean build-samples
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute samples
+#
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-AS-4.0
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+
+JBOSS_INSTANCE=$JBOSS40_INSTANCE
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build jbossws samples
+#
+ant $ENVIRONMENT clean deploy-jboss40 build-samples
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute samples
+#
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,79 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Samples-AS-4.2
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
-
-JBOSS_INSTANCE=$JBOSS42_INSTANCE
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build jbossws samples
-#
-ant $ENVIRONMENT clean deploy-jboss42 build-samples
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute samples
-#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,159 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-AS-4.2
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+
+JBOSS_INSTANCE=$JBOSS42_INSTANCE
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build jbossws samples
+#
+ant $ENVIRONMENT clean build-samples
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute samples
+#
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-AS-4.2
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+
+JBOSS_INSTANCE=$JBOSS42_INSTANCE
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build jbossws samples
+#
+ant $ENVIRONMENT clean deploy-jboss42 build-samples
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute samples
+#
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,79 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Samples-AS-5.0
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
-
-JBOSS_INSTANCE=$JBOSS50_INSTANCE
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build jbossws samples
-#
-ant $ENVIRONMENT clean deploy-jboss50 build-samples
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute samples
-#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,159 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-AS-5.0
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+
+JBOSS_INSTANCE=$JBOSS50_INSTANCE
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build jbossws samples
+#
+ant $ENVIRONMENT clean build-samples
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute samples
+#
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-AS-5.0
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+
+JBOSS_INSTANCE=$JBOSS50_INSTANCE
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build jbossws samples
+#
+ant $ENVIRONMENT clean deploy-jboss50 build-samples
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute samples
+#
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,77 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Samples-TC-5.5
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=tomcat -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop tomcat
-#
-$TOMCAT_INSTANCE/bin/catalina.sh stop
-
-#
-# build jbossws samples
-#
-ant $ENVIRONMENT clean deploy-tomcat build-samples
-
-#
-# start tomcat
-#
-$TOMCAT_INSTANCE/bin/catalina.sh start
-
-#
-# execute samples
-#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop tomcat
-#
-$TOMCAT_INSTANCE/bin/catalina.sh stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against TC-5.5</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,151 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-TC-5.5
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=tomcat -Dtomcat.home=$TOMCAT_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop tomcat
+#
+$TOMCAT_INSTANCE/bin/catalina.sh stop
+
+#
+# deploy to jboss
+#
+ant $ENVIRONMENT clean deploy-tomcat
+
+#
+# start jbossas
+#
+$TOMCAT_INSTANCE/bin/catalina.sh start
+sleep 10
+
+#
+# execute tests
+#
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT tests-samples
+
+#
+# stop tomcat
+#
+$TOMCAT_INSTANCE/bin/catalina.sh stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against TC-5.5</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Samples-TC-5.5
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=tomcat -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop tomcat
+#
+$TOMCAT_INSTANCE/bin/catalina.sh stop
+
+#
+# build jbossws samples
+#
+ant $ENVIRONMENT clean deploy-tomcat build-samples
+
+#
+# start tomcat
+#
+$TOMCAT_INSTANCE/bin/catalina.sh start
+
+#
+# execute samples
+#
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop tomcat
+#
+$TOMCAT_INSTANCE/bin/catalina.sh stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against TC-5.5</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,74 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Tests-AS-4.0
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-ant $ENVIRONMENT clean deploy-jboss40
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.0</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Tests-AS-4.0
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+ant $ENVIRONMENT clean deploy-jboss40
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Tests-AS-4.0-jdk14
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-ant $ENVIRONMENT clean deploy-jboss40-jdk14
-
-export JAVA_HOME=(a)hudson.jdk14@
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.0 with JDK1.4</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,76 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Tests-AS-4.0-jdk14
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+ant $ENVIRONMENT clean deploy-jboss40-jdk14
+
+export JAVA_HOME=(a)hudson.jdk14@
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.0 with JDK1.4</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,74 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Tests-AS-4.2
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-ant $ENVIRONMENT clean deploy-jboss42
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Tests-AS-4.2
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+ant $ENVIRONMENT clean deploy-jboss42
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,74 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Tests-AS-5.0
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-ant $ENVIRONMENT clean deploy-jboss50
-
-#
-# start jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
-
-#
-# execute tests
-#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Tests-AS-5.0
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+ant $ENVIRONMENT clean deploy-jboss50
+
+#
+# start jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5)
Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,75 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-Tests-TC-5.5
-SVNBASENAME=(a)svn.basename@
-WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=tomcat -Dtomcat.home=$TOMCAT_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $SVNBASEDIR/build
-cp ant.properties.example ant.properties
-
-#
-# stop tomcat
-#
-$TOMCAT_INSTANCE/bin/catalina.sh stop
-
-#
-# deploy to jboss
-#
-ant $ENVIRONMENT clean deploy-tomcat
-
-#
-# start jbossas
-#
-$TOMCAT_INSTANCE/bin/catalina.sh start
-sleep 10
-
-#
-# execute tests
-#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests-samples 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop tomcat
-#
-$TOMCAT_INSTANCE/bin/catalina.sh stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <modules>@svn.url@</modules>
- <useUpdate>true</useUpdate>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against TC-5.5</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Tests-TC-5.5
+SVNBASENAME=(a)svn.basename@
+WORKSPACE=`pwd`
+SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
+ENVIRONMENT="-Djbossws.integration.target=tomcat -Dtomcat.home=$TOMCAT_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
+cp ant.properties.example ant.properties
+
+#
+# stop tomcat
+#
+$TOMCAT_INSTANCE/bin/catalina.sh stop
+
+#
+# deploy to jboss
+#
+ant $ENVIRONMENT clean deploy-tomcat
+
+#
+# start jbossas
+#
+$TOMCAT_INSTANCE/bin/catalina.sh start
+sleep 10
+
+#
+# execute tests
+#
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT clean tests-samples 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop tomcat
+#
+$TOMCAT_INSTANCE/bin/catalina.sh stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>@svn.url@</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against TC-5.5</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>
- AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, TC-5.5
- </childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build the relase matrix target container</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>
+ AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, TC-5.5
+ </childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build the relase matrix target container</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2)
Deleted: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>
- JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5,
- JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14,
- JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5
- </childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Run the entire JBossWS relase matrix</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,47 @@
+<<<<<<< .working
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>
+ JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5,
+ JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14,
+ JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-AS-4.0-jdk14, JBWS-Samples-TC-5.5
+ </childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the entire JBossWS relase matrix</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>=======
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>
+ JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5,
+ JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14,
+ JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5
+ </childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Run the entire JBossWS relase matrix</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>>>>>>>> .merge-rechts.r2111
Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5 (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5)
Deleted: trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 14:41:01 UTC (rev 2109)
+++ trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,40 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=TC-5.5
-HUDSON_HOME=(a)hudson.home@
-WORKSPACE=`pwd`
-
-#
-# copy tomcat installation
-#
-cp -r $HUDSON_HOME/../apache-tomcat $WORKSPACE
-rm -rf $WORKSPACE/apache-tomcat/webapps/hudson.war
-rm -rf $WORKSPACE/apache-tomcat/work
-rm -rf $WORKSPACE/apache-tomcat/temp
- </command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Setup TC-5.5</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml (from rev 2109, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=TC-5.5
+HUDSON_HOME=(a)hudson.home@
+WORKSPACE=`pwd`
+
+#
+# copy tomcat installation
+#
+cp -r $HUDSON_HOME/../apache-tomcat $WORKSPACE
+rm -rf $WORKSPACE/apache-tomcat/webapps/hudson.war
+rm -rf $WORKSPACE/apache-tomcat/work
+rm -rf $WORKSPACE/apache-tomcat/temp
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Setup TC-5.5</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/build/version.properties 2007-01-25 20:55:44 UTC (rev 2118)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.2.0.CR3
-repository.id=snapshot
+version.id=1.2.0.GA
+repository.id=1.2.0.GA
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/integration-jboss40/build.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -36,6 +36,7 @@
<target name="jboss40-init" depends="prepare, thirdparty">
<fail message="Not available: ${jboss40.client}/jboss-client.jar" unless="jboss40.available"/>
+ <available file="${jboss40.client}/jboss-ejb3-client.jar" property="jboss40.ejb3.available"/>
</target>
<!-- ================================================================== -->
@@ -50,19 +51,37 @@
| documentation compiles.
-->
- <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-etc" description="Compile all source files."/>
+ <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc"
+ description="Compile all source files."/>
<!-- Compile integration java sources -->
<target name="jboss40-compile-classes" depends="jboss40-init,core-compile">
<mkdir dir="${jboss40.output.classes.dir}"/>
- <javac srcdir="${jboss40.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}"
+ encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/jboss40/**"/>
+ <include name="org/jboss/ws/integration/jboss42/**"/>
+ <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
+ <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
+ <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
<classpath refid="jboss40.integration.classpath"/>
<classpath path="${core.output.classes14.dir}"/>
<classpath path="${core.output.classes.dir}"/>
</javac>
</target>
+ <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile" if="jboss40.ejb3.available">
+ <mkdir dir="${jboss40.output.classes.dir}"/>
+ <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}"
+ encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
+ <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
+ <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
+ <classpath refid="jboss40.integration.classpath"/>
+ <classpath path="${core.output.classes14.dir}"/>
+ <classpath path="${core.output.classes.dir}"/>
+ </javac>
+ </target>
<!-- Compile etc files (manifests and such) -->
<target name="jboss40-compile-etc" depends="jboss40-init">
@@ -92,12 +111,12 @@
<pathelement location="${thirdparty.dir}/jbossretro.jar"/>
<pathelement location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
<pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement path="${jboss42.output.classes.dir}"/>
+ <pathelement path="${jboss40.output.classes.dir}"/>
<pathelement path="${core.dir}/output/classes"/>
</classpath>
<classpath refid="core.classpath"/>
- <classpath refid="jboss42.integration.classpath"/>
- <src path="${jboss42.output.classes.dir}"/>
+ <classpath refid="jboss40.integration.classpath"/>
+ <src path="${jboss40.output.classes.dir}"/>
<src path="${core.dir}/output/classes"/>
</retro>
</target>
@@ -115,12 +134,12 @@
<!--
| Build all jar files.
-->
- <target name="jboss40-module-jars" depends="core-jars,jboss42-jars">
+ <target name="jboss40-module-jars" depends="core-jars">
<!-- Build jbossws-jboss40-integration.jar -->
<mkdir dir="${jboss40.output.lib.dir}"/>
<jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf">
- <fileset dir="${jboss42.output.classes.dir}">
+ <fileset dir="${jboss40.output.classes.dir}">
<include name="org/jboss/ws/integration/jboss42/**"/>
</fileset>
<metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/>
@@ -302,6 +321,15 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/>
+ <!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
+ <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" 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>
</target>
<!-- Deploy jbossws to jboss40 jdk1.4 -->
@@ -332,6 +360,16 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
<unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/>
+ <!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
+ <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true">
+ <fileset dir="${jboss40.output.lib.dir}">
+ <include name="jbossws14-client.jar"/>
+ </fileset>
+ <fileset dir="${core.output.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
Modified: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/integration-jboss42/build.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -155,8 +155,15 @@
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/>
- <!-- The JBossAS testsuite references jbossws-client.jar from thirdparty
- <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/-->
+ <!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
+ <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" 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>
</target>
<!-- ================================================================== -->
Modified: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/integration-jboss50/build.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -164,8 +164,15 @@
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <!-- The JBossAS testsuite references jbossws-client.jar from thirdparty
- <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/-->
+ <!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
+ <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" 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>
</target>
<!-- ================================================================== -->
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -54,12 +54,7 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
-import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.ParameterMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.umdm.*;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
@@ -190,9 +185,13 @@
{
if (epMetaData == null)
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
- wsMetaData.setClassLoader(Thread.currentThread().getContextClassLoader());
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ DefaultFileAdapter vfsRoot = new DefaultFileAdapter();
+ vfsRoot.setLoader(contextClassLoader);
+ UnifiedMetaData wsMetaData = new UnifiedMetaData( vfsRoot );
+ wsMetaData.setClassLoader(contextClassLoader);
+
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, new QName(Constants.NS_JBOSSWS_URI, "AnonymousService"));
wsMetaData.addService(serviceMetaData);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -47,12 +47,7 @@
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.umdm.*;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
@@ -88,7 +83,7 @@
*/
ServiceImpl(QName serviceName)
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(new DefaultFileAdapter());
serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
handlerRegistry = new HandlerRegistryImpl(serviceMetaData);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -24,30 +24,6 @@
// $Id$
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.rmi.Remote;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.Service;
-
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
@@ -61,6 +37,20 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import javax.naming.*;
+import javax.naming.spi.ObjectFactory;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.Service;
+import java.io.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.rmi.Remote;
+import java.util.Hashtable;
+import java.util.List;
+
/**
* This ServiceObjectFactory reconstructs a javax.xml.rpc.Service
* for a given WSDL when the webservice client does a JNDI lookup
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -75,10 +75,7 @@
*/
public void generate(ParameterMetaData pmd)
{
- // If a wrapper already present, no need to generate one
String wrapperName = pmd.getJavaTypeName();
- if (JavaUtils.isLoaded(wrapperName, loader))
- return;
List<WrappedParameter> wrappedParameters = pmd.getWrappedParameters();
OperationMetaData opMetaData = pmd.getOperationMetaData();
@@ -119,11 +116,7 @@
public void generate(FaultMetaData fmd)
{
- // If a wrapper already present, no need to generate one
String faultBeanName = fmd.getFaultBeanName();
- if (faultBeanName == null || JavaUtils.isLoaded(faultBeanName, loader))
- return;
-
log.debug("Generating fault bean: " + faultBeanName);
QName xmlType = fmd.getXmlType();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -38,5 +38,7 @@
*/
public interface BindingExt extends Binding
{
- public List<Handler> getHandlerChain(HandlerType handlerType);
+ List<Handler> getHandlerChain(HandlerType handlerType);
+
+ void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -64,16 +64,40 @@
return Collections.unmodifiableList(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType)
+ {
+ if (handlerType == HandlerType.PRE || handlerType == HandlerType.ALL)
+ {
+ preHandlerChain.clear();
+ preHandlerChain.addAll(handlerChain);
+ }
+
+ if (handlerType == HandlerType.ENDPOINT || handlerType == HandlerType.ALL)
+ {
+ jaxwsHandlerChain.clear();
+ jaxwsHandlerChain.addAll(handlerChain);
+ }
+
+ if (handlerType == HandlerType.POST || handlerType == HandlerType.ALL)
+ {
+ postHandlerChain.clear();
+ postHandlerChain.addAll(handlerChain);
+ }
+ }
+
public List<Handler> getHandlerChain()
{
log.debug("getHandlerChain: " + jaxwsHandlerChain);
- return jaxwsHandlerChain;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.addAll(jaxwsHandlerChain);
+ return handlerChain;
}
public void setHandlerChain(List<Handler> handlerChain)
{
log.debug("setHandlerChain: " + handlerChain);
- this.jaxwsHandlerChain = handlerChain;
+ jaxwsHandlerChain.clear();
+ jaxwsHandlerChain.addAll(handlerChain);
}
public String getBindingID()
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -89,6 +89,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
public String getBindingID()
{
throw new NotImplementedException();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -152,6 +152,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
private void handleException(Exception ex) throws BindingException
{
if (ex instanceof RuntimeException)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -167,6 +167,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
private void handleException(Exception ex) throws BindingException
{
if (ex instanceof RuntimeException)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -96,6 +96,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
public SOAPMessage createFaultMessageFromException(Exception ex)
{
return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -105,6 +105,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
public SOAPMessage createFaultMessageFromException(Exception ex)
{
return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -23,20 +23,11 @@
// $Id$
-import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.CommonBindingProvider;
-import org.jboss.ws.core.CommonClient;
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxws.binding.BindingExt;
-import org.jboss.ws.core.jaxws.binding.BindingProviderImpl;
-import org.jboss.ws.core.jaxws.handler.*;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.metadata.config.Configurable;
-import org.jboss.ws.metadata.config.ConfigurationProvider;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
import javax.xml.namespace.QName;
import javax.xml.ws.Binding;
@@ -50,11 +41,26 @@
import javax.xml.ws.http.HTTPException;
import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.soap.SOAPFaultException;
-import java.rmi.RemoteException;
-import java.util.List;
-import java.util.Map;
-import java.util.Observable;
+import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.CommonBindingProvider;
+import org.jboss.ws.core.CommonClient;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.jaxws.binding.BindingExt;
+import org.jboss.ws.core.jaxws.binding.BindingProviderImpl;
+import org.jboss.ws.core.jaxws.handler.HandlerChainExecutor;
+import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl;
+import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
+import org.jboss.ws.core.jaxws.handler.PortInfoImpl;
+import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.metadata.config.Configurable;
+import org.jboss.ws.metadata.config.ConfigurationProvider;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.OperationMetaData;
+import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+
/**
* Provides support for the dynamic invocation of a service endpoint.
*
@@ -90,24 +96,26 @@
*/
private void resetCreateBindingHandlerChain()
{
+ BindingExt binding = (BindingExt)getBindingProvider().getBinding();
+ PortInfoImpl portInfo = new PortInfoImpl(epMetaData);
+
if (handlerResolver instanceof HandlerResolverImpl)
{
HandlerResolverImpl impl = (HandlerResolverImpl)handlerResolver;
impl.initHandlerChain(epMetaData, HandlerType.PRE);
impl.initHandlerChain(epMetaData, HandlerType.ENDPOINT);
impl.initHandlerChain(epMetaData, HandlerType.POST);
+
+ List<Handler> preChain = impl.getHandlerChain(portInfo, HandlerType.PRE);
+ binding.setHandlerChain(preChain, HandlerType.PRE);
+ List<Handler> postChain = impl.getHandlerChain(portInfo, HandlerType.POST);
+ binding.setHandlerChain(postChain, HandlerType.POST);
}
- Binding binding = getBindingProvider().getBinding();
if (handlerResolver != null)
{
- PortInfoImpl portInfo = new PortInfoImpl(epMetaData);
- List<Handler> handlerChain = binding.getHandlerChain();
- handlerChain.clear();
- for (Handler handler : handlerResolver.getHandlerChain(portInfo))
- {
- handlerChain.add(handler);
- }
+ List<Handler> epChain = handlerResolver.getHandlerChain(portInfo);
+ binding.setHandlerChain(epChain);
}
}
@@ -116,8 +124,9 @@
* @param observable
* @param object
*/
- public void update(Observable observable, Object object) {
- log.debug("Configuration change event received. Reconfigure handler chain: "+object);
+ public void update(Observable observable, Object object)
+ {
+ log.debug("Configuration change event received. Reconfigure handler chain: " + object);
// reconfigure endpoint meta data handler information from config
((ConfigurationProvider)epMetaData).configure(epMetaData);
@@ -198,7 +207,8 @@
}
}
- protected CommonMessageContext processPivot(CommonMessageContext requestContext) {
+ protected CommonMessageContext processPivot(CommonMessageContext requestContext)
+ {
log.debug("Begin response processing");
// remove existing context
@@ -316,6 +326,6 @@
public void setConfigName(String configName)
{
ConfigurationProvider configProvider = (ConfigurationProvider)getEndpointMetaData();
- configProvider.setConfigName(configName);
+ configProvider.setConfigName(configName);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -38,7 +38,8 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
-/** Delegates to JAXWS handlers
+/**
+ * Delegates to JAXWS handlers
*
* @author Thomas.Diesler(a)jboss.org
* @since 19-Jan-2005
@@ -47,15 +48,8 @@
{
// provide logging
private static Logger log = Logger.getLogger(HandlerDelegateJAXWS.class);
+ private HandlerResolverImpl resolver = new HandlerResolverImpl();
- private HandlerResolverImpl preHandlers = new HandlerResolverImpl();
- private HandlerResolverImpl endpointHandlers = new HandlerResolverImpl();
- private HandlerResolverImpl postHandlers = new HandlerResolverImpl();
-
- public HandlerDelegateJAXWS(Binding binding)
- {
- }
-
public boolean callRequestHandlerChain(ServiceEndpointInfo seInfo, HandlerType type)
{
log.debug("callRequestHandlerChain: " + type);
@@ -65,10 +59,7 @@
// Initialize the handler chain
if (epMetaData.isHandlersInitialized() == false)
{
- initHandlerChain(epMetaData, HandlerType.PRE);
- initHandlerChain(epMetaData, HandlerType.ENDPOINT);
- initHandlerChain(epMetaData, HandlerType.POST);
- epMetaData.setHandlersInitialized(true);
+ initResolverChain(epMetaData);
}
List<Handler> handlerChain = getHandlerChain(epMetaData, type);
@@ -99,38 +90,14 @@
private List<Handler> getHandlerChain(EndpointMetaData epMetaData, HandlerType type)
{
PortInfo info = getPortInfo(epMetaData);
-
- List<Handler> handlerChain = null;
- if (type == HandlerType.PRE)
- {
- handlerChain = preHandlers.getHandlerChain(info);
- }
- else if (type == HandlerType.ENDPOINT)
- {
- handlerChain = endpointHandlers.getHandlerChain(info);
- }
- else if (type == HandlerType.POST)
- {
- handlerChain = postHandlers.getHandlerChain(info);
- }
- return handlerChain;
+ return resolver.getHandlerChain(info, type);
}
- private void initHandlerChain(EndpointMetaData epMetaData, HandlerType type)
+ private void initResolverChain(EndpointMetaData epMetaData)
{
- if (type == HandlerType.PRE)
- {
- preHandlers.initHandlerChain(epMetaData, type);
- }
- else if (type == HandlerType.ENDPOINT)
- {
- endpointHandlers.initHandlerChain(epMetaData, type);
- }
- else if (type == HandlerType.POST)
- {
- postHandlers.initHandlerChain(epMetaData, type);
- }
-
+ resolver.initHandlerChain(epMetaData, HandlerType.PRE);
+ resolver.initHandlerChain(epMetaData, HandlerType.ENDPOINT);
+ resolver.initHandlerChain(epMetaData, HandlerType.POST);
}
private PortInfo getPortInfo(EndpointMetaData epMetaData)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -63,17 +63,26 @@
{
private static Logger log = Logger.getLogger(HandlerResolverImpl.class);
- private Map<PortInfo, List<Handler>> handlerMap = new HashMap<PortInfo, List<Handler>>();
+ private Map<PortInfo, List<Handler>> preHandlers = new HashMap<PortInfo, List<Handler>>();
+ private Map<PortInfo, List<Handler>> jaxwsHandlers = new HashMap<PortInfo, List<Handler>>();
+ private Map<PortInfo, List<Handler>> postHandlers = new HashMap<PortInfo, List<Handler>>();
public List<Handler> getHandlerChain(PortInfo info)
{
- log.debug("getHandlerChain: " + info);
+ return getHandlerChain(info, HandlerType.ENDPOINT);
+ }
+
+ public List<Handler> getHandlerChain(PortInfo info, HandlerType type)
+ {
+ log.debug("getHandlerChain: [type=" + type + ",info=" + info + "]");
List<Handler> unsortedChain = new ArrayList<Handler>();
String bindingID = info.getBindingID();
QName serviceName = info.getServiceName();
QName portName = info.getPortName();
+
+ Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type);
if (bindingID != null)
{
@@ -133,7 +142,9 @@
log.debug("initHandlerChain: " + type);
// clear all exisisting handler to avoid double registration
- log.debug("Clear handler map: " + handlerMap);
+ log.debug("Clear handler map: " + jaxwsHandlers);
+ Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type);
+ handlerMap.clear();
for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(type))
{
@@ -158,7 +169,7 @@
List<PortInfo> infos = getPortInfos(epMetaData, jaxwsMetaData);
for (PortInfo info : infos)
{
- addHandler(info, handler);
+ addHandler(info, handler, type);
}
}
catch (RuntimeException rte)
@@ -273,10 +284,11 @@
return infos;
}
- public boolean addHandler(PortInfo info, Handler handler)
+ private boolean addHandler(PortInfo info, Handler handler, HandlerType type)
{
log.debug("addHandler: " + info + ":" + handler);
+ Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type);
List<Handler> handlerList = handlerMap.get(info);
if (handlerList == null)
{
@@ -286,4 +298,16 @@
return true;
}
+
+ private Map<PortInfo, List<Handler>> getHandlerMap(HandlerType type)
+ {
+ Map<PortInfo, List<Handler>> handlerMap = null;
+ if (type == HandlerType.PRE)
+ handlerMap = preHandlers;
+ else if (type == HandlerType.ENDPOINT)
+ handlerMap = jaxwsHandlers;
+ else if (type == HandlerType.POST)
+ handlerMap = postHandlers;
+ return handlerMap;
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -48,6 +48,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
import org.jboss.ws.core.StubExt;
+import org.jboss.ws.core.server.UnifiedVirtualFile;
import org.jboss.ws.core.jaxws.client.ClientImpl;
import org.jboss.ws.core.jaxws.client.ClientProxy;
import org.jboss.ws.core.jaxws.client.DispatchImpl;
@@ -57,10 +58,7 @@
import org.jboss.ws.core.jaxws.client.UnifiedServiceRef;
import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl;
import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder;
-import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.umdm.*;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
/**
@@ -93,21 +91,29 @@
public ServiceDelegateImpl(URL wsdlURL, QName serviceName)
{
+ usRef = ServiceObjectFactory.getUnifiedServiceRefAssociation();
+
+ UnifiedVirtualFile vfsRoot;
+ if(usRef!=null)
+ vfsRoot = usRef.getRootFile();
+ else
+ vfsRoot = new DefaultFileAdapter();
+
if (wsdlURL != null)
{
JAXWSClientMetaDataBuilder builder = new JAXWSClientMetaDataBuilder();
- serviceMetaData = builder.buildMetaData(serviceName, wsdlURL);
+ serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, vfsRoot);
}
else
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
}
// If this Service was constructed through the ServiceObjectFactory
// this thread local association should be available
- usRef = ServiceObjectFactory.getUnifiedServiceRefAssociation();
+
if (usRef != null)
{
serviceMetaData.setServiceRefName(usRef.getServiceRefName());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -77,8 +77,7 @@
else
{
bindingProvider = new BindingProviderImpl(sepMetaData);
- Binding binding = ((BindingProvider)bindingProvider).getBinding();
- handlerDelegate = new HandlerDelegateJAXWS(binding);
+ handlerDelegate = new HandlerDelegateJAXWS();
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -520,20 +520,6 @@
return c + source.substring(1);
}
- public static boolean isLoaded(String className, ClassLoader loader)
- {
- try
- {
- loadJavaType(className, loader);
- }
- catch (ClassNotFoundException e)
- {
- return false;
- }
-
- return true;
- }
-
public static String getPackageName(Class<?> clazz)
{
String fullName = clazz.getName();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -23,17 +23,22 @@
// $Id$
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.soap.SOAPException;
-
import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
+import org.jboss.ws.core.server.UnifiedVirtualFile;
import org.jboss.ws.extensions.security.WSSecurityDispatcher;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.soap.SOAPException;
+import java.io.IOException;
+
/**
* An abstract JAXRPC handler that delegates to the WSSecurityDispatcher
*
@@ -44,7 +49,7 @@
{
// provide logging
private static Logger log = Logger.getLogger(WSSecurityHandler.class);
-
+
public QName[] getHeaders()
{
return null;
@@ -84,13 +89,44 @@
return true;
}
+ /**
+ * Load security config from vfsRoot
+ * @param msgContext
+ */
private WSSecurityConfiguration getSecurityConfiguration(MessageContext msgContext)
{
EndpointMetaData epMetaData = ((SOAPMessageContextJAXRPC)msgContext).getEndpointMetaData();
- WSSecurityConfiguration securityConfiguration = epMetaData.getServiceMetaData().getSecurityConfiguration();
- if (securityConfiguration == null)
- log.warn("Cannot obtain security configuration");
-
- return securityConfiguration;
+ ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData();
+
+ if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory
+ {
+ UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getVfsRoot();
+ boolean successful = false;
+
+ WSSecurityConfiguration config = null;
+
+ try
+ {
+ WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance();
+ config = wsseConfFactory.createConfiguration(vfsRoot, getConfigResourceName());
+ if(config!=null) successful = true;
+
+ }
+ catch (IOException e)
+ {
+ successful = false;
+ }
+
+ if(!successful)
+ throw new WSException("Cannot obtain security config: " +getConfigResourceName());
+
+ // it's required further down the processing chain
+ serviceMetaData.setSecurityConfiguration(config);
+ }
+
+ return serviceMetaData.getSecurityConfiguration();
+
}
+
+ protected abstract String getConfigResourceName();
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerInbound.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerInbound.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerInbound.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -23,6 +23,8 @@
// $Id$
+import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
+
import javax.xml.rpc.handler.MessageContext;
@@ -44,4 +46,8 @@
{
return handleOutboundSecurity(msgContext);
}
+
+ protected String getConfigResourceName() {
+ return WSSecurityOMFactory.SERVER_RESOURCE_NAME;
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerOutbound.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerOutbound.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandlerOutbound.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -23,6 +23,8 @@
// $Id$
+import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
+
import javax.xml.rpc.handler.MessageContext;
@@ -43,4 +45,8 @@
{
return handleInboundSecurity(msgContext);
}
+
+ protected String getConfigResourceName() {
+ return WSSecurityOMFactory.CLIENT_RESOURCE_NAME;
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -23,16 +23,21 @@
// $Id$
-import javax.xml.soap.SOAPException;
-import javax.xml.ws.handler.MessageContext;
-
import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
+import org.jboss.ws.core.server.UnifiedVirtualFile;
import org.jboss.ws.extensions.security.WSSecurityDispatcher;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import javax.xml.soap.SOAPException;
+import javax.xml.ws.handler.MessageContext;
+import java.io.IOException;
+
/**
* An abstract JAXWS handler that delegates to the WSSecurityDispatcher
*
@@ -43,7 +48,7 @@
{
// provide logging
private static Logger log = Logger.getLogger(WSSecurityHandler.class);
-
+
protected boolean handleInboundSecurity(MessageContext msgContext)
{
try
@@ -78,13 +83,43 @@
return true;
}
+ /**
+ * Load security config from vfsRoot
+ * @param msgContext
+ */
private WSSecurityConfiguration getSecurityConfiguration(MessageContext msgContext)
{
EndpointMetaData epMetaData = ((CommonMessageContext)msgContext).getEndpointMetaData();
- WSSecurityConfiguration securityConfiguration = epMetaData.getServiceMetaData().getSecurityConfiguration();
- if (securityConfiguration == null)
- log.warn("Cannot obtain security configuration");
-
- return securityConfiguration;
+ ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData();
+
+ if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory
+ {
+ UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getVfsRoot();
+ boolean successful = false;
+ WSSecurityConfiguration config = null;
+ try
+ {
+ WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance();
+ config = wsseConfFactory.createConfiguration(vfsRoot, getConfigResourceName());
+ if(config!=null) successful = true;
+
+ }
+ catch (IOException e)
+ {
+ successful = false;
+ }
+
+ if(!successful)
+ throw new WSException("Failed to access security config");
+
+ // it's required further down the processing chain
+ // TODO: cleanup
+ serviceMetaData.setSecurityConfiguration(config);
+
+ }
+
+ return serviceMetaData.getSecurityConfiguration();
}
+
+ protected abstract String getConfigResourceName();
}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerClient.java (from rev 2101, trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerOutbound.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerClient.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerClient.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.security.jaxws;
+
+import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
+
+import javax.xml.ws.handler.MessageContext;
+
+// $Id$
+
+/**
+ * A JAXWS handler that delegates to the WSSecurityDispatcher
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-Nov-2005
+ */
+public class WSSecurityHandlerClient extends WSSecurityHandler
+{
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ return handleInboundSecurity(msgContext);
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ return handleOutboundSecurity(msgContext);
+ }
+
+ protected String getConfigResourceName() {
+ return WSSecurityOMFactory.CLIENT_RESOURCE_NAME;
+ }
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerClient.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerInbound.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerInbound.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerInbound.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.extensions.security.jaxws;
-
-import javax.xml.ws.handler.MessageContext;
-
-// $Id$
-
-/**
- * A JAXWS handler that delegates to the WSSecurityDispatcher
- * where the request is an inbound message.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Nov-2005
- */
-public class WSSecurityHandlerInbound extends WSSecurityHandler
-{
- protected boolean handleInbound(MessageContext msgContext)
- {
- return handleInboundSecurity(msgContext);
- }
-
- protected boolean handleOutbound(MessageContext msgContext)
- {
- return handleOutboundSecurity(msgContext);
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerOutbound.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerOutbound.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerOutbound.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.extensions.security.jaxws;
-
-import javax.xml.ws.handler.MessageContext;
-
-// $Id$
-
-/**
- * A JAXWS handler that delegates to the WSSecurityDispatcher
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Nov-2005
- */
-public class WSSecurityHandlerOutbound extends WSSecurityHandler
-{
- protected boolean handleInbound(MessageContext msgContext)
- {
- return handleOutboundSecurity(msgContext);
- }
-
- protected boolean handleOutbound(MessageContext msgContext)
- {
- return handleInboundSecurity(msgContext);
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerServer.java (from rev 2101, trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerInbound.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerServer.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerServer.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.security.jaxws;
+
+import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
+
+import javax.xml.ws.handler.MessageContext;
+
+// $Id$
+
+/**
+ * A JAXWS handler that delegates to the WSSecurityDispatcher
+ * where the request is an inbound message.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-Nov-2005
+ */
+public class WSSecurityHandlerServer extends WSSecurityHandler
+{
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ return handleInboundSecurity(msgContext);
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ return handleOutboundSecurity(msgContext);
+ }
+
+ protected String getConfigResourceName() {
+ return WSSecurityOMFactory.SERVER_RESOURCE_NAME;
+ }
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandlerServer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -21,17 +21,18 @@
*/
package org.jboss.ws.extensions.xop.jaxws;
-import org.jboss.ws.core.utils.JavaUtils;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.transform.Source;
-import java.awt.*;
+import java.awt.Image;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.transform.Source;
+
+import org.jboss.ws.core.utils.JavaUtils;
+
/**
* Scans data types for MTOM declarations.
* In order to re-use an instance of this class you need to invoke <code>reset()</code>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -32,6 +32,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.server.UnifiedVirtualFile;
import org.jboss.ws.metadata.config.JBossWSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
@@ -39,10 +40,7 @@
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping;
-import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.umdm.*;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsdl.NCName;
@@ -103,7 +101,10 @@
log.debug("START buildMetaData: [service=" + serviceQName + "]");
try
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
+ DefaultFileAdapter vfsRoot = new DefaultFileAdapter();
+ vfsRoot.setLoader(loader);
+
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
wsMetaData.setClassLoader(loader);
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceQName);
@@ -126,7 +127,7 @@
if (securityConfig != null)
{
serviceMetaData.setSecurityConfiguration(securityConfig);
- setupSecurity(securityConfig, loader);
+ setupSecurity(securityConfig, wsMetaData.getVfsRoot());
}
buildMetaDataInternal(serviceMetaData, wsdlDefinitions, javaWsdlMapping, serviceRefMetaData);
@@ -244,20 +245,26 @@
epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.POST));
}
- private void setupSecurity(WSSecurityConfiguration securityConfig, ClassLoader loader)
+ private void setupSecurity(WSSecurityConfiguration securityConfig, UnifiedVirtualFile vfsRoot)
{
if (securityConfig.getKeyStoreFile() != null)
{
- URL location = loader.getResource(securityConfig.getKeyStoreFile());
- if (location != null)
- securityConfig.setKeyStoreURL(location);
+ try {
+ UnifiedVirtualFile child = vfsRoot.findChild( securityConfig.getKeyStoreFile() );
+ securityConfig.setKeyStoreURL(child.toURL());
+ } catch (IOException e) {
+ // ignore
+ }
}
if (securityConfig.getTrustStoreFile() != null)
{
- URL location = loader.getResource(securityConfig.getTrustStoreFile());
- if (location != null)
- securityConfig.setTrustStoreURL(location);
+ try {
+ UnifiedVirtualFile child = vfsRoot.findChild( securityConfig.getTrustStoreFile() );
+ securityConfig.setTrustStoreURL(child.toURL());
+ } catch (IOException e) {
+ // Ignore
+ }
}
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -24,8 +24,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.config.JBossWSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
import org.jboss.ws.metadata.j2ee.*;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping;
@@ -41,6 +41,7 @@
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
@@ -66,8 +67,8 @@
log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
try
{
- // For every webservice-description build the ServiceMetaData
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
+ // For every webservice-description build the ServiceMetaData
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot);
wsMetaData.setDeploymentName(udi.getCanonicalName());
wsMetaData.setClassLoader(udi.classLoader);
@@ -98,7 +99,9 @@
// Assign the WS-Security configuration,
WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance();
- WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(udi);
+ WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(
+ wsMetaData.getVfsRoot(), WSSecurityOMFactory.SERVER_RESOURCE_NAME
+ );
serviceMetaData.setSecurityConfiguration(securityConfiguration);
// For every port-component build the EndpointMetaData
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -34,11 +34,8 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.core.server.UnifiedVirtualFile;
+import org.jboss.ws.metadata.umdm.*;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsdl.NCName;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
@@ -59,9 +56,8 @@
*/
public class JAXWSClientMetaDataBuilder extends JAXWSMetaDataBuilder
{
- /** Build from WSDL and jaxrpc-mapping.xml
- */
- public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL)
+
+ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot)
{
if (wsdlURL == null)
throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL);
@@ -69,7 +65,7 @@
log.debug("START buildMetaData: [service=" + serviceName + "]");
try
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
@@ -97,6 +93,13 @@
}
}
+ /** Build from WSDL and service name
+ */
+ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL)
+ {
+ return buildMetaData(serviceName, wsdlURL, new DefaultFileAdapter());
+ }
+
private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions) throws IOException
{
QName serviceName = serviceMetaData.getServiceName();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -23,8 +23,38 @@
// $Id$
-import com.sun.xml.bind.api.JAXBRIContext;
-import com.sun.xml.bind.api.TypeReference;
+import java.io.File;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.HandlerChain;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPMessageHandlers;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+import javax.xml.ws.WebFault;
+import javax.xml.ws.addressing.Action;
+import javax.xml.ws.addressing.AddressingProperties;
+
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
@@ -43,38 +73,20 @@
import org.jboss.ws.metadata.jsr181.HandlerChainFactory;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
import org.jboss.ws.metadata.jsr181.HandlerChainsMetaData;
-import org.jboss.ws.metadata.umdm.*;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.FaultMetaData;
+import org.jboss.ws.metadata.umdm.OperationMetaData;
+import org.jboss.ws.metadata.umdm.ParameterMetaData;
+import org.jboss.ws.metadata.umdm.TypeMappingMetaData;
+import org.jboss.ws.metadata.umdm.TypesMetaData;
+import org.jboss.ws.metadata.umdm.WrappedParameter;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
-import javax.jws.*;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPMessageHandlers;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-import javax.xml.ws.WebFault;
-import javax.xml.ws.addressing.Action;
-import javax.xml.ws.addressing.AddressingProperties;
-import java.io.File;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import com.sun.xml.bind.api.JAXBRIContext;
+import com.sun.xml.bind.api.TypeReference;
/**
* Abstract class that represents a JAX-WS metadata builder.
@@ -280,7 +292,7 @@
FaultMetaData fmd = new FaultMetaData(omd, xmlName, xmlType, exception.getName());
fmd.setFaultBeanName(faultBeanName);
- if (generate)
+ if (fmd.loadFaultBean() == null)
wrapperGenerator.generate(fmd);
javaTypes.add(fmd.getFaultBean());
@@ -491,7 +503,7 @@
/**
* Process operation meta data extensions.
*/
- private void processOpMetaExtensions(Method method, EndpointMetaData epMetaData, OperationMetaData opMetaData)
+ private void processMetaExtensions(Method method, EndpointMetaData epMetaData, OperationMetaData opMetaData)
{
AddressingProperties ADDR = new AddressingPropertiesImpl();
AddressingOpMetaExt addrExt = new AddressingOpMetaExt(ADDR.getNamespaceURI());
@@ -506,14 +518,11 @@
{
// TODO: figure out a way to assign message name instead of IN and OUT
String tns = epMetaData.getPortName().getNamespaceURI();
- if(tns.length()>0 && !"/".equals(tns.substring(tns.length()-1)))
- tns = tns+"/";
-
String portTypeName = epMetaData.getPortName().getLocalPart();
- addrExt.setInboundAction(tns + portTypeName + "/IN");
+ addrExt.setInboundAction(tns + "/" + portTypeName + "/IN");
if (!opMetaData.isOneWay())
- addrExt.setOutboundAction(tns + portTypeName + "/OUT");
+ addrExt.setOutboundAction(tns + "/" + portTypeName + "/OUT");
}
opMetaData.addExtension(addrExt);
@@ -709,16 +718,22 @@
// Generate wrapper beans
if (opMetaData.isDocumentWrapped())
{
- wrapperGenerator.generate(wrapperParameter);
+ if (wrapperParameter.loadWrapperBean() == null)
+ wrapperGenerator.generate(wrapperParameter);
+
Class wrapperClass = wrapperParameter.getJavaType();
javaTypes.add(wrapperClass);
+
// In case there is no @XmlRootElement
typeRefs.add(new TypeReference(wrapperParameter.getXmlName(), wrapperClass));
if (!opMetaData.isOneWay())
{
- wrapperGenerator.generate(wrapperOutputParameter);
+ if (wrapperOutputParameter.loadWrapperBean() == null)
+ wrapperGenerator.generate(wrapperOutputParameter);
+
wrapperClass = wrapperOutputParameter.getJavaType();
javaTypes.add(wrapperClass);
+
// In case there is no @XmlRootElement
typeRefs.add(new TypeReference(wrapperOutputParameter.getXmlName(), wrapperClass));
}
@@ -730,7 +745,7 @@
addFault(opMetaData, exClass);
// process op meta data extension
- processOpMetaExtensions(method, epMetaData, opMetaData);
+ processMetaExtensions(method, epMetaData, opMetaData);
}
protected void processWebMethods(EndpointMetaData epMetaData, Class wsClass)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -34,6 +34,7 @@
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.umdm.DefaultFileAdapter;
/**
* A server side meta data builder that is based on JSR-181 annotations
@@ -55,8 +56,8 @@
{
log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
try
- {
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
+ {
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot);
wsMetaData.setDeploymentName(udi.getCanonicalName());
wsMetaData.setClassLoader(udi.classLoader);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -29,6 +29,7 @@
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.umdm.DefaultFileAdapter;
/**
* A server side meta data builder that is based on JSR-181 annotations
@@ -49,7 +50,7 @@
log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
try
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData();
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot);
wsMetaData.setDeploymentName(udi.getCanonicalName());
wsMetaData.setClassLoader(udi.classLoader);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -34,6 +34,7 @@
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
import org.jboss.ws.tools.jaxws.JAXBWSDLGenerator;
import org.jboss.ws.tools.wsdl.WSDLGenerator;
import org.jboss.ws.tools.wsdl.WSDLWriter;
@@ -88,7 +89,9 @@
// Assign the WS-Security configuration,
WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance();
- WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(udi);
+ WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(
+ wsMetaData.getVfsRoot(), WSSecurityOMFactory.SERVER_RESOURCE_NAME
+ );
serviceMetaData.setSecurityConfiguration(securityConfiguration);
// Process an optional @SOAPBinding annotation
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.metadata.umdm;
+
+import org.jboss.ws.core.server.UnifiedVirtualFile;
+
+import java.io.IOException;
+import java.io.File;
+import java.net.URL;
+import java.net.MalformedURLException;
+
+/**
+ * The default file adapter loads resources through an associated classloader.
+ * If no classload is set, the the thread context classloader will be used.
+ *
+ * @author Heiko.Braun(a)jboss.org
+ * @version $Id$
+ * @since 25.01.2007
+ */
+public class DefaultFileAdapter implements UnifiedVirtualFile {
+
+ private URL location;
+ private ClassLoader loader;
+
+ public DefaultFileAdapter(URL location) {
+ this.location = location;
+ }
+
+ public DefaultFileAdapter() {
+ }
+
+ public UnifiedVirtualFile findChild(String child) throws IOException
+ {
+
+ URL loc = null;
+ if (child != null)
+ {
+ // Try the child as URL
+ try
+ {
+ loc = new URL(child);
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+
+ // Try the filename as File
+ if (loc == null)
+ {
+ try
+ {
+ File file = new File(child);
+ if (file.exists())
+ loc = file.toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ // ignore
+ }
+ }
+
+ // Try the filename as Resource
+ if (loc == null)
+ {
+ try
+ {
+ loc = getLoader().getResource(child);
+ }
+ catch (Exception ex)
+ {
+ // ignore
+ }
+ }
+
+ }
+
+ if (loc == null)
+ throw new IllegalArgumentException("Cannot get URL for: " + child);
+
+ return new DefaultFileAdapter(loc);
+ }
+
+ public URL toURL() {
+ if(null == this.location)
+ throw new IllegalStateException("UnifiedVirtualFile not initialized");
+ return location;
+ }
+
+ public void setLoader(ClassLoader loader) {
+ this.loader = loader;
+ }
+
+ public ClassLoader getLoader() {
+ if(null == this.loader)
+ loader = Thread.currentThread().getContextClassLoader();
+ return loader;
+ }
+}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -42,6 +42,7 @@
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.metadata.acessor.ReflectiveFieldAccessor;
import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor;
+import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
/**
* A Fault component describes a fault that a given operation supports.
@@ -62,10 +63,10 @@
private QName xmlType;
private String javaTypeName;
private String faultBeanName;
- private Class<? extends Exception> javaType;
- private Class<?> faultBean;
+ private Class javaType;
+ private Class faultBean;
- private Method getFaultInfoMethod;
+ private Method faultInfoMethod;
private Constructor<? extends Exception> serviceExceptionConstructor;
private Method[] serviceExceptionGetters;
@@ -156,6 +157,21 @@
this.faultBeanName = faultBeanName;
}
+ public Class loadFaultBean()
+ {
+ Class faultBean = null;
+ try
+ {
+ ClassLoader loader = getOperationMetaData().getEndpointMetaData().getClassLoader();
+ faultBean = JavaUtils.loadJavaType(faultBeanName, loader);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ // ignore
+ }
+ return faultBean;
+ }
+
public Class getFaultBean()
{
Class tmpFaultBean = faultBean;
@@ -181,17 +197,30 @@
public void eagerInitialize()
{
- ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
- new DynamicWrapperGenerator(loader).generate(this);
+ Type epType = getOperationMetaData().getEndpointMetaData().getType();
+ if (epType == EndpointMetaData.Type.JAXWS && faultBeanName != null)
+ {
+ if (loadFaultBean() == null)
+ {
+ ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
+ new DynamicWrapperGenerator(loader).generate(this);
+ }
+ }
// Initialize the cache
- javaType = getJavaType().asSubclass(Exception.class);
+ javaType = getJavaType();
if (javaType == null)
throw new WSException("Cannot load java type: " + javaTypeName);
- faultBean = getFaultBean();
- if (faultBean != null)
- initializeFaultBean();
+ if (JavaUtils.isAssignableFrom(Exception.class, javaType) == false)
+ throw new WSException("Fault java type is not a java.lang.Exception: " + javaTypeName);
+
+ if (epType == EndpointMetaData.Type.JAXWS)
+ {
+ faultBean = getFaultBean();
+ if (faultBean != null)
+ initializeFaultBean();
+ }
}
private void initializeFaultBean()
@@ -209,7 +238,7 @@
* . WrapperException(String message, FaultBean faultInfo, Throwable cause)
* . FaultBean getFaultInfo() */
serviceExceptionConstructor = javaType.getConstructor(String.class, faultBean);
- getFaultInfoMethod = javaType.getMethod("getFaultInfo");
+ faultInfoMethod = javaType.getMethod("getFaultInfo");
}
/* JAX-WS 3.7: For exceptions that do not match the pattern described in
* section 2.5, JAX-WS maps those exceptions to Java beans and then uses
@@ -218,7 +247,7 @@
{
/* For each getter in the exception and its superclasses, a property of
* the same type and name is added to the bean. */
- XmlType xmlType = faultBean.getAnnotation(XmlType.class);
+ XmlType xmlType = (XmlType)faultBean.getAnnotation(XmlType.class);
if (xmlType == null)
throw new WebServiceException("@XmlType missing from fault bean: " + faultBeanName);
@@ -296,10 +325,10 @@
{
/* is the service exception a wrapper
* (i.e. does it match the pattern in JAX-WS 2.5)? */
- if (getFaultInfoMethod != null)
+ if (faultInfoMethod != null)
{
// extract the fault bean from the wrapper exception
- faultBeanInstance = getFaultInfoMethod.invoke(serviceException);
+ faultBeanInstance = faultInfoMethod.invoke(serviceException);
}
else
{
@@ -346,7 +375,7 @@
{
/* is the service exception a wrapper
* (i.e. does it match the pattern in JAX-WS 2.5)? */
- if (getFaultInfoMethod != null)
+ if (faultInfoMethod != null)
{
serviceException = serviceExceptionConstructor.newInstance(message, faultBean);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -152,8 +152,8 @@
List<String> securityHandlers = new ArrayList<String>();
securityHandlers.add(org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound.class.getName());
securityHandlers.add(org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound.class.getName());
- securityHandlers.add(org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerInbound.class.getName());
- securityHandlers.add(org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerOutbound.class.getName());
+ securityHandlers.add(org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer.class.getName());
+ securityHandlers.add(org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient.class.getName());
if (securityHandlers.contains(handlerClassName))
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -69,7 +69,7 @@
public OperationMetaData(QName qname, String javaName)
{
- UnifiedMetaData umd = new UnifiedMetaData();
+ UnifiedMetaData umd = new UnifiedMetaData(new DefaultFileAdapter());
ServiceMetaData smd = new ServiceMetaData(umd, new QName("mock-service"));
ServerEndpointMetaData epmd = new ServerEndpointMetaData(smd, new QName("mock-endpoint"), new QName("mock-interface"), Type.JAXRPC);
initOperationMetaData(epmd, qname, javaName);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -24,7 +24,6 @@
// $Id$
import java.lang.reflect.Method;
-import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -43,6 +42,7 @@
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner;
import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor;
+import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
/**
* A request/response parameter that a given operation supports.
@@ -109,21 +109,25 @@
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
{
Class returnType = method.getReturnType();
- Type[] genericParameters = method.getGenericParameterTypes();
- Class[] classParameters = method.getParameterTypes();
if (index == -1 && matchTypes(returnType, expectedType, exact, false))
return true;
+ Class[] classParameters = method.getParameterTypes();
if (index < 0 || index >= classParameters.length)
return false;
boolean matchTypes;
if (JavaUtils.isRetro14())
+ {
matchTypes = matchTypes(classParameters[index], expectedType, exact, holder);
- else
+ }
+ else
+ {
+ java.lang.reflect.Type[] genericParameters = method.getGenericParameterTypes();
matchTypes = matchTypes(genericParameters[index], expectedType, exact, holder);
+ }
if (matchTypes)
{
@@ -134,12 +138,12 @@
return false;
}
- private static boolean matchTypes(Type actualType, Class expectedType, boolean exact, boolean holder)
+ private static boolean matchTypes(java.lang.reflect.Type actualType, Class expectedType, boolean exact, boolean holder)
{
if (holder && HolderUtils.isHolderType(actualType) == false)
return false;
- Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType);
+ java.lang.reflect.Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType);
Class valueClass = JavaUtils.erasure(valueType);
return matchTypesInternal(valueClass, expectedType, exact);
@@ -160,9 +164,7 @@
private static boolean matchTypesInternal(Class valueClass, Class expectedType, boolean exact)
{
- // FIXME - Why do we need this hack? It shouldn't be needed. The method
- // signature should _ALWAYS_ match, else we will get ambiguous or
- // incorrect results
+ // FIXME - Why do we need this hack? The method signature should _ALWAYS_ match, else we will get ambiguous or incorrect results
List<Class> anyTypes = new ArrayList<Class>();
anyTypes.add(javax.xml.soap.SOAPElement.class);
anyTypes.add(org.w3c.dom.Element.class);
@@ -230,6 +232,21 @@
javaTypeName = typeName;
javaType = null;
}
+
+ public Class loadWrapperBean()
+ {
+ Class wrapperBean = null;
+ try
+ {
+ ClassLoader loader = getOperationMetaData().getEndpointMetaData().getClassLoader();
+ wrapperBean = JavaUtils.loadJavaType(javaTypeName, loader);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ // ignore
+ }
+ return wrapperBean;
+ }
/** Load the java type.
* It should only be cached during eager initialization.
@@ -420,9 +437,16 @@
javaType = null;
// FIXME - Remove messageType hack
+ Type epType = getOperationMetaData().getEndpointMetaData().getType();
if (getOperationMetaData().isDocumentWrapped() && !isInHeader() && !isSwA() && !isMessageType())
{
- new DynamicWrapperGenerator(getClassLoader()).generate(this);
+ if (loadWrapperBean() == null)
+ {
+ if (epType == EndpointMetaData.Type.JAXRPC)
+ throw new WSException("Autogeneration of wrapper beans not supported with JAXRPC");
+
+ new DynamicWrapperGenerator(getClassLoader()).generate(this);
+ }
// Initialize accessors
AccessorFactory factory = accessorFactoryCreator.create(this);
@@ -435,19 +459,21 @@
throw new WSException("Cannot load java type: " + javaTypeName);
// check if the JavaType is an mtom parameter
- // TODO: this should only apply to JAX-WS and needs to happen outside UMD
- ReflectiveXOPScanner scanner = new ReflectiveXOPScanner();
- String mimeType = scanner.scan(javaType);
- if (mimeType != null)
+ if (epType == EndpointMetaData.Type.JAXWS)
{
- log.debug("MTOM parameter found: " + xmlName);
- setXOP(true);
+ ReflectiveXOPScanner scanner = new ReflectiveXOPScanner();
+ String mimeType = scanner.scan(javaType);
+ if (mimeType != null)
+ {
+ log.debug("MTOM parameter found: " + xmlName);
+ setXOP(true);
+ }
}
}
private ClassLoader getClassLoader()
{
- ClassLoader loader = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader();
+ ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
if (loader == null)
throw new WSException("ClassLoader not available");
return loader;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -31,6 +31,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.server.ServiceEndpointManager;
+import org.jboss.ws.core.server.UnifiedVirtualFile;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
@@ -57,6 +58,8 @@
private String deploymentName;
// The modules class loader
private ClassLoader classLoader;
+ // The resource loader
+ private UnifiedVirtualFile vfsRoot;
// The optional security domain
private String securityDomain;
// The implementation version
@@ -76,8 +79,12 @@
// Used by validate
private boolean validated;
- public UnifiedMetaData()
- {
+ public UnifiedMetaData(UnifiedVirtualFile vfsRoot) {
+
+ if(null==vfsRoot)
+ throw new IllegalArgumentException("VFS root cannot be null");
+
+ this.vfsRoot = vfsRoot;
this.classLoader = Thread.currentThread().getContextClassLoader();
}
@@ -89,6 +96,10 @@
return classLoader;
}
+ public UnifiedVirtualFile getVfsRoot() {
+ return vfsRoot;
+ }
+
public void setClassLoader(ClassLoader classLoader)
{
this.classLoader = classLoader;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -1,7 +1,27 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
package org.jboss.ws.metadata.wsse;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.ws.core.server.UnifiedVirtualFile;
import java.io.IOException;
import java.io.InputStream;
@@ -22,22 +42,14 @@
return new WSSecurityConfigFactory();
}
- public WSSecurityConfiguration createConfiguration(UnifiedDeploymentInfo udi) throws IOException
+ public WSSecurityConfiguration createConfiguration(UnifiedVirtualFile vfsRoot, String resourceName) throws IOException
{
WSSecurityConfiguration config = null;
- String resource = WSSecurityOMFactory.SERVER_RESOURCE_NAME;
- if (udi.metaData instanceof UnifiedWebMetaData)
- {
- resource = "WEB-INF/" + resource;
- }
- else
- {
- resource = "META-INF/" + resource;
- }
+ URL location = getResource(vfsRoot, "WEB-INF/" + resourceName);
+ if(null == location)
+ location = getResource(vfsRoot, "META-INF/" + resourceName);
- URL location = getResource(udi, resource);
-
if (location != null)
{
config = WSSecurityOMFactory.newInstance().parse(location);
@@ -45,14 +57,14 @@
// Get and set deployment path to the keystore file
if (config.getKeyStoreFile() != null)
{
- location = getResource(udi, config.getKeyStoreFile());
+ location = getResource(vfsRoot, config.getKeyStoreFile());
if (location != null)
config.setKeyStoreURL(location);
}
if (config.getTrustStoreFile() != null)
{
- location = getResource(udi, config.getTrustStoreFile());
+ location = getResource(vfsRoot, config.getTrustStoreFile());
if (location != null)
config.setTrustStoreURL(location);
}
@@ -61,17 +73,24 @@
return config;
}
- private URL getResource(UnifiedDeploymentInfo udi, String resource)
+ /**
+ *
+ * @param vfsRoot
+ * @param resource
+ * @return null, when the resource cannot be found
+ */
+ private URL getResource(UnifiedVirtualFile vfsRoot, String resource)
{
try
{
- URL url = udi.getMetaDataFileURL(resource);
+ UnifiedVirtualFile child = vfsRoot.findChild(resource);
+ URL url = child.toURL();
InputStream inputStream = url.openStream();
inputStream.close();
return url;
}
- catch (IOException e)
+ catch (Exception e)
{
return null;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -35,6 +35,7 @@
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.umdm.DefaultFileAdapter;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.Configuration.OperationConfig;
@@ -83,8 +84,11 @@
if (!Remote.class.isAssignableFrom(seiClass))
throw new WSException("A service endpoint interface should extend Remote");
- um = new UnifiedMetaData();
- um.setClassLoader(Thread.currentThread().getContextClassLoader());
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ DefaultFileAdapter vfsRoot = new DefaultFileAdapter();
+ vfsRoot.setLoader(contextClassLoader);
+ um = new UnifiedMetaData(vfsRoot);
+ um.setClassLoader(contextClassLoader);
String seiName = WSDLUtils.getInstance().getJustClassName(seiClass.getName());
if (serviceName == null)
Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -36,7 +36,7 @@
<javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerOutbound</javaee:handler-class>
+ <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class>
</javaee:handler>
</javaee:handler-chain>
</post-handler-chains>
Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -37,7 +37,7 @@
<javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurity Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerInbound</javaee:handler-class>
+ <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
</javaee:handler>
</javaee:handler-chain>
</pre-handler-chains>
Modified: trunk/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-25 20:55:44 UTC (rev 2118)
@@ -2,9 +2,9 @@
#
# Required JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
-#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
+jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
+jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
+jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
jbossws.integration.target=jboss42
@@ -13,7 +13,7 @@
jboss.server.instance=default
# Tomcat Home
-#tomcat.home=/usr/java/tomcat
+tomcat.home=/usr/java/tomcat
#tomcat.manager.username=manager
#tomcat.manager.password=manager
Modified: trunk/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -26,7 +26,6 @@
<ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="jars"/>
<ant antfile="${basedir}/jaxrpc/swa/build.xml" target="jars"/>
<!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="jars"/-->
- <ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="jars"/>
<ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/>
<ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="jars"/>
@@ -54,7 +53,6 @@
<ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="tests"/>
<ant antfile="${basedir}/jaxrpc/swa/build.xml" target="tests"/>
<!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="tests"/-->
- <ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="tests"/>
<ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/>
<ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="tests"/>
Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -29,13 +29,10 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
@@ -70,10 +67,10 @@
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
<pathelement location="${thirdparty.dir}/xmlsec.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-client.jar"/>
+ <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${lib.dir}/jbossws-client.jar"/>
</path>
<path id="compile.classpath">
Modified: trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -16,6 +16,7 @@
<property name="common.resources" value="${basedir}/common/resources"/>
<property name="build.tests.dir" value="${basedir}/output"/>
<property name="thirdparty.dir" value="${basedir}/thirdparty"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
<!-- Force Thirdparty Get -->
<condition property="force.thirdparty.get">
Modified: trunk/jbossws-core/src/main/resources/samples/version.properties
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/version.properties 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-core/src/main/resources/samples/version.properties 2007-01-25 20:55:44 UTC (rev 2118)
@@ -8,9 +8,9 @@
javassist=@javassist@
jbpm-bpel=@jbpm-bpel@
jboss-common-core=@jboss-common-core@
-jboss-common-logging=@jboss-common-logging@
+jboss-common-logging-log4j=@jboss-common-logging-log4j@
+jboss-common-logging-spi=@jboss-common-logging-spi@
jboss-ejb3=@jboss-ejb3@
-jboss-jbossws=(a)version.id@
jboss-jbossxb=@jboss-jbossxb@
jbossas-core-libs=@jbossas-core-libs@
oswego-concurrent=@oswego-concurrent@
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -9,760 +9,811 @@
<!-- $Id$ -->
<project name="JBossWS">
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-jars" description="Build the deployments.">
-
- <mkdir dir="${tests.output.dir}/libs"/>
-
- <!-- jaxws-anonymous -->
- <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/>
- <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/>
- <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
- </classes>
- </war>
- <!-- jaxws-asynchronous -->
- <war warfile="${tests.output.dir}/libs/jaxws-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/asynchronous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpointBean.class"/>
- </classes>
- </war>
-
- <!-- jaxws-binding -->
- <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
- </classes>
- </war>
-
- <!-- jaxws-context -->
- <war warfile="${tests.output.dir}/libs/jaxws-context.war" webxml="${tests.output.dir}/resources/jaxws/context/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/context/EndpointJSE.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/context/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-context.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/context/EndpointEJB.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-context-jboss4x.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-eardeployment -->
- <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/eardeployment/JSEBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.ear">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxws-eardeployment.jar"/>
- <include name="jaxws-eardeployment.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment42.ear">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxws-eardeployment.jar"/>
- <include name="jaxws-eardeployment.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
- <include name="application.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-endpoint-servlet -->
- <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/>
- <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
-
- <!-- jaxws-exception -->
- <war warfile="${tests.output.dir}/libs/jaxws-exception.war" webxml="${tests.output.dir}/resources/jaxws/exception/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/exception/UserException.class"/>
- </classes>
- </war>
+ <description>JBossWS test archive builder</description>
- <!-- jaxws-handlerscope -->
- <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF">
- <include name="jaxws-server-handlers.xml"/>
- </webinf>
- </war>
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
- <!-- interop -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10-service.war"
- webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${tests.output.dir}/resources/interop/wsa">
- <include name="*.*"/>
- </fileset>
- </war>
+ <target name="build-jars" description="Build the deployments.">
- <!-- end interop -->
+ <mkdir dir="${tests.output.dir}/libs"/>
- <!-- jaxws-jbws860 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-jbws871 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-jbws944 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-jbws981 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-jbws1178 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jbws1190 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jbws1357 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
- </classes>
- <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357">
- <include name="hello.jsp"/>
- </fileset>
- </war>
-
- <!-- jaxws-jsr181-complex -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jsr181-handlerchain -->
- <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/jsr181/handlerchain" file="${tests.output.dir}/resources/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/EndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/*Handler.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-jsr181-handlerchain-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/*Handler.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClient.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jsr181/handlerchain/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.jsr181.handlerchain.HandlerChainClient"/>
- </manifest>
- </jar>
-
- <!-- jaxws-jsr181-oneway -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-oneway.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/oneway/PingEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jsr181-soapbinding -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocBareServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jsr181-webmethod -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jsr181-webparam -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webparam.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingService.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingDocument*.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webparam/SecurityHeader.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jsr181-webresult -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webresult.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerService.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jsr181-webservice -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean01.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF01">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean02.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF02">
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean03.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF03">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice01-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice02-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/META-INF02">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice03-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-logicalhandler -->
- <war warfile="${tests.output.dir}/libs/jaxws-logicalhandler-source.war" webxml="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF/web-source.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalSourceHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/ProtocolHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/Echo.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF">
- <include name="jaxws-server-source-handlers.xml"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-logicalhandler-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF/web-jaxb.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalJAXBHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/ProtocolHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/Echo.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/logicalhandler/ObjectFactory.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF">
- <include name="jaxws-server-jaxb-handlers.xml"/>
- </webinf>
- </war>
+ <!-- jaxws-anonymous -->
+ <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/>
+ <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/>
+ <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
+ </classes>
+ </war>
- <!-- jaxws metadata -->
- <war warfile="${tests.output.dir}/libs/jaxws-metadata.war"
- webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/metadata/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF">
- <include name="**/*"/>
- </webinf>
- </war>
+ <!-- jaxws-asynchronous -->
+ <war warfile="${tests.output.dir}/libs/jaxws-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/asynchronous/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpointBean.class"/>
+ </classes>
+ </war>
- <!-- jaxws-provider-jaxb -->
- <war warfile="${tests.output.dir}/libs/jaxws-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/provider/WebServiceEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/provider/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
-
- <!-- jaxws-provider-message -->
- <war warfile="${tests.output.dir}/libs/jaxws-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/provider/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
-
- <!-- jaxws-provider-payload -->
- <war warfile="${tests.output.dir}/libs/jaxws-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/provider/payload/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-jsr181ejb -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
- <include name="jboss-wsse-server.xml"/>
- <include name="wsse.*"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-wsse-client.xml"/>
- <include name="wsse.*"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-jsr181pojo -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
- </classes>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-jsr181pojo-docwrapped -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
- </classes>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
+ <!-- jaxws-binding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
+ </classes>
+ </war>
- <!-- jaxws-samples-wsaddressing -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
- <include name="jaxws-handlers.xml"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
+ <!-- jaxws-context -->
+ <war warfile="${tests.output.dir}/libs/jaxws-context.war" webxml="${tests.output.dir}/resources/jaxws/context/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/context/EndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/context/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-context.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/context/EndpointEJB.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-context-jboss4x.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.class"/>
+ </fileset>
+ </jar>
+ <!-- jaxws-eardeployment -->
+ <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/eardeployment/JSEBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-eardeployment.jar"/>
+ <include name="jaxws-eardeployment.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment42.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-eardeployment.jar"/>
+ <include name="jaxws-eardeployment.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-endpoint-servlet -->
+ <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/>
+ <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-exception -->
+ <war warfile="${tests.output.dir}/libs/jaxws-exception.war" webxml="${tests.output.dir}/resources/jaxws/exception/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/exception/UserException.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-handlerscope -->
+ <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF">
+ <include name="jaxws-server-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- interop -->
+
+ <!-- wsa -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10-service.war"
+ webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/wsa">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- wsse -->
+ <!-- sing only -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war"
+ webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF">
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- sign&encrypt -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war"
+ webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF">
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- end interop -->
+
+ <!-- jaxws-jbws860 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-jbws871 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-jbws944 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-jbws981 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-jbws1178 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jbws1190 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jbws1357 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
+ </classes>
+ <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357">
+ <include name="hello.jsp"/>
+ </fileset>
+ </war>
+
+ <!-- jaxws-jsr181-complex -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jsr181-handlerchain -->
+ <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/jsr181/handlerchain" file="${tests.output.dir}/resources/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/*Handler.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-jsr181-handlerchain-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/*Handler.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jsr181/handlerchain/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.jsr181.handlerchain.HandlerChainClient"/>
+ </manifest>
+ </jar>
+
+ <!-- jaxws-jsr181-oneway -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-oneway.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/oneway/PingEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jsr181-soapbinding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocBareServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jsr181-webmethod -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jsr181-webparam -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webparam.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingService.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingDocument*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webparam/SecurityHeader.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jsr181-webresult -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webresult.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerService.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jsr181-webservice -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean01.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF01">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean02.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF02">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF03">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice01-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice02-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/META-INF02">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice03-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-logicalhandler -->
+ <war warfile="${tests.output.dir}/libs/jaxws-logicalhandler-source.war" webxml="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF/web-source.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalSourceHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/Echo.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF">
+ <include name="jaxws-server-source-handlers.xml"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-logicalhandler-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF/web-jaxb.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalJAXBHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/Echo.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/logicalhandler/ObjectFactory.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/logicalhandler/WEB-INF">
+ <include name="jaxws-server-jaxb-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws metadata -->
+ <war warfile="${tests.output.dir}/libs/jaxws-metadata.war"
+ webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/metadata/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF">
+ <include name="**/*"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-provider-jaxb -->
+ <war warfile="${tests.output.dir}/libs/jaxws-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/provider/WebServiceEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/provider/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-provider-message -->
+ <war warfile="${tests.output.dir}/libs/jaxws-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/provider/message/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-provider-payload -->
+ <war warfile="${tests.output.dir}/libs/jaxws-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/provider/payload/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-jsr181ejb -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ <include name="jboss-wsse-client.xml"/>
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-jsr181pojo -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
+ </classes>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-jsr181pojo-docwrapped -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
+ </classes>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsaddressing -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <include name="jaxws-handlers.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-samples-retail -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
- <include name="wsdl/*"/>
- <include name="jaxws-handler.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
+ <include name="wsdl/*"/>
+ <include name="jaxws-handler.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
- <!-- jaxws-samples-wseventing.war -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF">
- <include name="wsdl/jboss-web.xml"/>
- <include name="wsdl/sysmon.wsdl"/>
- <include name="wsdl/ws-eventing.wsdl"/>
- <include name="wsdl/ws-eventing.xsd"/>
- <include name="wsdl/ws-addr.xsd"/>
- </webinf>
- </war>
+ <!-- jaxws-samples-wseventing.war -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF">
+ <include name="wsdl/jboss-web.xml"/>
+ <include name="wsdl/sysmon.wsdl"/>
+ <include name="wsdl/ws-eventing.wsdl"/>
+ <include name="wsdl/ws-eventing.xsd"/>
+ <include name="wsdl/ws-addr.xsd"/>
+ </webinf>
+ </war>
- <!-- jaxws-webserviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne"/>
- </manifest>
- </jar>
- <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-ejb3-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
- <include name="jboss.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/>
- </fileset>
- </jar>
- <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/>
- </manifest>
- </jar>
- <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override">
- <include name="jbossws-client-config.xml"/>
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
- <include name="wsdl/**"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/>
- </manifest>
- </jar>
-
- <!-- jaxws-wrapped-accessor -->
- <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
- <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
- </classes>
- </war>
-
- <!-- jaxws-wsaddressing-action -->
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-wsaddressing-replyto -->
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxws-jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
- </classes>
- </war>
+ <!-- jaxws-webserviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne"/>
+ </manifest>
+ </jar>
+ <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/>
+ </manifest>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override">
+ <include name="jbossws-client-config.xml"/>
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/>
+ </manifest>
+ </jar>
- <!-- jaxws-wseventing -->
- <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war"
- webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/ws/eventing/*.class"/>
- <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
-
- <!-- jaxws-xop-doclit -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-xop-doclit.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/xop/doclit/**/*.class"/>
- </fileset>
- <!--metainf dir="${tests.output.dir}/resources/jaxws/xop/doclit/META-INF">
- <include name="wsdl/*"/>
- <include name="jaxws-handler.xml"/>
- </metainf-->
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-xop-doclit-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/xop/doclit/**/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/xop/doclit/**/*Bean.class"/>
- </fileset>
- <!--metainf dir="${tests.output.dir}/resources/jaxws/xop/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf-->
- </jar>
-
- <!-- Please add alphabetically -->
-
- </target>
-
+ <!-- jaxws-wrapped-accessor -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
+ <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-wsaddressing-action -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-wsaddressing-replyto -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxws-jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-wseventing -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war"
+ webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/ws/eventing/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-xop-doclit -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-xop-doclit.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/xop/doclit/**/*.class"/>
+ </fileset>
+ <!--metainf dir="${tests.output.dir}/resources/jaxws/xop/doclit/META-INF">
+ <include name="wsdl/*"/>
+ <include name="jaxws-handler.xml"/>
+ </metainf-->
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-xop-doclit-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/xop/doclit/**/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/xop/doclit/**/*Bean.class"/>
+ </fileset>
+ <!--metainf dir="${tests.output.dir}/resources/jaxws/xop/doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf-->
+ </jar>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
</project>
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-tests/build.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -153,12 +153,21 @@
<target name="init" depends="prepare,thirdparty">
<!-- The combined compile classpath -->
- <path id="javac.classpath">
- <path refid="core.classpath"/>
+ <path id="jbossws.jars.classpath">
<pathelement location="${jbossws.client.jar}"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
+ <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
+ <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
+ </path>
+
+ <!-- The combined compile classpath -->
+ <path id="javac.classpath">
+ <path refid="core.classpath"/>
+ <path refid="jbossws.jars.classpath"/>
<pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
<pathelement location="${thirdparty.dir}/junit.jar"/>
@@ -173,10 +182,13 @@
<!-- The test client classpath -->
<path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
<pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
<pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
@@ -184,9 +196,6 @@
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
- <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
- <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
@@ -202,10 +211,6 @@
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
<src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/interop/microsoft/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/wseventing/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/>
<exclude name="org/jboss/test/ws/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
@@ -225,7 +230,7 @@
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${tests.output.dir}/wstools/java"/>
- <exclude name="org/jboss/test/ws/interop/microsoft/**"/>
+ <exclude name="org/jboss/test/ws/interop/**"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.interop.wsse;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestHelper;
+import org.jboss.ws.core.StubExt;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.BindingProvider;
+import java.net.URLClassLoader;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.io.File;
+
+/**
+ * @author Heiko.Braun(a)jboss.org
+ * @version $Id$
+ * @since 25.01.2007
+ */
+public abstract class AbstractWSSEBase extends JBossWSTest {
+
+ protected IPingService port;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ if (port == null)
+ {
+ URL wsdlLocation = new File("resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl").toURL();
+ QName serviceName = new QName("http://tempuri.org/", "PingService10");
+ Service service = Service.create(wsdlLocation, serviceName);
+ port = service.getPort(IPingService.class);
+
+ ((BindingProvider)port).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ getEndpointURL()
+ );
+ configureClient();
+ }
+
+ defaultSetup(port);
+ }
+
+ abstract String getEndpointURL();
+
+
+ protected void defaultSetup(IPingService port) {
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ System.setProperty("org.jboss.ws.wsse.keyStore", "resources/interop/wsse/shared/META-INF/alice.jks");
+ System.setProperty("org.jboss.ws.wsse.trustStore", "resources/interop/wsse/shared/META-INF/wsse10.truststore");
+ System.setProperty("org.jboss.ws.wsse.keyStorePassword", "password");
+ System.setProperty("org.jboss.ws.wsse.trustStorePassword", "password");
+ System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks");
+ System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks");
+ }
+
+ protected void configureClient() {
+
+ /*InteropConfigFactory factory = InteropConfigFactory.newInstance();
+ ClientScenario scenario = factory.createClientScenario(System.getProperty("client.scenario"));
+ if(scenario!=null)
+ {
+ log.info("Using scenario: " + scenario);
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, scenario.getTargetEndpoint().toString());
+ }
+ else
+ {
+ throw new IllegalStateException("Failed to load client scenario");
+ }
+ */
+ }
+
+ protected static void prepareClientClasspath(String s) {
+ try
+ {
+ // wrap the classload upfront to allow inclusion of the client.jar
+ JBossWSTestHelper helper = new JBossWSTestHelper();
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ URLClassLoader replacement = new URLClassLoader(new URL[] {helper.getArchiveURL(s)}, parent);
+ Thread.currentThread().setContextClassLoader(replacement);
+
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalStateException(e);
+ }
+ }
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Echo.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Echo.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Echo.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,64 @@
+
+package org.jboss.test.ws.interop.wsse;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.*;
+
+
+/**
+ * <p>Java class for echo element declaration.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <element name="echo">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="request" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </element>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+ name = "",
+ propOrder = {"request"}
+)
+@XmlRootElement(name = "echo", namespace = "http://InteropBaseAddress/interop")
+public class Echo {
+
+ @XmlElement(name = "request", namespace = "http://InteropBaseAddress/interop")
+ protected String request;
+
+ /**
+ * Gets the value of the request property.
+ *
+ * @return
+ * possible object is
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ *
+ */
+ public String getRequest() {
+ return request;
+ }
+
+ /**
+ * Sets the value of the request property.
+ *
+ * @param value
+ * allowed object is
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ *
+ */
+ public void setRequest(String value) {
+ this.request = value;
+ }
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EchoResponse.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EchoResponse.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EchoResponse.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,63 @@
+
+package org.jboss.test.ws.interop.wsse;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.*;
+
+
+/**
+ * <p>Java class for echoResponse element declaration.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <element name="echoResponse">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="echoResult" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </element>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "echoResult"
+})
+@XmlRootElement(name = "echoResponse", namespace = "http://InteropBaseAddress/interop")
+public class EchoResponse {
+
+ @XmlElement(name = "echoResult", namespace = "http://InteropBaseAddress/interop")
+ protected String echoResult;
+
+ /**
+ * Gets the value of the echoResult property.
+ *
+ * @return
+ * possible object is
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ *
+ */
+ public String getEchoResult() {
+ return echoResult;
+ }
+
+ /**
+ * Sets the value of the echoResult property.
+ *
+ * @param value
+ * allowed object is
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ *
+ */
+ public void setEchoResult(String value) {
+ this.echoResult = value;
+ }
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.interop.wsse;
+
+import junit.framework.Test;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: EncryptTestCase.java 2064 2007-01-24 11:30:23Z heiko.braun(a)jboss.com $
+ * @since Aug 23, 2006
+ */
+public class EncryptTestCase extends AbstractWSSEBase {
+
+ public static Test suite()
+ {
+ prepareClientClasspath("jbossws-interop-wsse10Encrypt-client.jar");
+ return JBossWSTestSetup.newTestSetup(EncryptTestCase.class, "jbossws-interop-wsse10Encrypt.war");
+ }
+
+ String getEndpointURL() {
+ return "http://"+getServerHost()+":8080//wsse10Encrypt/endpoint";
+ }
+
+ // Scenario 3.3. X509 Mutual Authentication, Sign Then Encrypt
+ public void testSignEncrypt() throws Exception{
+
+ //
+ Ping request = new Ping();
+
+ request.setScenario("testSignOnly");
+ request.setOrigin("JBossWS");
+ request.setText("Hello World, encrypted");
+ port.ping(request);
+
+ Echo request2 = new Echo();
+ request2.setRequest("Hello World");
+ EchoResponse response = port.echo(request2);
+ assertNotNull(response);
+ assertEquals(response.getEchoResult(), request2.getRequest());
+ }
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/IPingService.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/IPingService.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/IPingService.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.interop.wsse;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+
+/**
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.0-b26-ea3
+ * Generated source version: 2.0
+ *
+ */
+@WebService(
+ name = "IPingService",
+ targetNamespace = "http://InteropBaseAddress/interop"
+)
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public interface IPingService {
+
+ @WebMethod(operationName = "Ping", action = "http://xmlsoap.org/Ping")
+ public PingResponse ping(Ping request);
+
+ /**
+ *
+ * @param request
+ * @return
+ * returns javax.xml.bind.JAXBElement<java.lang.String>
+ */
+ @WebMethod(action = "http://InteropBaseAddress/interop/echo")
+ @WebResult(name = "echoResult", targetNamespace = "http://InteropBaseAddress/interop")
+ public EchoResponse echo(Echo request);
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/ObjectFactory.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/ObjectFactory.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/ObjectFactory.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,321 @@
+
+package org.jboss.test.ws.interop.wsse;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.datatype.Duration;
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.test.ws.interop.wsse package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _EchoRequest_QNAME = new QName("http://InteropBaseAddress/interop", "request");
+ private final static QName _EchoResponseEchoResult_QNAME = new QName("http://InteropBaseAddress/interop", "echoResult");
+ private final static QName _UnsignedInt_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedInt");
+ private final static QName _Ping_QNAME = new QName("http://xmlsoap.org/Ping", "Ping");
+ private final static QName _Long_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "long");
+ private final static QName _Float_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "float");
+ private final static QName _Double_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "double");
+ private final static QName _Decimal_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "decimal");
+ private final static QName _Boolean_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "boolean");
+ private final static QName _UnsignedShort_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedShort");
+ private final static QName _UnsignedByte_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedByte");
+ private final static QName _Short_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "short");
+ private final static QName _String_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "string");
+ private final static QName _Char_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "char");
+ private final static QName _AnyType_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "anyType");
+ private final static QName _Guid_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "guid");
+ private final static QName _AnyURI_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "anyURI");
+ private final static QName _Byte_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "byte");
+ private final static QName _DateTime_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "dateTime");
+ private final static QName _Int_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "int");
+ private final static QName _QName_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "QName");
+ private final static QName _PingResponse_QNAME = new QName("http://xmlsoap.org/Ping", "PingResponse");
+ private final static QName _Duration_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "duration");
+ private final static QName _UnsignedLong_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedLong");
+ private final static QName _Base64Binary_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "base64Binary");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.interop.wsse
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link Echo }
+ *
+ */
+ public Echo createEcho() {
+ return new Echo();
+ }
+
+ /**
+ * Create an instance of {@link Ping }
+ *
+ */
+ public Ping createPing() {
+ return new Ping();
+ }
+
+ /**
+ * Create an instance of {@link PingResponse }
+ *
+ */
+ public PingResponse createPingResponseBody() {
+ return new PingResponse();
+ }
+
+ /**
+ * Create an instance of {@link EchoResponse }
+ *
+ */
+ public EchoResponse createEchoResponse() {
+ return new EchoResponse();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://InteropBaseAddress/interop", name = "request", scope = Echo.class)
+ public JAXBElement<String> createEchoRequest(String value) {
+ return new JAXBElement<String>(_EchoRequest_QNAME, String.class, Echo.class, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://InteropBaseAddress/interop", name = "echoResult", scope = EchoResponse.class)
+ public JAXBElement<String> createEchoResponseEchoResult(String value) {
+ return new JAXBElement<String>(_EchoResponseEchoResult_QNAME, String.class, EchoResponse.class, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedInt")
+ public JAXBElement<Long> createUnsignedInt(Long value) {
+ return new JAXBElement<Long>(_UnsignedInt_QNAME, Long.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://xmlsoap.org/Ping", name = "Ping")
+ public JAXBElement<Ping> createPing(Ping value) {
+ return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "long")
+ public JAXBElement<Long> createLong(Long value) {
+ return new JAXBElement<Long>(_Long_QNAME, Long.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "float")
+ public JAXBElement<Float> createFloat(Float value) {
+ return new JAXBElement<Float>(_Float_QNAME, Float.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Double }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "double")
+ public JAXBElement<Double> createDouble(Double value) {
+ return new JAXBElement<Double>(_Double_QNAME, Double.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link BigDecimal }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "decimal")
+ public JAXBElement<BigDecimal> createDecimal(BigDecimal value) {
+ return new JAXBElement<BigDecimal>(_Decimal_QNAME, BigDecimal.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "boolean")
+ public JAXBElement<Boolean> createBoolean(Boolean value) {
+ return new JAXBElement<Boolean>(_Boolean_QNAME, Boolean.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedShort")
+ public JAXBElement<Integer> createUnsignedShort(Integer value) {
+ return new JAXBElement<Integer>(_UnsignedShort_QNAME, Integer.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedByte")
+ public JAXBElement<Short> createUnsignedByte(Short value) {
+ return new JAXBElement<Short>(_UnsignedByte_QNAME, Short.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "short")
+ public JAXBElement<Short> createShort(Short value) {
+ return new JAXBElement<Short>(_Short_QNAME, Short.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "string")
+ public JAXBElement<String> createString(String value) {
+ return new JAXBElement<String>(_String_QNAME, String.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "char")
+ public JAXBElement<Integer> createChar(Integer value) {
+ return new JAXBElement<Integer>(_Char_QNAME, Integer.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "anyType")
+ public JAXBElement<Object> createAnyType(Object value) {
+ return new JAXBElement<Object>(_AnyType_QNAME, Object.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "guid")
+ public JAXBElement<String> createGuid(String value) {
+ return new JAXBElement<String>(_Guid_QNAME, String.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "anyURI")
+ public JAXBElement<String> createAnyURI(String value) {
+ return new JAXBElement<String>(_AnyURI_QNAME, String.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Byte }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "byte")
+ public JAXBElement<Byte> createByte(Byte value) {
+ return new JAXBElement<Byte>(_Byte_QNAME, Byte.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "dateTime")
+ public JAXBElement<XMLGregorianCalendar> createDateTime(XMLGregorianCalendar value) {
+ return new JAXBElement<XMLGregorianCalendar>(_DateTime_QNAME, XMLGregorianCalendar.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "int")
+ public JAXBElement<Integer> createInt(Integer value) {
+ return new JAXBElement<Integer>(_Int_QNAME, Integer.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link QName }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "QName")
+ public JAXBElement<QName> createQName(QName value) {
+ return new JAXBElement<QName>(_QName_QNAME, QName.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link PingResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://xmlsoap.org/Ping", name = "PingResponse")
+ public JAXBElement<PingResponse> createPingResponse(PingResponse value) {
+ return new JAXBElement<PingResponse>(_PingResponse_QNAME, PingResponse.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Duration }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "duration")
+ public JAXBElement<Duration> createDuration(Duration value) {
+ return new JAXBElement<Duration>(_Duration_QNAME, Duration.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedLong")
+ public JAXBElement<BigInteger> createUnsignedLong(BigInteger value) {
+ return new JAXBElement<BigInteger>(_UnsignedLong_QNAME, BigInteger.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "base64Binary")
+ public JAXBElement<byte[]> createBase64Binary(byte[] value) {
+ return new JAXBElement<byte[]>(_Base64Binary_QNAME, byte[].class, null, ((byte[]) value));
+ }
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Ping.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Ping.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/Ping.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,115 @@
+
+package org.jboss.test.ws.interop.wsse;
+
+import javax.xml.bind.annotation.*;
+
+
+/**
+ * <p>Java class for ping complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ping">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="scenario" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="origin" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="text" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ping", propOrder = {
+ "scenario",
+ "origin",
+ "text"
+})
+public class Ping {
+
+ @XmlElement(namespace = "http://xmlsoap.org/Ping", nillable = true)
+ protected String scenario;
+ @XmlElement(namespace = "http://xmlsoap.org/Ping", nillable = true)
+ protected String origin;
+ @XmlElement(namespace = "http://xmlsoap.org/Ping", nillable = true)
+ protected String text;
+
+ /**
+ * Gets the value of the scenario property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScenario() {
+ return scenario;
+ }
+
+ /**
+ * Sets the value of the scenario property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScenario(String value) {
+ this.scenario = value;
+ }
+
+ /**
+ * Gets the value of the origin property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getOrigin() {
+ return origin;
+ }
+
+ /**
+ * Sets the value of the origin property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setOrigin(String value) {
+ this.origin = value;
+ }
+
+ /**
+ * Gets the value of the text property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * Sets the value of the text property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setText(String value) {
+ this.text = value;
+ }
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingResponse.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingResponse.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingResponse.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,115 @@
+
+package org.jboss.test.ws.interop.wsse;
+
+import javax.xml.bind.annotation.*;
+
+
+/**
+ * <p>Java class for PingResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="PingResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="scenario" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="origin" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="text" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PingResponse", propOrder = {
+ "scenario",
+ "origin",
+ "text"
+})
+public class PingResponse {
+
+ @XmlElement(namespace = "http://xmlsoap.org/Ping", nillable = true)
+ protected String scenario;
+ @XmlElement(namespace = "http://xmlsoap.org/Ping", nillable = true)
+ protected String origin;
+ @XmlElement(namespace = "http://xmlsoap.org/Ping", nillable = true)
+ protected String text;
+
+ /**
+ * Gets the value of the scenario property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScenario() {
+ return scenario;
+ }
+
+ /**
+ * Sets the value of the scenario property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScenario(String value) {
+ this.scenario = value;
+ }
+
+ /**
+ * Gets the value of the origin property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getOrigin() {
+ return origin;
+ }
+
+ /**
+ * Sets the value of the origin property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setOrigin(String value) {
+ this.origin = value;
+ }
+
+ /**
+ * Gets the value of the text property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * Sets the value of the text property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setText(String value) {
+ this.text = value;
+ }
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingService10.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingService10.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/PingService10.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,55 @@
+
+package org.jboss.test.ws.interop.wsse;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+
+/**
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.0-b26-ea3
+ * Generated source version: 2.0
+ *
+ */
+@WebServiceClient(name = "PingService10", targetNamespace = "http://tempuri.org/", wsdlLocation = "WEB-INF/wsdl/WsSecurity10.wsdl")
+public class PingService10
+ extends Service
+{
+
+ private final static URL WSDL_LOCATION;
+ private final static QName PINGSERVICE10 = new QName("http://tempuri.org/", "PingService10");
+ private final static QName MUTUALCERTIFICATE10IPINGSERVICE = new QName("http://tempuri.org/", "MutualCertificate10_IPingService");
+
+ static {
+ URL url = null;
+ try {
+ url = new URL("file:/home/hbraun/dev/prj/jbossws/trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public PingService10(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public PingService10() {
+ super(WSDL_LOCATION, PINGSERVICE10);
+ }
+
+ /**
+ *
+ * @return
+ * returns IPingService
+ */
+ @WebEndpoint(name = "MutualCertificate10_IPingService")
+ public IPingService getMutualCertificate10IPingService() {
+ return (IPingService)super.getPort(MUTUALCERTIFICATE10IPINGSERVICE, IPingService.class);
+ }
+
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.interop.wsse;
+
+import junit.framework.Test;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * @author Heiko Braun, <heiko(a)openj.net>
+ * @since 07-Mar-2006
+ */
+public class SignTestCase extends AbstractWSSEBase {
+
+ public static Test suite()
+ {
+ prepareClientClasspath("jbossws-interop-wsse10Sign-client.jar");
+ return JBossWSTestSetup.newTestSetup(SignTestCase.class, "jbossws-interop-wsse10Sign.war");
+ }
+
+ String getEndpointURL() {
+ return "http://"+getServerHost()+":8080//wsse10Sign/endpoint";
+ }
+
+ // Scenario 3.2. X509 Mutual Authentication, Sign Only
+ public void testSignOnly() throws Exception{
+
+ //
+ Ping request = new Ping();
+
+ request.setScenario("testSignOnly");
+ request.setOrigin("JBossWS");
+ request.setText("Hello World, signed");
+ port.ping(request);
+
+ Echo request2 = new Echo();
+ request2.setRequest("Hello World");
+ EchoResponse response = port.echo(request2);
+ assertNotNull(response);
+ assertEquals(response.getEchoResult(), request2.getRequest());
+ }
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/TestService.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/TestService.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/TestService.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.interop.wsse;
+
+import org.jboss.ws.annotation.EndpointConfig;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: TestService.java 1757 2006-12-22 15:40:24Z thomas.diesler(a)jboss.com $
+ * @since Aug 24, 2006
+ */
+@WebService(
+ serviceName = "PingService10",
+ name = "IPingService",
+ targetNamespace = "http://tempuri.org/",
+ endpointInterface = "org.jboss.test.ws.interop.wsse.IPingService",
+ portName = "MutualCertificate10_IPingService")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+public class TestService implements IPingService {
+
+ @WebMethod(operationName = "Ping", action = "http://xmlsoap.org/Ping")
+ public PingResponse ping(Ping request) {
+ System.out.println("Ping: "+ request.getText());
+ return new PingResponse();
+ }
+
+ @WebMethod(action = "http://InteropBaseAddress/interop/echo")
+ @WebResult(name = "echoResult", targetNamespace = "http://InteropBaseAddress/interop")
+ public EchoResponse echo(Echo request) {
+ System.out.println("Echo: " +request.getRequest());
+ EchoResponse response = new EchoResponse();
+ response.setEchoResult(request.getRequest());
+ return response;
+ }
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/package-info.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/package-info.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/package-info.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://xmlsoap.org/Ping")
+package org.jboss.test.ws.interop.wsse;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -44,7 +44,7 @@
*/
public void testSOAPMessageToEndpointQueue() throws Exception
{
- if (isTargetJBoss())
+ if (isTargetJBoss50())
{
System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk");
return;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-01-25 20:55:44 UTC (rev 2118)
@@ -23,6 +23,7 @@
import java.net.URL;
import java.util.List;
+import java.util.ArrayList;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -63,16 +64,20 @@
Service service1 = Service.create(wsdlURL, serviceName);
port1 = (StatefulEndpoint)service1.getPort(StatefulEndpoint.class);
BindingProvider bindingProvider = (BindingProvider)port1;
- List<Handler> handlerChain = bindingProvider.getBinding().getHandlerChain();
- handlerChain.add(new ClientHandler());
- handlerChain.add(new WSAddressingClientHandler());
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
+ customHandlerChain.add(new ClientHandler());
+ customHandlerChain.add(new WSAddressingClientHandler());
+ bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+
Service service2 = Service.create(wsdlURL, serviceName);
port2 = (StatefulEndpoint)service2.getPort(StatefulEndpoint.class);
bindingProvider = (BindingProvider)port2;
- handlerChain = bindingProvider.getBinding().getHandlerChain();
- handlerChain.add(new ClientHandler());
- handlerChain.add(new WSAddressingClientHandler());
+ List<Handler> customHandlerChain2 = new ArrayList<Handler>();
+ customHandlerChain2.add(new ClientHandler());
+ customHandlerChain2.add(new WSAddressingClientHandler());
+ bindingProvider.getBinding().setHandlerChain(customHandlerChain2);
+
}
}
Modified: trunk/jbossws-tests/src/main/resources/common/config/jaxws-endpoint-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/common/config/jaxws-endpoint-config.xml 2007-01-25 17:56:54 UTC (rev 2117)
+++ trunk/jbossws-tests/src/main/resources/common/config/jaxws-endpoint-config.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -27,7 +27,7 @@
<javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurityHandlerInbound</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerInbound</javaee:handler-class>
+ <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
</javaee:handler>
</javaee:handler-chain>
</pre-handler-chains>
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/jboss-wsse-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/jboss-wsse-client.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <sign type="x509v3" alias="1"/>
+ <encrypt type="x509v3" alias="1"/>
+ <requires>
+ <signature/>
+ <encryption/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,14 @@
+<client-scenarios>
+ <scenario name="default" description="Testing local WSSE endpoints">
+ <target-endpoint>http://localhost:8080/wsse10Encrypt/endpoint</target-endpoint>
+ </scenario>
+ <scenario name="debug-local" decsription="Testing local WSSE endpoints through packet logger">
+ <target-endpoint>http://localhost:8081/wsse10Encrypt/endpoint</target-endpoint>
+ </scenario>
+ <scenario name="msft-public" decsription="Testing MSFT public interop endpoints">
+ <target-endpoint>http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/...</target-endpoint>
+ </scenario>
+ <scenario name="msft-private" decsription="Testing MSFT public interop endpoints">
+ <target-endpoint>http://10.10.32.186/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/M...</target-endpoint>
+ </scenario>
+</client-scenarios>
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-web.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/wsse10Encrypt</context-root>
+</jboss-web>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-wsse-server.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-wsse-server.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/jboss-wsse-server.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,19 @@
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config
+ http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>WEB-INF/alice.jks</key-store-file>
+ <key-store-password>password</key-store-password>
+ <trust-store-file>WEB-INF/wsse10.truststore</trust-store-file>
+ <trust-store-password>password</trust-store-password>
+
+ <config>
+ <sign type="x509v3" alias="1"/>
+ <encrypt type="x509v3" alias="1"/>
+ <requires>
+ <signature/>
+ <encryption/>
+ </requires>
+ </config>
+
+</jboss-ws-security>
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/encrypt/WEB-INF/web.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>wsse10EncryptTestService App</display-name>
+
+ <servlet>
+ <servlet-name>EncryptEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.interop.wsse.TestService</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>EncryptEndpoint</servlet-name>
+ <url-pattern>/endpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Alice.cer
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Alice.cer (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Alice.cer 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,17 @@
+0� 0��3��Uc �g!�P��0
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test CA0
+050319000000Z
+180319235959Z0B10 U
+ OASIS1 0 U OASIS Interop Test Cert10 U Alice0��0
+ *�H��
+
+%�9]r������I̤�
+���:9���
+�ۑ�I�s�ib��[JIt�mz�����P"�i�j�O����3y+,��
+�]PvuA]�� e,����1�0 U #0���(���5� ֪�� M�I0
+ *�H��
+
+�wXVi
+,�|h#PL�#$/-j�B���@��?�I�E�ӗG*�D/�.إ��a��K� ������ߖ�)�����,]e�� T�3@��b�Qԇө����� ���4�dOe����=��p�#�O
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Bob.cer
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Bob.cer (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/Bob.cer 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,14 @@
+0�
+0��`8������ȝ�ӫ�q�0
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test CA0
+050319000000Z
+180319235959Z0@10 U
+ OASIS1 0 U OASIS Interop Test Cert1 0
+U Bob0��0
+ *�H��
+
+����MD
+ *�H��
+
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.cer
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.cer (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.cer 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,15 @@
+0� 0��o�:m�8du��>M��u0
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test CA0
+051027000000Z
+181027235959Z0B10 U
+ OASIS1 0 U OASIS Interop Test Cert10 U WssIP0��0
+ *�H��
+
+ �E� �=_�59 l8�}:�?���
+qji0 U #0���(���5� ֪�� M�I0
+ *�H��
+
+{��,��� �UEhm8' Y��b7*��1^��02�]I ���1�5���HR�.l�� f#�,�g��W��$��z����?��}y��۽l��z%�Sa�х&j�� �ۊ�K�B��I�F��>���iC���ɳݖ�����k̓�S���"
+3|
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.pfx
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.pfx (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/WssIP.pfx 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,36 @@
+0�~0�8 *�H��
+��)�%0�!0�: *�H��
+��+�'0�#0� *�H��
+
+���0��0
+*�H��
+ 0ℏ�|�1n
+����eh4 �(*g}�o
+��P���-��i(�@���սj$� � eU��}����<O��P%�=��C�4��2U��kł�
+���l{��Z����Q���T�Ma>��pٳ�i��)�;!z� P9WH�V�Qsa�t��th��i�$Ugp�
+j1�#�*�G=t��&���=���+�=�4��qq�@id��^�?Ť��0�Yj��
+i:j��[w�x��@< 1f0 *�H��
+ 1
+ 1B @
+�� �0� �
+0
+*�H��
+ 0���E$��
+�B�>�~F� �U��-.��Q�Q����
+�y�:\���\���iQ��춪to�
+�
+
+�8kmH&�e3Z�)
+����e!��D��{�f���i��ӥ�j�p9��FТ����o<7��/�"�ø�^ ���m6�y��� R
+�!r�j� ��m_��r��+y��Y��8o�@E��Ǫ��.PHc���$�[VCD������&�� औ��PSp�Xe���1�K���#�T���X��c�r�ײ��<
+��*�N�F����^�t:�=��� ��t3�~0�&��&*��Qe����(�j�ˣÙMԾ|���8�K4x��גM�� ���as���C��!,�c��.���@U�WC}m}�B��D�����C ��"|���x�������ukshkeim�4iH@V)�M퓹�59ו`d{� 1� �M@ܵ���{/۰�
+RX�@w�V "�� �a� L�< �)d �Z�ځc|� �i�6�?��ad������Z=#���C�R�R����s�<u�XצH�:@��F��,�R7+'��ߍ@C�b��a���,�n�X ��/3[��e~� {�P�֏�CTy�d.��P��+��hy^�4�=z���bIf�Hl�\*:
+iϨ:2z͌��0�!H�|2\�d�26���#G)w�)Y����4c�z!�}" /�ʛ���$ �/�s��8D��X�"9��>�0�N���8����L|ݪ�7��Vs�yh�\܇5�ן�>Ғ�����F �V�v�k��b
+����e��#� ? �v��>.t�+�#�T�����h��B"�`��k*�Ĥ��t��-���k�[㆖�~�D@� �ڙ��d ,���q=�Vjb� ��$�1W�eM
+y�C� 9�ve�˓���p23d-��`�1/���y�!����U�Tatr�5}��P.Ύ�k�Ʈ Â3�V�Uev
+@�Bt0��%8+��ט�M!�FY�{},� �N�ovQ���D ~U� ��º۠�+�~��t)CV�[��*!H��W� ��~`�Þ1�#�l+��`��� �zK �!�/?��Pv�y���fJE5�N�yf�n3_�w~�̊�Q�@�5������VSnb��ȶ�Y��EuВZe��e�� ����\��Iܤ_Q���A�� ���M�f���T�WV��
+�Z9��k�28��_
+,�)�n,}@� ,�s���S���Ao��E��i]�(�� ӌ�.ٶ=�i��iBX�r��Ž4]!8|�(1[+'��R��NY�
+Lm�Djj��-���
+�¦�S�.�. NR_�H�Z�6�8p�
+�u�� �0=0!0 +
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.jks
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.jks (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.jks 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,50 @@
+����
++*
+on�����Yf�`���^��`^� ��>�W�
+�o������D��t���-�k(]�O�����v�-ܮ;d yek<,"�NR�nS �����% �S\v�q��_)A \�-��mݚf�S��#o�S=�0/]�����䷧y�;�Z�E������mOuU�&�����؟�oJ ��^�� )��
+�T�G[qZ�\�u�LzTZ�0�� �� ����*�������
+ج���� ������A*w_��0���XK) �� �֚9��#���A �q �v�b�U���nP,�E!���F�hUd[�*Z�ܐ_@+�}W�5G�n�1'�3~��C�O#nW�}���{� lT:.�6ĭ�կ6�K�#�
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test CA0
+050319000000Z
+180319235959Z0B10 U
+ OASIS1 0 U OASIS Interop Test Cert10 U Alice0��0
+ *�H��
+
+%�9]r������I̤�
+���:9���
+�ۑ�I�s�ib��[JIt�mz�����P"�i�j�O����3y+,��
+�]PvuA]�� e,����1�0 U #0���(���5� ֪�� M�I0
+ *�H��
+
+�wXVi
+,�|h#PL�#$/-j�B���@��?�I�E�ӗG*�D/�.إ��a��K� ������ߖ�)�����,]e�� T�3@��b�Qԇө����� ���4�dOe����=��p�#�O
+0��`8������ȝ�ӫ�q�0
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test CA0
+050319000000Z
+180319235959Z0@10 U
+ OASIS1 0 U OASIS Interop Test Cert1 0
+U Bob0��0
+ *�H��
+
+����MD
+ *�H��
+
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test Root0
+050319000000Z
+190319235959Z0010 U
+ OASIS1 0 U OASIS Interop Test CA0�"0
+ *�H��
+
+�
+ɸ&j� y��خC�N�fF�����l;��F$N�d�m��`����4l�֮x�����~�T�#Ɠ �X�< dھ��,ǠX['JpD~>�΅k�j%���٪,���3�����,_��j��r-Fi
+���a��3d�Np �q7��d3�t��)��d'���Q�>����pJ�w�� �NoZ�Rg3{<ID�2ֿ� Y�o�-y ��np7aBMʅ�m�����扼a
+ *�H��
+
+�b�����i���
+ CmLU���� Yz��C�h��_sן�4�N�2f#)q#��:��Z�8ٕ�W�gX�ujAb��8 ��>��۟��瞰A�c�6�f�֢�g�V*� g�5
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.pfx
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.pfx (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/alice.pfx 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,26 @@
+0� 0�� *�H��
+�����0��0�� *�H��
+���0��
+0
+*�H��
+ 04x�i dA
+Q����v��װ
+����P����� �E��Ab�0
+�����R�' � o ���!�M�Yʅ�d*�_�Xnd�����-�� �P:���R��㦽x ���=½N�C���c�ܛ�����2�?���AE&�K j
+�aHuG m��s/�^M���%u&�kOM^��.R D��+^�.H���t�s};P�Qۜ����va�i��@+�� rN��#�
+˦j5��:b�2XR��i�n>�3�3t| �L�̀J���do2��{ �l�V
+\�ijyWTsJ��� � /�h�@m�Y-O��-JaX��xYF�dJA��Υ.��щ�sV�.3��V0��2��s�un\9eY+|׳݀�����p2G8 0V��]��ƶ
+$7 N\8
+ :j��@�Q+ZOTʨ;�4n�t�ʌs9,����F;�p�w81FV�)�f���] #-��Y�����u� A?��M%�Ej8]��;��bu[_^������|�eM� ���vЋ_���/#��v� sLU D��#��EU����-�:�u�y�#6L2;�Q����0��� �� B�x ��ғ���P����P��5]�v�ѱN�q��8*$�E���hr��ѐ���;M*a��Tx>�� �Q�!p��Y��>� ��'ђ�%H����xLW��B#�̳��_�AŶ��. �û�S�<ٰ��
+�u���nQ��\a���^�q�'s���>m\��� Ja�O���Ziz�`Y^� �$�0� c�tGH| �u"�b�X
+�����0��0�� *�H��
+
+���0��0
+*�H��
+ 0ryT��*�
+u#y�� B|
+�ڹ���ߍ�kCN�����GͅN�,�,a�%�K��=��,?g��
+�����8�(�։�s�F�%ҩH�PO��n�xX�XEK��:8'�����O �i
+C�հ����Ȏ �o�J���ERO\�G�QI�����ߥC;�X Q r@�Å]�Ԙ���z��0O��m+#Ȁ��IJ;��7w«�^�%�C�-��0Jlw5<0������7[G�HI�!��Xe�� �rV�e!*��9���̿ϱ ��Պo��H'�Pv����q ��l��
+ ��z�ڹ�Iݧ_E��*'QuN�H��S ��˫]mV�g2�&M�x'�g ��缊�=�Ƌ��m�1%0# *�H��
+ 1n��n��D�p�/`M�N�P�010!0 +
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/bob.pfx
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/bob.pfx (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/bob.pfx 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,24 @@
+0�0�� *�H��
+�����0��0�� *�H��
+���0��
+0
+*�H��
+ 0P-\X�L�
+>��R�nRIk��c�4�YB��tn%�2|k֪A���3��ԛ
+ "�R �h�;0�e뭻���G�7|\0>��{�%q��6[~��gp�9%$�e��D(<���'�$���
+�4��b�q&�����e���[a��bpnD��ϙ�Q�(P&� J�J?�������Ӧ8� ���|[I�9�� �F���9�y�Z5?��b��g4 $�
+�{�/���m@\f�4E�
+�paȼa
+���,�?�Z�D����U\��<���a�N�A��v � m�"����c)�����bGY�Ry��'얡�o,�Z͌���1 Dr��-6�u����%e綒�_H"�'`�kHA�j�n��O�]�$aȠ�����o��e���JK�� �NgP^9W����~1,�
+�]����$[�(-y�ސ�tb`˦Bw����_��uE /����ifP���� VNm�gc_G0����;���쪉�S[�{� I�CP L�|�H#�����N�1���+�)P��.ը�ϟd�[��Yq�)P���v� O;�#��(�ˉ̻@�6�y�P3H(�2������{��I��52�^'��-�L�B��^2 ,�և$�6���_P�r�@�k�_�A�u 6��Y<+S\���|���s���1;0,�m �l�+Zo��&����t������5kVH!�<b�a3J��fg���Di��+(Ā���pK}%����L M���o [��$�HZ2_i�Bt�3^����p8�p� � #��d���H[ �������)ou���U|I�ekZL �=��
+=�0�� *�H��
+�����0��0�� *�H��
+
+���0��0
+*�H��
+ 0`���eL��
+���^��mʣ�!�s(���*+J�<
+�bc� BZ�՞<K���M�h9�H$(n�ꈮF��&D��֥h���}
+.��Uf��K�.ę͕
+���YS����Gi���Wݩ#����3�3Y�:@���_r�ȡ7X�:op�$]n�i.���,�I1%0# *�H��
+ 154 �P-4/����010!0 +
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.cer
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.cer (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.cer 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,16 @@
+0��0�s�Y��E��5Ĕ�SI��ެ0
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test Root0
+050319000000Z
+190319235959Z0010 U
+ OASIS1 0 U OASIS Interop Test CA0�"0
+ *�H��
+
+�
+ɸ&j� y��خC�N�fF�����l;��F$N�d�m��`����4l�֮x�����~�T�#Ɠ �X�< dھ��,ǠX['JpD~>�΅k�j%���٪,���3�����,_��j��r-Fi
+���a��3d�Np �q7��d3�t��)��d'���Q�>����pJ�w�� �NoZ�Rg3{<ID�2ֿ� Y�o�-y ��np7aBMʅ�m�����扼a
+ *�H��
+
+�b�����i���
+ CmLU���� Yz��C�h��_sן�4�N�2f#)q#��:��Z�8ٕ�W�gX�ujAb��8 ��>��۟��瞰
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.pfx
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.pfx (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/ca.pfx 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,30 @@
+0� �0� � *�H��
+�� �� |0� x0�/ *�H��
+�� 0�
+0
+*�H��
+ 0�ڪ,D0
+�ڀ
+��ޜ��67z��ci���q;��;�q���� �A==\�V� ��e�S'��Z.��&���`�ަ{��A��,,��� ��̪Jݟ=�$ܰQ D(�"%���9�=�W@��_��L�A�$P_�O���;�S���E�[���_��O���|�z�(¦$��S��U�� -ضa Xo7���dR��
+�H���W�b ��:7f?훃���AO��ŵ�TW�� �\=�P�GU�� � XX��-� e�`R�qS�*� b
+#Av�죯 �j���=��n�qr'#
+��h���,��`�3�?#���u��� ����ӵp�]�C���bܵhte ���^TC�G.�C��{�CmU��"8Ԅ+T�s[JV H�.��HKa�VL�_W\ �:����KfΞ
+��'�;���,�~�n<�`0���`[�̈Kt"Ti2ӭ�S�]����Q ��Z�[�/�r
+�%����"f�!~o���?PI:;�� ��:��̐[cE�� ��Z�Z���u���p�VL�O�8iИ99�Ok�Χi���~c�nXy�� 1 �Fo��\#P�5V>2ed�;awa���'�oZU�rSƒdž�#�?�%�� %����P�?�X�Ċ���gp�A��.��� v- '{!���wǛ���?<�kӰ/��H4Gc*��SpP��#�88t�βر�g9��,ﯨ�N�'hdF��KY��߷� ��m�2f�ٌm���(!��O�6|9"I�!�sB`V6I�;`tO�n!e�y03l�W����x�3Pcf>�Ɲ�(��**��� �)���g�M1$�_t�WQC�}���rLg����)cݿ�
+;��/���EL��[�.���uo9��W;�oJ�N0�A *�H��
+��2�.0�*0�& *�H��
+
+���0��0
+*�H��
+ 0�f��Z�
+�r�ݑ�*�U�k#H��
+��� �^�7�� Z�[_9������ ��:^�Q��I��l��&-�{���W��tl|7x��h��@x����D��/�|&O�]��=��
+�yh
+�kh��$<L���A{��Ԛ\ǃ�����>�"Mˎ��:V��v@oJ��%����^5#�
+�t��!���'S8���
+��(eb�Sly�/�K��#^�Z�z.���]��<���Yčk\�]�L�WI 0�&���5�� x �BvlDn��.�z� e�^$�Y�=38'��.���V� �l�ls�� JL*�é}�rm��ּ��v ���ڿg
+�K?f��w��h� 'س �6��VX�~�kF`�~�1{���R�#ʷ�����&�@�،6�Xue���6
+�
+�~�ll�M�8_O<T�(P7����ͭ
+`;V��|>���
+ 1=������Fd=��K��W7010!0 +
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.cer
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.cer (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.cer 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,16 @@
+0�00��Sg�k�jD6켩�ϵ�0
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test Root0
+050319000000Z
+200319235959Z0210 U
+ OASIS1 0 U OASIS Interop Test Root0�"0
+ *�H��
+
+�
+9��j~ݡ��Gf,�!9�-��L�u��]�(d�Y�
+ *�H��
+
+����:� ��H�(`a�� �C���r ��_d`�����H�t� ��!qJ� �� �$��$oUY�Jʖ�e�OHx�"��}���L�M�p�� <s�
+I�i 6(��1
+ϴ�V(JT;}��Mu�_��T���C�`�v`&2w��c�X\yn�/:����Y�l Y���?
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.pfx
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.pfx (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/root.pfx 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,25 @@
+0� q0� 7 *�H��
+�� (� $0� 0�� *�H��
+���0��
+0
+*�H��
+ 0�d��T�y�
+�ޠ֣G]�=v��j՛hD1�m����/�!�&ǂ�G-d9�9��
+
+� �p
+�ӆp���F� ��輶��5��i
+�"�(�U�M�����ă�5�8vֹ�5�Eo�~���X��� ]c�)Mx�?�6O9��T7�
+#���jA�2�R�u����:��ˢz�P�|geP'�:� <�d�p�q .��H��� ��M�ԣ�&�1+e�U�C�^�
+��#�?�ᐍb��u��c&���G^m �y *.D(=��r��w���|��փMV�t�]�$����D��>�v(�|�: �l�0�A *�H��
+��2�.0�*0�& *�H��
+
+���0��0
+*�H��
+ 0?��b�@�
+����O�:�D�!���ud��j -�غ��#�
+���C�)� >��p�u���A��m�q�L@wS��!M�u��t�̐�G�C���lܱ���яh�az���?�� wa��:���H��s���B�*���߹�"u�436)�� "� b�So��p��͂g}z]��1�w���� =���SF�Ճ�L�Ψ�V�S��5�0Y�ƙN@����t�s̏� B�+��G�U�zq3�� �w�*�d�wg]V�-�_� � ��5- G�@en�Q&=
+u��md��K �5b�YpNp��CF!uH��,��o��ݘ�9#A��7Y�%v�++�>��1��\vA�ܾ�l�˅pf�{SW�"]i��T�����tX��I(e���)M�{�!��d��]��ٟ\�2��f@[I9�yh7W����N�xlO�G�g.������'�Űɑ0�B鏄�J_�ϋx�t���}Np2
+�D"�� � ˼&iM���Y�MiM=BMЩb�g�S%�_�^�֭�j�u� �Hۈ*�e����3�3[�+ڈ~��83B���`�.WI�+�Ny% �G�G6']B�� �Rn�e�>�L&����&��@�x����ep�i � �Β�I@&�yX�W_�P]��I��W��
+����3k�r̋}���ę�D�U�>��ŕFIt1i?�2[J���㊴�/y3'�
+ 1 "7����y�C+_�n\�010!0 +
+�e��K���Y^�r�X\
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/wsse10.truststore
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/wsse10.truststore (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/META-INF/wsse10.truststore 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,30 @@
+����
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test CA0
+050319000000Z
+180319235959Z0B10 U
+ OASIS1 0 U OASIS Interop Test Cert10 U Alice0��0
+ *�H��
+
+%�9]r������I̤�
+���:9���
+�ۑ�I�s�ib��[JIt�mz�����P"�i�j�O����3y+,��
+�]PvuA]�� e,����1�0 U #0���(���5� ֪�� M�I0
+ *�H��
+
+�wXVi
+,�|h#PL�#$/-j�B���@��?�I�E�ӗG*�D/�.إ��a��K� ������ߖ�)�����,]e�� T�3@��b�Qԇө����� ���4�dOe����=��p�#�O
+0��`8������ȝ�ӫ�q�0
+ *�H��
+
+ OASIS1 0 U OASIS Interop Test CA0
+050319000000Z
+180319235959Z0@10 U
+ OASIS1 0 U OASIS Interop Test Cert1 0
+U Bob0��0
+ *�H��
+
+����MD
+ *�H��
+
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="PingService10Sign" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsap10="http://www.w3.org/2005/08/addressing" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://InteropBaseAddress/interop" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/09/policy/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing"><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_policy"><!
wsp:ExactlyOne><wsp:All><sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:InitiatorToken><wsp:Policy><sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT..."><wsp:Policy><sp:WssX509V3Token10/></wsp:Policy></sp:X509Token></wsp:Policy></sp:InitiatorToken><sp:RecipientToken><wsp:Policy><sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never"><wsp:Policy><sp:WssX509V3Token10/></wsp:Policy></sp:X509Token></wsp:Policy></sp:RecipientToken><sp:AlgorithmSuite><wsp:Policy><sp:Basic256/></wsp:Policy></sp:AlgorithmSuite><sp:Layout><wsp:Policy><sp:Lax/></wsp:Policy></sp:Layout><sp:IncludeTimestamp/><sp:EncryptSignature/><sp:OnlySignEntireHeadersAndBody/></wsp:Policy></sp:AsymmetricBinding><sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:MustSupportRefKeyIdentifier/><sp:MustSupportRefIssuerSe!
rial/></wsp:Policy></sp:Wss10></wsp:All></wsp:ExactlyOne></wsp:Policy>
<wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:Exa!
ctlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_policy"><wsp:ExactlyOne><wsp:All><sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:ProtectionToken><wsp:Policy><sp:KerberosToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once"><wsp:Policy><sp:WssGssKerberosV5ApReqToken11/></wsp:Policy></sp:KerberosToken></wsp:Policy></sp:ProtectionToken><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite><sp:Layout><wsp:Policy><sp:Lax/></wsp:Policy></sp:Layout><sp:IncludeTimestamp/><sp:OnlySignEntireHeadersAndBody/></wsp:Policy></sp:SymmetricBinding><sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:MustSupportRefKeyIdentifier/><sp:MustSupportRefIssuerSerial/></wsp:Policy></sp:Wss10><wsap:UsingAddressing/></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><ws!
p:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/
securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="h!
ttp://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:He!
ader Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/a
ddressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="htt!
p://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_policy"><wsp:ExactlyOne><wsp:All><sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:ProtectionToken><wsp:Policy><sp:KerberosToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once"><wsp:Policy><sp:RequireDerivedKeys/><sp:WssGssKerberosV5ApReqToken11/></wsp:Policy></sp:KerberosToken></wsp:Policy></sp:ProtectionToken><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite><sp:Layout><wsp:Policy><sp:Lax/></wsp:Policy></sp:Layout><sp:IncludeTimestamp/><sp:OnlySignEntireHeadersAndBody/></wsp:Policy></sp:SymmetricBinding><sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:MustSupportRefKeyIdentifier/><sp!
:MustSupportRefIssuerSerial/></wsp:Policy></sp:Wss10><wsap:UsingAddres
sing/></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:Signed!
Parts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2!
004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.x
mlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Rep!
lyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy>
+
+ <wsdl:import namespace="http://InteropBaseAddress/interop" location="wsdl0.wsdl"/>
+ <wsdl:types/>
+
+ <wsdl:binding name="MutualCertificate10_IPingService"
+ type="i0:IPingService">
+ <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_policy"/>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="Ping">
+ <soap:operation soapAction="http://xmlsoap.org/Ping" style="document"/>
+ <wsdl:input name="PingRequest">
+ <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_Ping_Input_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="PingResponse">
+ <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_Ping_output_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="http://InteropBaseAddress/interop/echo" style="document"/>
+ <wsdl:input><wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_echo_Input_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_echo_output_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="PingService10">
+ <wsdl:port name="MutualCertificate10_IPingService" binding="tns:MutualCertificate10_IPingService">
+ <soap:address location="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10Sign...."/>
+ </wsdl:port>
+ </wsdl:service></wsdl:definitions>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/wsdl0.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/wsdl0.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/wsdl0.wsdl 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://InteropBaseAddress/interop"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:wsap10="http://www.w3.org/2005/08/addressing"
+ xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/09/policy/addressing"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract"
+ xmlns:tns="http://InteropBaseAddress/interop"
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+ xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"
+ xmlns:wsa10="http://www.w3.org/2005/08/addressing">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://InteropBaseAddress/interop/Imports">
+ <xsd:import schemaLocation="xsd0.xsd" namespace="http://xmlsoap.org/Ping"/>
+ <xsd:import schemaLocation="xsd1.xsd" namespace="http://InteropBaseAddress/interop"/>
+ <xsd:import schemaLocation="xsd2.xsd" namespace="http://schemas.microsoft.com/2003/10/Serialization/"/>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="PingRequest">
+ <wsdl:part name="Ping" element="q1:Ping" xmlns:q1="http://xmlsoap.org/Ping"/></wsdl:message>
+ <wsdl:message name="PingResponse">
+ <wsdl:part name="PingResponse" element="q2:PingResponse" xmlns:q2="http://xmlsoap.org/Ping"/></wsdl:message>
+ <wsdl:message name="IPingService_echo_InputMessage">
+ <wsdl:part name="parameters" element="tns:echo"/></wsdl:message>
+ <wsdl:message name="IPingService_echo_OutputMessage">
+ <wsdl:part name="parameters" element="tns:echoResponse"/></wsdl:message>
+
+ <wsdl:portType name="IPingService">
+ <wsdl:operation name="Ping">
+ <wsdl:input wsa:Action="http://xmlsoap.org/Ping" name="PingRequest" message="tns:PingRequest"/>
+ <wsdl:output wsa:Action="http://xmlsoap.org/Ping" name="PingResponse" message="tns:PingResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="echo">
+ <wsdl:input wsa:Action="http://InteropBaseAddress/interop/echo" message="tns:IPingService_echo_InputMessage"/>
+ <wsdl:output wsa:Action="http://InteropBaseAddress/interop/echo" message="tns:IPingService_echo_OutputMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+</wsdl:definitions>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd0.xsd
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd0.xsd (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd0.xsd 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" targetNamespace="http://xmlsoap.org/Ping" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://xmlsoap.org/Ping"><xs:element name="Ping" type="tns:ping"/><xs:complexType name="ping"><xs:sequence><xs:element minOccurs="1" maxOccurs="1" name="scenario" nillable="true" type="xs:string"/><xs:element minOccurs="1" maxOccurs="1" name="origin" nillable="true" type="xs:string"/><xs:element minOccurs="1" maxOccurs="1" name="text" nillable="true" type="xs:string"/></xs:sequence></xs:complexType><xs:element name="PingResponse" type="tns:PingResponseBody"/><xs:complexType name="PingResponseBody"><xs:sequence><xs:element minOccurs="1" maxOccurs="1" name="scenario" nillable="true" type="xs:string"/><xs:element minOccurs="1" maxOccurs="1" name="origin" nillable="true" type="xs:string"/><xs:element minOccurs="1" maxOccurs="1" name="text" nillable="true" type="xs:string"/></xs:sequence></xs:complexType></xs:schema>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd1.xsd
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd1.xsd (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd1.xsd 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" targetNamespace="http://InteropBaseAddress/interop" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://InteropBaseAddress/interop"><xs:element name="echo"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="request" nillable="true" type="xs:string"/></xs:sequence></xs:complexType></xs:element><xs:element name="echoResponse"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="echoResult" nillable="true" type="xs:string"/></xs:sequence></xs:complexType></xs:element></xs:schema>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd2.xsd
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd2.xsd (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/shared/WEB-INF/wsdl/xsd2.xsd 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified"
+ targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/">
+ <xs:element name="anyType" nillable="true" type="xs:anyType"/>
+ <xs:element name="anyURI" nillable="true" type="xs:anyURI"/>
+ <xs:element name="base64Binary" nillable="true" type="xs:base64Binary"/>
+ <xs:element name="boolean" nillable="true" type="xs:boolean"/>
+ <xs:element name="byte" nillable="true" type="xs:byte"/>
+ <xs:element name="dateTime" nillable="true" type="xs:dateTime"/>
+ <xs:element name="decimal" nillable="true" type="xs:decimal"/>
+ <xs:element name="double" nillable="true" type="xs:double"/>
+ <xs:element name="float" nillable="true" type="xs:float"/>
+ <xs:element name="int" nillable="true" type="xs:int"/>
+ <xs:element name="long" nillable="true" type="xs:long"/>
+ <xs:element name="QName" nillable="true" type="xs:QName"/>
+ <xs:element name="short" nillable="true" type="xs:short"/>
+ <xs:element name="string" nillable="true" type="xs:string"/>
+ <xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte"/>
+ <xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt"/>
+ <xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong"/>
+ <xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort"/>
+ <xs:element name="char" nillable="true" type="tns:char"/>
+ <xs:simpleType name="char"><xs:restriction base="xs:int"/></xs:simpleType>
+ <xs:element name="duration" nillable="true" type="tns:duration"/><xs:simpleType name="duration"><xs:restriction base="xs:duration"><xs:pattern value="\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?"/><xs:minInclusive value="-P10675199DT2H48M5.4775808S"/><xs:maxInclusive value="P10675199DT2H48M5.4775807S"/></xs:restriction></xs:simpleType><xs:element name="guid" nillable="true" type="tns:guid"/><xs:simpleType name="guid"><xs:restriction base="xs:string"><xs:pattern value="[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}"/></xs:restriction></xs:simpleType><xs:attribute name="FactoryType" type="xs:QName"/></xs:schema>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/jboss-wsse-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/jboss-wsse-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/jboss-wsse-client.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <sign type="x509v3" alias="1"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,17 @@
+<client-scenarios>
+ <scenario name="default" description="Testing local WSA endpoints">
+ <target-endpoint>http://localhost:8080/wsse10Sign/endpoint</target-endpoint>
+ </scenario>
+ <scenario name="debug-local" description="Testing local WSA endpoints">
+ <target-endpoint>http://localhost:8081/wsse10Sign/endpoint</target-endpoint>
+ </scenario>
+ <scenario name="msft-public" decsription="Testing MSFT public interop endpoints">
+ <target-endpoint>http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10Sign....</target-endpoint>
+ </scenario>
+ <scenario name="msft-private" decsription="Testing MSFT public interop endpoints">
+ <target-endpoint>http://10.10.32.186/Security_WsSecurity_Service_Indigo/WsSecurity10Sign.s...</target-endpoint>
+ </scenario>
+ <scenario name="msft-public-debug" decsription="Testing MSFT public interop endpoints">
+ <target-endpoint>http://localhost:8081/Security_WsSecurity_Service_Indigo/WsSecurity10Sign...</target-endpoint>
+ </scenario>
+</client-scenarios>
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-web.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/wsse10Sign</context-root>
+</jboss-web>
\ No newline at end of file
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-wsse-server.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-wsse-server.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/jboss-wsse-server.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,17 @@
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config
+ http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>WEB-INF/alice.jks</key-store-file>
+ <key-store-password>password</key-store-password>
+ <trust-store-file>WEB-INF/wsse10.truststore</trust-store-file>
+ <trust-store-password>password</trust-store-password>
+
+ <config>
+ <sign type="x509v3" alias="1"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+
+</jboss-ws-security>
Added: trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/interop/wsse/sign/WEB-INF/web.xml 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>wsse10SignTestService App</display-name>
+
+ <servlet>
+ <servlet-name>SignEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.interop.wsse.TestService</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SignEndpoint</servlet-name>
+ <url-pattern>/endpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt (from rev 2109, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt)
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt (rev 0)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt 2007-01-25 20:55:44 UTC (rev 2118)
@@ -0,0 +1,16 @@
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxws/benchmark/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# EJB3 excludes
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/eardeployment/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/jbws981/**
+org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/xop/**
17 years, 9 months
- 1
- 0
JBossWS SVN: r2117 - in branches/jbossws-1.2.0: jbossws-core/src/main/resources/samples/common and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 12:56:54 -0500 (Thu, 25 Jan 2007)
New Revision: 2117
Added:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt
Modified:
branches/jbossws-1.2.0/build/ant-import/build-samples.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml
Log:
Fix tomcat samples build
Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-25 17:29:05 UTC (rev 2116)
+++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-25 17:56:54 UTC (rev 2117)
@@ -67,6 +67,7 @@
</copy>
<copy todir="${build.src.samples.dir}/common/resources">
<fileset dir="${core.samples.dir}/common">
+ <include name="tests-*-excludes.txt"/>
<include name="jndi.properties"/>
<include name="log4j.xml"/>
</fileset>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 17:29:05 UTC (rev 2116)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 17:56:54 UTC (rev 2117)
@@ -71,6 +71,7 @@
<pathelement location="${lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${lib.dir}/jboss-saaj.jar"/>
<pathelement location="${lib.dir}/jbossws-client.jar"/>
+ <pathelement location="${lib.dir}/jbossws-tomcat-integration.jar"/>
</path>
<path id="compile.classpath">
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 17:29:05 UTC (rev 2116)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 17:56:54 UTC (rev 2117)
@@ -37,19 +37,19 @@
</condition>
<!-- Integration Target Server -->
- <condition property="jbossws.integration.target.jboss">
+ <condition property="integration.target.jboss">
<isset property="jboss.home"/>
</condition>
- <condition property="jbossws.integration.target.tomcat">
+ <condition property="integration.target.tomcat">
<equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
</condition>
<!-- Java Endorsed -->
<condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
- <isset property="jbossws.integration.target.jboss"/>
+ <isset property="integration.target.jboss"/>
</condition>
<condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed">
- <isset property="jbossws.integration.target.tomcat"/>
+ <isset property="integration.target.tomcat"/>
</condition>
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
@@ -112,7 +112,7 @@
</target>
<!-- Check JBoss -->
- <target name="check-jboss">
+ <target name="check-jboss" if="integration.target.jboss">
<available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/>
<fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/>
@@ -123,15 +123,19 @@
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
+ <!-- Define excluded tests -->
+ <property name="excludes-short-name" value="tests-jboss-excludes.txt"/>
+ <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/>
+
</target>
<!-- Check tomcat -->
- <target name="check-tomcat" if="jbossws.integration.target.tomcat">
+ <target name="check-tomcat" if="integration.target.tomcat">
<available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
<condition property="cannot.use.tomcat">
<and>
- <isset property="jbossws.integration.target.tomcat"/>
+ <isset property="integration.target.tomcat"/>
<not>
<isset property="tomcat.available"/>
</not>
@@ -139,12 +143,16 @@
</condition>
<fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/>
+ <!-- Define excluded tests -->
+ <property name="excludes-short-name" value="tests-tomcat-excludes.txt"/>
+ <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/>
+
</target>
<!-- Compile the java sources -->
<target name="compile" depends="init,thirdparty"
description="compile the sources">
- <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
+ <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on" excludesfile="${excludesfile}">
<src path="${common.java}"/>
<src path="${java.dir}"/>
</javac>
Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt (rev 0)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt 2007-01-25 17:56:54 UTC (rev 2117)
@@ -0,0 +1,2 @@
+
+# Nothing to exclude
Property changes on: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt (rev 0)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt 2007-01-25 17:56:54 UTC (rev 2117)
@@ -0,0 +1,16 @@
+
+# EJB/Injection excludes
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.*
+org/jboss/test/ws/jaxws/samples/jsr181ejb/**
+org/jboss/test/ws/jaxws/samples/retail/**
+
+# JBoss excludes
+org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/**
+
+# TODO: Why are these excluded
+# [JBWS-1471] - Remove unwanted tomcat excludes
+org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
+org/jboss/test/ws/jaxws/samples/wseventing/**
Property changes on: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 9 months
- 1
- 0