[jbossws-commits] JBossWS SVN: r3803 - in trunk: build/hudson/hudson-home/jobs/AS-4.0 and 33 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Jul 5 13:20:59 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-07-05 13:20:58 -0400 (Thu, 05 Jul 2007)
New Revision: 3803
Added:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
Removed:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
Modified:
trunk/build/ant-import/build-release.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/hudson/hudson-home/jobs/AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/etc/default.mf
trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.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/config/EndpointFeature.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-client-config.xml
trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-endpoint-config.xml
trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-client-config.xml
trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
Log:
Use generic AS checkout names
Update wsdl4j and jbossxb for 4.0.5 installations
[JBWS-771] Use part names that are friendly to .NET
Remove jbossws-integration.jar when installing the WSF
Adapt EJB3 meta databefore EJB21. Errorneously both may exist
Use DeploymentInfo.localURL as root file - catches expanded war file structures
The root file (UnifiedVirtualFile) for servlet service-ref clients didn't point to the expanded war structure
Add @EndpointConfig(configName = .NET friendly Endpoint)
svn merge -r3779:3801 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/ant-import/build-release.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -19,18 +19,18 @@
<echo message="*"/>
<echo message="* Almost there, please do these steps manually"/>
<echo message="*"/>
- <echo message="* 1) Create SVN tag: jbossws-${version.id}"/>
- <echo message="* 2) Update portal-content/project.xml"/>
- <echo message="* 3) Update portal-content/counter.xml"/>
- <echo message="* 4) Update news in portal-content/freezone/projectDescription.html"/>
- <echo message="* 5) Verify release notes and install instructions"/>
- <echo message="* 6) Publish the interop endpoints (ant -f jboss-tests/build.xml publish-interop-endpoints)"/>
- <echo message="* 7) Commit the portal-content"/>
- <echo message="* 8) Commit the repository jars"/>
- <echo message="* 9) Write a sticky post on the user forum"/>
- <echo message="* 10) Release the jbossws-${version.id} version in JIRA"/>
- <echo message="* 11) Post a message to jbossws-announce at lists.jboss.org"/>
- <echo message="* 12) Post a message to thecore at jboss.org"/>
+ <echo message="* - Create SVN tag: jbossws-${version.id}"/>
+ <echo message="* - Update portal-content/project.xml"/>
+ <echo message="* - Update portal-content/counter.xml"/>
+ <echo message="* - Update news in portal-content/freezone/projectDescription.html"/>
+ <echo message="* - Verify release notes and install instructions"/>
+ <echo message="* - Publish the interop endpoints (ant -f jboss-tests/build.xml publish-interop-endpoints)"/>
+ <echo message="* - Commit the portal-content"/>
+ <echo message="* - Commit the repository jars"/>
+ <echo message="* - Write a sticky post on the user forum"/>
+ <echo message="* - Release the jbossws-${version.id} version in JIRA"/>
+ <echo message="* - Post a message to jbossws-announce at lists.jboss.org"/>
+ <echo message="* - Post a message to thecore at jboss.org"/>
<echo message="*"/>
<echo message="*********************************************"/>
</target>
Modified: trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -6,8 +6,7 @@
#
# Module settings
#
-MODULE=AS-4.0
-SVNBASE=`basename @hudson.jboss40.url@`
+SVNBASE=JBossAS-4.0
#
# checkout with an explicit version
@@ -50,7 +49,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss40.url@</remote>
- <local>Branch_4_0</local>
+ <local>JBossAS-4.0</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -6,8 +6,7 @@
#
# Module settings
#
-MODULE=AS-4.2
-SVNBASE=`basename @hudson.jboss42.url@`
+SVNBASE=JBossAS-4.2
#
# checkout with an explicit version
@@ -50,7 +49,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss42.url@</remote>
- <local>Branch_4_2</local>
+ <local>JBossAS-4.2</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -6,8 +6,7 @@
#
# Module settings
#
-MODULE=AS-5.0
-SVNBASE=`basename @hudson.jboss50.url@`
+SVNBASE=JBossAS-5.0
#
# checkout with an explicit version
@@ -23,7 +22,7 @@
#
cd $SVNBASE
rm -rf thirdparty/*
-ant -f ./build/build.xml clean main
+./build/build.sh clean main
#
# Verify build
@@ -50,7 +49,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss50.url@</remote>
- <local>trunk</local>
+ <local>JBossAS-5.0</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, AS-Tests-AS-4.0</childProjects>
+ <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40"
#
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build at -ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build at -ejb3
JBOSS_INSTANCE=$JBOSS40_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build at -ejb3
JBOSS_INSTANCE=$JBOSS42_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build at -ejb3
JBOSS_INSTANCE=$JBOSS50_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build at -ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -117,13 +117,13 @@
udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di);
udi.webappURL = udi.url;
}
+ else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3)
+ {
+ udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
+ }
else if (di.metaData instanceof ApplicationMetaData)
{
udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di);
}
- else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3)
- {
- udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
- }
}
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -54,7 +54,7 @@
public Deployment createDeployment(DeploymentInfo unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new URLLoaderAdapter(unit.url));
+ dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
dep.setClassLoader(unit.annotationsCl);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -60,7 +60,7 @@
public Deployment createDeployment(DeploymentInfo unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new URLLoaderAdapter(unit.url));
+ dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
dep.setClassLoader(unit.annotationsCl);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -55,7 +55,7 @@
public Deployment createDeployment(DeploymentInfo unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new URLLoaderAdapter(unit.url));
+ dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
dep.setClassLoader(unit.annotationsCl);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -59,7 +59,7 @@
public Deployment createDeployment(DeploymentInfo unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new URLLoaderAdapter(unit.url));
+ dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
dep.setClassLoader(unit.annotationsCl);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -109,13 +109,13 @@
udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit);
udi.webappURL = udi.vfRoot.toURL();
}
+ else if (unit.getAttachment(Ejb3Deployment.class) != null)
+ {
+ udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
+ }
else if (unit.getAttachment(ApplicationMetaData.class) != null)
{
udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit);
}
- else if (unit.getAttachment(Ejb3Deployment.class) != null)
- {
- udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
- }
}
}
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -13,384 +13,399 @@
<project>
- <!-- ================================================================== -->
- <!-- Deployment JBossWS/Native -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Deployment JBossWS/Native -->
+ <!-- ================================================================== -->
- <macrodef name="macro-deploy-native50">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <macrodef name="macro-deploy-native50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="policy.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
- <!-- SERVER JARS -->
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
- <macrodef name="macro-undeploy-native50">
- <sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss50.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss50.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-jboss50.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
+ <!-- SERVER JARS -->
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
- <!-- SERVER JARS -->
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-jboss50.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
- <macrodef name="macro-deploy-native42">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <macrodef name="macro-undeploy-native50">
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="policy.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss50.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss50.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
- <macrodef name="macro-undeploy-native42">
- <sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss42.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss42.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-jboss42.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
- <!-- SERVER JARS -->
- <fileset dir="${jboss42.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-jboss42.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <macrodef name="macro-deploy-native42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <macrodef name="macro-deploy-native40">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss40.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss40.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="policy.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
- <!-- SERVER JARS -->
- <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss40.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
+ <!-- SERVER JARS -->
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
- <macrodef name="macro-setup-native40-no-ejb3">
- <sequential>
+ <macrodef name="macro-undeploy-native42">
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <delete>
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss42.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss42.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
- </sequential>
- </macrodef>
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss42.home}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
- <macrodef name="macro-undeploy-native40">
- <sequential>
- <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss40.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss40.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-jboss40.jar"/>
- <include name="policy.jar"/>
- <include name="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jbossws14-client.jar"/>
- </fileset>
+ <macrodef name="macro-deploy-native40">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
- <!-- SERVER JARS -->
- <fileset dir="${jboss40.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
- <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-jboss40.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <!-- Remove only, do not deploy -->
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
- <macrodef name="macro-deploy-endorsed">
- <attribute name="jbosshome"/>
- <attribute name="corelibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
- <!-- Undeploy API jars from lib/endorsed -->
- <macrodef name="macro-undeploy-endorsed">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <fileset dir="@{jbosshome}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
+ <copy todir="${jboss40.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss40.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ </copy>
+
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-setup-native40-no-ejb3">
+ <sequential>
+
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
+
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native40">
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss40.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss40.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss40.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ <include name="jbossws14-client.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss40.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss40.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <!-- Remove only, do not deploy -->
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
+ <macrodef name="macro-deploy-endorsed">
+ <attribute name="jbosshome"/>
+ <attribute name="corelibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy API jars from lib/endorsed -->
+ <macrodef name="macro-undeploy-endorsed">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <fileset dir="@{jbosshome}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
</project>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/native/build.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -131,11 +131,10 @@
<!-- Build jbossws-native50.sar -->
<jar jarfile="${native.output.lib.dir}/jbossws-native50.sar" manifest="${native.output.etc.dir}/default.mf">
- <!-- [JBAS-4379] MC beans deployed twice because of jacc service
+ <!-- [JBAS-4379] MC beans deployed twice because of jacc service -->
<fileset dir="${native.output.lib.dir}">
<include name="jbossws-context.war/**"/>
</fileset>
- -->
<fileset dir="${core.dir}/output/lib">
<include name="jbossws-core.jar"/>
</fileset>
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -163,6 +163,14 @@
ServletInputStream in = req.getInputStream();
ServletOutputStream out = res.getOutputStream();
+
+ ClassLoader classLoader = endpoint.getService().getDeployment().getClassLoader();
+ if (classLoader == null)
+ throw new IllegalStateException("Deployment has no classloader associated");
+
+ // Set the thread context class loader
+ ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(classLoader);
try
{
ServletRequestContext reqContext = new ServletRequestContext(context, req, res);
@@ -174,6 +182,9 @@
}
finally
{
+ // Reset the thread context class loader
+ Thread.currentThread().setContextClassLoader(ctxClassLoader);
+
try
{
out.close();
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -119,16 +119,24 @@
</classes>
</war>
- <!-- 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-jbws771 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws771.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws771/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws771/*TestCase.class"/>
+ </fileset>
+ </jar>
+
+ <!-- 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">
@@ -186,17 +194,32 @@
</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-jbws1283 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>
+ </fileset>
+ </jar>
+ <!-- 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-jbws1422 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1422/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1422/*TestCase.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws1446 -->
<jar jarfile="${tests.output.dir}/libs/jaxws-jbws1446.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -204,6 +227,14 @@
</fileset>
</jar>
+ <!-- jaxws-jbws1505 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1505/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1505/*TestCase.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws1529 -->
<war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -22,8 +22,8 @@
<property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>
<!--
- Init the various classpaths
- -->
+ Init the various classpaths
+ -->
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/build.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -166,10 +166,7 @@
<include name="ws*.sh"/>
</fileset>
<metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
- <metainf dir="${core.resources.dir}/standard-config">
- <include name="standard-jaxrpc-client-config.xml"/>
- <include name="standard-jaxws-client-config.xml"/>
- </metainf>
+ <metainf dir="${core.resources.dir}/standard-config"/>
</jar>
<!-- Build jbossws-core-scripts.zip -->
Modified: trunk/jbossws-core/src/main/etc/default.mf
===================================================================
--- trunk/jbossws-core/src/main/etc/default.mf 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/etc/default.mf 2007-07-05 17:20:58 UTC (rev 3803)
@@ -10,4 +10,4 @@
Implementation-Vendor-Id: @implementation.vendor.id@
Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar jboss-saaj.jar
activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar
- mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar wsdl4j.jar
+ mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -24,6 +24,9 @@
// $Id$
import java.lang.reflect.AnnotatedElement;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.io.File;
import javax.naming.Context;
import javax.naming.NamingException;
@@ -31,11 +34,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxrpc.client.ServiceRefHandlerJAXRPC;
import org.jboss.ws.core.jaxws.client.ServiceRefHandlerJAXWS;
-import org.jboss.ws.integration.ServiceRefElement;
-import org.jboss.ws.integration.ServiceRefHandler;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.ws.integration.*;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
+import org.jboss.ws.WSException;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
@@ -67,6 +68,37 @@
return;
}
+ // In case of an .war deployment the associated root file doesn't point to
+ // the expanded war file structure and thus breaks service-ref usage for servlet clients.
+ // This needs to be fixed in org.jboss.web.AbstractWebDeployer (JBOSS_AS/server module)
+ if(vfsRoot instanceof URLLoaderAdapter)
+ {
+ URLLoaderAdapter ula = (URLLoaderAdapter)vfsRoot;
+ URL rootURL = ula.toURL();
+ if("file".equals( rootURL.getProtocol()) && rootURL.getFile().endsWith(".war") )
+ {
+ String fileName = rootURL.getFile();
+
+ if( ! new File(fileName).exists() ) // might be an exploded directory
+ {
+ // There is a filename convention for exploded directories
+ fileName = fileName.substring(0, fileName.indexOf(".war")) + "-exp.war";
+
+ File expandedDirectory = new File(fileName);
+ if(! expandedDirectory.exists())
+ throw new WSException("Failed to bind service-ref, the deployment root expandedDirectory doesn't exist: " + fileName);
+
+ // update the rootFile
+ try
+ {
+ vfsRoot = new URLLoaderAdapter(expandedDirectory.toURL());
+ }
+ catch (MalformedURLException e){}
+ }
+
+ }
+ }
+
UnifiedServiceRefMetaData serviceRef = (UnifiedServiceRefMetaData)sref;
serviceRef.setVfsRoot(vfsRoot);
try
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-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -111,6 +111,7 @@
ServerEndpointMetaData sepMetaData = result.sepMetaData;
ServiceMetaData serviceMetaData = result.serviceMetaData;
+ serviceMetaData.setWsdlLocation(result.wsdlLocation);
Class<?> seiClass = result.epClass;
sepMetaData.setLinkName(linkName);
@@ -119,9 +120,7 @@
// Assign the WS-Security configuration,
WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance();
- WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(
- wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME
- );
+ WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME);
serviceMetaData.setSecurityConfiguration(securityConfiguration);
// Process an optional @SOAPBinding annotation
@@ -130,8 +129,10 @@
// Process an optional @BindingType annotation
processBindingType(sepMetaData, seiClass);
+ // process config
+ processEndpointConfig(udi, sepClass, linkName, sepMetaData);
+
// Process web methods
- if(result.wsdlLocation!=null) serviceMetaData.setWsdlLocation(result.wsdlLocation);
processWebMethods(sepMetaData, seiClass);
// Init the transport guarantee
@@ -140,7 +141,7 @@
// Initialize types
createJAXBContext(sepMetaData);
populateXmlTypes(sepMetaData);
-
+
//Process an optional @PolicyAttachment annotation
if (sepClass.isAnnotationPresent(PolicyAttachment.class))
{
@@ -162,9 +163,6 @@
JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
serviceMetaData.getTypesMetaData().setSchemaModel(schemaModel);
- // process config
- processEndpointConfig(udi, sepClass, linkName, sepMetaData);
-
// Note, that @WebContext needs to be defined on the endpoint not the SEI
processWebContext(udi, sepClass, linkName, sepMetaData);
@@ -215,38 +213,38 @@
private void processWSDDContribution(ServerEndpointMetaData sepMetaData)
{
WebservicesMetaData webservices = WebservicesFactory.loadFromVFSRoot(sepMetaData.getRootFile());
- if(webservices!=null)
+ if (webservices != null)
{
- for(WebserviceDescriptionMetaData wsDesc : webservices.getWebserviceDescriptions())
+ for (WebserviceDescriptionMetaData wsDesc : webservices.getWebserviceDescriptions())
{
- for(PortComponentMetaData portComp : wsDesc.getPortComponents())
+ for (PortComponentMetaData portComp : wsDesc.getPortComponents())
{
// We match portComp's by SEI first and portQName second
// In the first case the portComp may override the portQName that derives from the annotation
String portCompSEI = portComp.getServiceEndpointInterface();
boolean doesMatch = portCompSEI != null ? portCompSEI.equals(sepMetaData.getServiceEndpointInterfaceName()) : false;
- if(!doesMatch)
+ if (!doesMatch)
{
doesMatch = portComp.getWsdlPort().equals(sepMetaData.getPortName());
}
- if(doesMatch)
+ if (doesMatch)
{
log.debug("Processing 'webservices.xml' contributions on EndpointMetaData");
// PortQName overrides
- if(portComp.getWsdlPort()!=null)
+ if (portComp.getWsdlPort() != null)
{
log.debug("Override EndpointMetaData portName " + sepMetaData.getPortName() + " with " + portComp.getWsdlPort());
sepMetaData.setPortName(portComp.getWsdlPort());
- }
+ }
// HandlerChain contributions
UnifiedHandlerChainsMetaData chainWrapper = portComp.getHandlerChains();
- if(chainWrapper!=null)
+ if (chainWrapper != null)
{
- for(UnifiedHandlerChainMetaData handlerChain : chainWrapper.getHandlerChains())
+ for (UnifiedHandlerChainMetaData handlerChain : chainWrapper.getHandlerChains())
{
for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
{
@@ -258,14 +256,14 @@
}
// MTOM settings
- if(portComp.isEnableMtom())
+ if (portComp.isEnableMtom())
{
log.debug("Enabling MTOM");
String bindingId = sepMetaData.getBindingId();
- if(bindingId.equals(Constants.SOAP11HTTP_BINDING))
+ if (bindingId.equals(Constants.SOAP11HTTP_BINDING))
sepMetaData.setBindingId(Constants.SOAP11HTTP_MTOM_BINDING);
- else if(bindingId.equals(Constants.SOAP12HTTP_BINDING))
+ else if (bindingId.equals(Constants.SOAP12HTTP_BINDING))
sepMetaData.setBindingId(Constants.SOAP12HTTP_MTOM_BINDING);
}
@@ -369,8 +367,8 @@
}
else
{
- WSDLDefinitions wsdlDefinitions = generator.generate(serviceMetaData);
- writeWsdl(serviceMetaData,wsdlDefinitions,epMetaData);
+ WSDLDefinitions wsdlDefinitions = generator.generate(serviceMetaData);
+ writeWsdl(serviceMetaData, wsdlDefinitions, epMetaData);
}
}
catch (RuntimeException rte)
@@ -382,12 +380,11 @@
throw new WSException("Cannot write generated wsdl", e);
}
}
-
-
+
private void writeWsdl(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, EndpointMetaData epMetaData) throws IOException
{
// The RI uses upper case, and the TCK expects it, so we just mimic this even though we don't really have to
- String wsdlName = ToolsUtils.firstLetterUpperCase(serviceMetaData.getServiceName().getLocalPart());
+ String wsdlName = ToolsUtils.firstLetterUpperCase(serviceMetaData.getServiceName().getLocalPart());
// Ensure that types are only in the interface qname
wsdlDefinitions.getWsdlTypes().setNamespace(epMetaData.getPortTypeName().getNamespaceURI());
@@ -400,14 +397,15 @@
}
else
{
- dir = IOUtils.createTempDirectory();
+ dir = IOUtils.createTempDirectory();
wsdlFile = File.createTempFile(wsdlName, ".wsdl", dir);
wsdlFile.deleteOnExit();
}
message(wsdlFile.getName());
Writer writer = IOUtils.getCharsetFileWriter(wsdlFile, Constants.DEFAULT_XML_CHARSET);
- new WSDLWriter(wsdlDefinitions).write(writer, Constants.DEFAULT_XML_CHARSET, new WSDLWriterResolver() {
+ new WSDLWriter(wsdlDefinitions).write(writer, Constants.DEFAULT_XML_CHARSET, new WSDLWriterResolver()
+ {
public WSDLWriterResolver resolve(String suggestedFile) throws IOException
{
File file;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -21,21 +21,24 @@
*/
package org.jboss.ws.metadata.config;
+// $Id: $
+
/**
* @author Heiko.Braun at jboss.org
- * @version $Id$
+ * @author Thomas.Diesler at jboss.org
* @since 14.12.2006
*/
-public class EndpointFeature {
+public interface EndpointFeature
+{
+ /** Enable MTOM per endpoint */
+ final static String MTOM = "http://org.jboss.ws/mtom";
- /**
- * Enable MTOM per endpoint.
- */
- public final static String MTOM = "http://org.jboss.ws/mtom";
-
- /**
+ /**
* Validate the XML stream upon dispatch.
* Introduces an additional parsing overhead and could be disabled.
*/
- public final static String VALIDATE_DISPATCH = "http://org.jboss.ws/dispatch/validate";
+ final static String VALIDATE_DISPATCH = "http://org.jboss.ws/dispatch/validate";
+
+ /** Generates message part names 'parameters' in WSDL for document/literal/wapped */
+ final static String BINDING_WSDL_DOTNET = "http://org.jboss.ws/binding/wsdl/dotnet";
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -651,14 +651,23 @@
public String getConfigFile()
{
- return this.configFile;
+ return configFile;
}
public String getConfigName()
{
- return this.configName;
+ return configName;
}
+ public CommonConfig getConfig()
+ {
+ // Make sure we have a configuration
+ if (config == null)
+ initEndpointConfig();
+
+ return config;
+ }
+
public void setConfigName(String configName)
{
setConfigNameInternal(configName, null);
@@ -681,8 +690,7 @@
{
this.configName = configName;
- if (log.isDebugEnabled())
- log.debug("Reconfiguration forced, new config is '" + configName + "'");
+ log.debug("Reconfiguration forced, new config is '" + configName + "'");
initEndpointConfig();
configObservable.doNotify(configName);
}
@@ -690,8 +698,7 @@
public void initEndpointConfig()
{
- if (log.isDebugEnabled())
- log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
+ log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
@@ -700,8 +707,7 @@
private void reconfigHandlerMetaData()
{
- if (log.isDebugEnabled())
- log.debug("Configure EndpointMetaData");
+ log.debug("Configure EndpointMetaData");
List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT);
clearHandlers();
@@ -713,12 +719,9 @@
addHandlers(sepHandlers);
addHandlers(postHandlers);
- if (log.isDebugEnabled())
- log.debug("Added " + preHandlers.size() + " PRE handlers");
- if (log.isDebugEnabled())
- log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
- if (log.isDebugEnabled())
- log.debug("Added " + postHandlers.size() + " POST handlers");
+ log.debug("Added " + preHandlers.size() + " PRE handlers");
+ log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
+ log.debug("Added " + postHandlers.size() + " POST handlers");
}
public List<Class> getRegisteredTypes()
@@ -747,9 +750,13 @@
boolean match;
if (seiName != null && portName != null)
+ {
match = getServiceEndpointInterfaceName().equals(seiName) && getPortName().equals(portName);
- else match = getServiceEndpointInterfaceName().equals(seiName) || getPortName().equals(portName);
-
+ }
+ else
+ {
+ match = getServiceEndpointInterfaceName().equals(seiName) || getPortName().equals(portName);
+ }
return match;
}
}
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-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -30,7 +30,6 @@
import java.util.Set;
import java.util.StringTokenizer;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
@@ -43,6 +42,7 @@
import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult;
import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner;
import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor;
+import org.jboss.ws.metadata.config.EndpointFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.wsf.spi.utils.JavaUtils;
@@ -106,13 +106,7 @@
this.opMetaData = opMetaData;
this.mode = ParameterMode.IN;
this.javaTypeName = javaTypeName;
-
- // [JBWS-771] Use part names that are friendly to .NET
- if (opMetaData.isDocumentWrapped())
- partName = "parameters";
- else
- partName = xmlName.getLocalPart();
-
+ this.partName = xmlName.getLocalPart();
}
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
@@ -440,7 +434,14 @@
public String getPartName()
{
- return partName;
+ // [JBWS-771] Use part names that are friendly to .NET
+ String auxPartName = partName;
+ if (opMetaData.getEndpointMetaData().getConfig().hasFeature(EndpointFeature.BINDING_WSDL_DOTNET))
+ {
+ if (opMetaData.isDocumentWrapped() && inHeader == false)
+ auxPartName = "parameters";
+ }
+ return auxPartName;
}
public void setPartName(String partName)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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.tools.metadata;
// $Id$
@@ -27,6 +27,7 @@
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.wsf.spi.binding.jaxb.BasicJAXBHandler;
@@ -43,6 +44,8 @@
public ToolsEndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName)
{
super(service, portName, portTypeName, Type.JAXRPC);
+ super.configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME;
+ super.configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE;
}
@Override
Modified: trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-client-config.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-client-config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-client-config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -3,18 +3,18 @@
<!-- $Id$ -->
<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
- xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd">
+ xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd">
<client-config>
<config-name>Standard Client</config-name>
</client-config>
- <client-config>
- <config-name>Standard MTOM client</config-name>
- <feature>http://org.jboss.ws/mtom</feature>
- </client-config>
-
- <client-config>
+ <client-config>
+ <config-name>Standard MTOM client</config-name>
+ <feature>http://org.jboss.ws/mtom</feature>
+ </client-config>
+
+ <client-config>
<config-name>Standard WSAddressing Client</config-name>
<post-handler-chain>
<handler-chain-name>WSAddressing Handlers</handler-chain-name>
Modified: trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-endpoint-config.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-endpoint-config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/resources/standard-config/standard-jaxrpc-endpoint-config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -2,20 +2,19 @@
<!-- $Id$ -->
-<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd">
<endpoint-config>
<config-name>Standard Endpoint</config-name>
</endpoint-config>
- <endpoint-config>
- <config-name>Standard MTOM Endpoint</config-name>
- <feature>http://org.jboss.ws/mtom</feature>
- </endpoint-config>
-
- <endpoint-config>
+ <endpoint-config>
+ <config-name>Standard MTOM Endpoint</config-name>
+ <feature>http://org.jboss.ws/mtom</feature>
+ </endpoint-config>
+
+ <endpoint-config>
<config-name>Standard WSAddressing Endpoint</config-name>
<pre-handler-chain>
<handler-chain-name>WSAddressing Handlers</handler-chain-name>
Modified: trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-client-config.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-client-config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-client-config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -3,46 +3,46 @@
<!-- $Id$ -->
<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
-
- <client-config>
- <config-name>Standard Client</config-name>
- <feature>http://org.jboss.ws/dispatch/validate</feature>
- <property>
- <property-name>http://org.jboss.ws/http#chunksize</property-name>
- <property-value>2048</property-value>
- </property>
- </client-config>
-
- <client-config>
- <config-name>HTTP 1.0 Client</config-name>
- <feature>http://org.jboss.ws/dispatch/validate</feature>
- </client-config>
-
- <client-config>
- <config-name>Standard WSAddressing Client</config-name>
- <post-handler-chains>
- <javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
- <javaee:handler>
- <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </post-handler-chains>
- </client-config>
-
- <client-config>
- <config-name>Standard WSSecurity Client</config-name>
- <post-handler-chains>
- <javaee:handler-chain>
- <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.WSSecurityHandlerClient</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </post-handler-chains>
- </client-config>
-
+ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+
+ <client-config>
+ <config-name>Standard Client</config-name>
+ <feature>http://org.jboss.ws/dispatch/validate</feature>
+ <property>
+ <property-name>http://org.jboss.ws/http#chunksize</property-name>
+ <property-value>2048</property-value>
+ </property>
+ </client-config>
+
+ <client-config>
+ <config-name>HTTP 1.0 Client</config-name>
+ <feature>http://org.jboss.ws/dispatch/validate</feature>
+ </client-config>
+
+ <client-config>
+ <config-name>Standard WSAddressing Client</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </client-config>
+
+ <client-config>
+ <config-name>Standard WSSecurity Client</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <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.WSSecurityHandlerClient</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </client-config>
+
</jaxws-config>
Modified: trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2007-07-05 17:20:58 UTC (rev 3803)
@@ -3,36 +3,45 @@
<!-- $Id$ -->
<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
-
- <endpoint-config>
- <config-name>Standard Endpoint</config-name>
- </endpoint-config>
-
- <endpoint-config>
- <config-name>Standard WSAddressing Endpoint</config-name>
- <post-handler-chains>
- <javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
- <javaee:handler>
- <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </post-handler-chains>
- </endpoint-config>
-
- <endpoint-config>
- <config-name>Standard WSSecurity Endpoint</config-name>
- <post-handler-chains>
- <javaee:handler-chain>
- <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.WSSecurityHandlerServer</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </post-handler-chains>
- </endpoint-config>
-
+ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+
+ <endpoint-config>
+ <config-name>Standard Endpoint</config-name>
+ </endpoint-config>
+
+ <!--
+ Generates message part names 'parameters' in WSDL for document/literal/wapped.
+ See: [JBWS-771] Use part names that are friendly to .NET
+ -->
+ <endpoint-config>
+ <config-name>.NET friendly Endpoint</config-name>
+ <feature>http://org.jboss.ws/binding/wsdl/dotnet</feature>
+ </endpoint-config>
+
+ <endpoint-config>
+ <config-name>Standard WSAddressing Endpoint</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </endpoint-config>
+
+ <endpoint-config>
+ <config-name>Standard WSSecurity Endpoint</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <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.WSSecurityHandlerServer</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </endpoint-config>
+
</jaxws-config>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2007-07-05 16:44:32 UTC (rev 3802)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -25,10 +25,6 @@
import java.net.URL;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -39,7 +35,6 @@
/**
* [JBWS-1422] NPE if @WebParam.name like "mX.."
- * [JBWS-771] Use part names that are friendly to .NET
*
* @author Thomas.Diesler at jboss.com
*/
@@ -72,25 +67,4 @@
String result = port.cancel("myFooBar");
assertEquals("Cancelled-myFooBar", result);
}
-
- // [JBWS-771] Use part names that are friendly to .NET
- public void testMessagePartNames() throws Exception
- {
- Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm());
-
- Message wsdlReqMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancel"));
- assertNotNull("Expected part with name 'parameters' in: " + wsdlReqMessage, wsdlReqMessage.getPart("parameters"));
-
- Message wsdlResMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancelResponse"));
- assertNotNull("Expected part with name 'parameters' in: " + wsdlResMessage, wsdlResMessage.getPart("parameters"));
- }
-
- private Definition getWSDLDefinition(String wsdlLocation) throws Exception
- {
- WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
-
- Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
- return definition;
- }
}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771 (from rev 3801, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771)
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java 2007-07-05 13:07:51 UTC (rev 3801)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -1,35 +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.test.ws.jaxws.jbws771;
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
- at WebService
- at SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
-public interface IWebsvc
-{
- public String submit(@WebParam(name = "foo") String foo);
-
- public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header=true) String bar);
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java (from rev 3801, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvc.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -0,0 +1,35 @@
+/*
+ * 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.jaxws.jbws771;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService
+ at SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public interface IWebsvc
+{
+ public String submit(@WebParam(name = "foo") String foo);
+
+ public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header=true) String bar);
+}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java 2007-07-05 13:07:51 UTC (rev 3801)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -1,44 +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.test.ws.jaxws.jbws771;
-
-import javax.ejb.Stateless;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-import org.jboss.ws.annotation.EndpointConfig;
-
- at Stateless
- at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws771.IWebsvc", serviceName = "JBWS771Service")
- at EndpointConfig(configName = ".NET friendly Endpoint")
-public class IWebsvcImpl implements IWebsvc
-{
- public String submit(@WebParam(name = "foo") String foo)
- {
- return "submit-" + foo;
- }
-
- public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header = true) String bar)
- {
- return "cancel-" + foo + bar;
- }
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java (from rev 3801, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -0,0 +1,44 @@
+/*
+ * 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.jaxws.jbws771;
+
+import javax.ejb.Stateless;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+import org.jboss.ws.annotation.EndpointConfig;
+
+ at Stateless
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws771.IWebsvc", serviceName = "JBWS771Service")
+ at EndpointConfig(configName = ".NET friendly Endpoint")
+public class IWebsvcImpl implements IWebsvc
+{
+ public String submit(@WebParam(name = "foo") String foo)
+ {
+ return "submit-" + foo;
+ }
+
+ public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header = true) String bar)
+ {
+ return "cancel-" + foo + bar;
+ }
+}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2007-07-05 13:07:51 UTC (rev 3801)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -1,153 +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.test.ws.jaxws.jbws771;
-
-// $Id: JBWS771TestCase.java 3729 2007-06-26 19:38:00Z thomas.diesler at jboss.com $
-
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.spi.test.JBossWSTest;
-import org.jboss.wsf.spi.test.JBossWSTestSetup;
-import org.jboss.wsf.spi.tools.cmd.WSConsume;
-
-/**
- * [JBWS-771] Use part names that are friendly to .NET
- *
- * @author Thomas.Diesler at jboss.com
- * @since 04-Jul-2007
- */
-public class JBWS771TestCase extends JBossWSTest
-{
- private static final String TARGET_NAMESPACE = "http://jbws771.jaxws.ws.test.jboss.org/";
- private static URL wsdlURL;
- private static IWebsvc port;
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS771TestCase.class, "jaxws-jbws771.jar");
- }
-
- @Override
- protected void setUp() throws Exception
- {
- if (port == null)
- {
- QName serviceName = new QName(TARGET_NAMESPACE, "JBWS771Service");
- wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws771/IWebsvcImpl?wsdl");
-
- Service service = Service.create(wsdlURL, serviceName);
- port = service.getPort(IWebsvc.class);
- }
- }
-
- public void testSubmit() throws Exception
- {
- String result = port.submit("foo");
- assertEquals("submit-foo", result);
- }
-
- public void testCancel() throws Exception
- {
- String result = port.cancel("foo", "bar");
- assertEquals("cancel-foobar", result);
- }
-
- public void testMessagePartNames() throws Exception
- {
- Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm());
-
- Message wsdlReqMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancel"));
- assertNotNull("Expected part with name 'parameters' in: " + wsdlReqMessage, wsdlReqMessage.getPart("parameters"));
- assertNotNull("Expected part with name 'bar' in: " + wsdlReqMessage, wsdlReqMessage.getPart("bar"));
-
- Message wsdlResMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancelResponse"));
- assertNotNull("Expected part with name 'parameters' in: " + wsdlResMessage, wsdlResMessage.getPart("parameters"));
-
- /*
- <binding name='IWebsvcBinding' type='tns:IWebsvc'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='cancel'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body parts='parameters' use='literal'/>
- <soap:header message='tns:IWebsvc_cancel' part='bar' use='literal'></soap:header>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- */
- Binding wsdlBinding = wsdl.getBinding(new QName(TARGET_NAMESPACE, "IWebsvcBinding"));
- BindingOperation bindingOperation = wsdlBinding.getBindingOperation("cancel", null, null);
-
- boolean foundBody = false;
- boolean foundHeader = false;
- List<ExtensibilityElement> extList = bindingOperation.getBindingInput().getExtensibilityElements();
- for (ExtensibilityElement extElement : extList)
- {
- if (extElement instanceof SOAPBody)
- {
- SOAPBody body = (SOAPBody)extElement;
- assertEquals("parameters", body.getParts().get(0));
- foundBody = true;
- }
- if (extElement instanceof SOAPHeader)
- {
- SOAPHeader header = (SOAPHeader)extElement;
- assertEquals("bar", header.getPart());
- foundHeader = true;
- }
- }
- assertTrue("Found soap:body", foundBody);
- assertTrue("Found soap:header", foundHeader);
- }
-
- public void testWSConsume() throws Exception
- {
- System.out.println("[JBWS-1724] wsconsume cannot use part names that are friendly to .NET");
- //WSConsume.main(new String[]{"--output=tests/wsconsume", wsdlURL.toExternalForm()});
- }
-
- private Definition getWSDLDefinition(String wsdlLocation) throws Exception
- {
- WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
-
- Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
- return definition;
- }
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java (from rev 3801, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2007-07-05 17:20:58 UTC (rev 3803)
@@ -0,0 +1,153 @@
+/*
+ * 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.jaxws.jbws771;
+
+// $Id: JBWS771TestCase.java 3729 2007-06-26 19:38:00Z thomas.diesler at jboss.com $
+
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Binding;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.Definition;
+import javax.wsdl.Message;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap.SOAPHeader;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+import org.jboss.wsf.spi.tools.cmd.WSConsume;
+
+/**
+ * [JBWS-771] Use part names that are friendly to .NET
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 04-Jul-2007
+ */
+public class JBWS771TestCase extends JBossWSTest
+{
+ private static final String TARGET_NAMESPACE = "http://jbws771.jaxws.ws.test.jboss.org/";
+ private static URL wsdlURL;
+ private static IWebsvc port;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS771TestCase.class, "jaxws-jbws771.jar");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ if (port == null)
+ {
+ QName serviceName = new QName(TARGET_NAMESPACE, "JBWS771Service");
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws771/IWebsvcImpl?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ port = service.getPort(IWebsvc.class);
+ }
+ }
+
+ public void testSubmit() throws Exception
+ {
+ String result = port.submit("foo");
+ assertEquals("submit-foo", result);
+ }
+
+ public void testCancel() throws Exception
+ {
+ String result = port.cancel("foo", "bar");
+ assertEquals("cancel-foobar", result);
+ }
+
+ public void testMessagePartNames() throws Exception
+ {
+ Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm());
+
+ Message wsdlReqMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancel"));
+ assertNotNull("Expected part with name 'parameters' in: " + wsdlReqMessage, wsdlReqMessage.getPart("parameters"));
+ assertNotNull("Expected part with name 'bar' in: " + wsdlReqMessage, wsdlReqMessage.getPart("bar"));
+
+ Message wsdlResMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancelResponse"));
+ assertNotNull("Expected part with name 'parameters' in: " + wsdlResMessage, wsdlResMessage.getPart("parameters"));
+
+ /*
+ <binding name='IWebsvcBinding' type='tns:IWebsvc'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='cancel'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body parts='parameters' use='literal'/>
+ <soap:header message='tns:IWebsvc_cancel' part='bar' use='literal'></soap:header>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ */
+ Binding wsdlBinding = wsdl.getBinding(new QName(TARGET_NAMESPACE, "IWebsvcBinding"));
+ BindingOperation bindingOperation = wsdlBinding.getBindingOperation("cancel", null, null);
+
+ boolean foundBody = false;
+ boolean foundHeader = false;
+ List<ExtensibilityElement> extList = bindingOperation.getBindingInput().getExtensibilityElements();
+ for (ExtensibilityElement extElement : extList)
+ {
+ if (extElement instanceof SOAPBody)
+ {
+ SOAPBody body = (SOAPBody)extElement;
+ assertEquals("parameters", body.getParts().get(0));
+ foundBody = true;
+ }
+ if (extElement instanceof SOAPHeader)
+ {
+ SOAPHeader header = (SOAPHeader)extElement;
+ assertEquals("bar", header.getPart());
+ foundHeader = true;
+ }
+ }
+ assertTrue("Found soap:body", foundBody);
+ assertTrue("Found soap:header", foundHeader);
+ }
+
+ public void testWSConsume() throws Exception
+ {
+ System.out.println("[JBWS-1724] wsconsume cannot use part names that are friendly to .NET");
+ //WSConsume.main(new String[]{"--output=tests/wsconsume", wsdlURL.toExternalForm()});
+ }
+
+ private Definition getWSDLDefinition(String wsdlLocation) throws Exception
+ {
+ WSDLFactory wsdlFactory = WSDLFactory.newInstance();
+ WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
+
+ Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
+ return definition;
+ }
+}
More information about the jbossws-commits
mailing list