JBossWS SVN: r8659 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-06 03:56:43 -0500 (Thu, 06 Nov 2008)
New Revision: 8659
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
Log:
[JBWS-2307] Excluding test on AS 4.2.x
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-05 18:47:06 UTC (rev 8658)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-06 08:56:43 UTC (rev 8659)
@@ -1,5 +1,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/jbws2307/**
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-05 18:47:06 UTC (rev 8658)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-06 08:56:43 UTC (rev 8659)
@@ -1,5 +1,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/jbws2307/**
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-05 18:47:06 UTC (rev 8658)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-06 08:56:43 UTC (rev 8659)
@@ -1,5 +1,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/jbws2307/**
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-05 18:47:06 UTC (rev 8658)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-06 08:56:43 UTC (rev 8659)
@@ -1,5 +1,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/jbws2307/**
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-05 18:47:06 UTC (rev 8658)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-06 08:56:43 UTC (rev 8659)
@@ -1,5 +1,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/jbws2307/**
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-05 18:47:06 UTC (rev 8658)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-06 08:56:43 UTC (rev 8659)
@@ -1,5 +1,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/jbws2307/**
# Exclude endpoints with AS5 @SecurityDomain
org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
15 years, 6 months
JBossWS SVN: r8658 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-05 13:47:06 -0500 (Wed, 05 Nov 2008)
New Revision: 8658
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2384] excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-05 18:45:15 UTC (rev 8657)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-05 18:47:06 UTC (rev 8658)
@@ -111,3 +111,7 @@
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-05 18:45:15 UTC (rev 8657)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-05 18:47:06 UTC (rev 8658)
@@ -111,3 +111,7 @@
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
15 years, 6 months
JBossWS SVN: r8657 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-05 13:45:15 -0500 (Wed, 05 Nov 2008)
New Revision: 8657
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2384] excluding test
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-05 18:43:38 UTC (rev 8656)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-05 18:45:15 UTC (rev 8657)
@@ -55,3 +55,7 @@
# [JBWS-2348] Fix jbws1969 testcase
org/jboss/test/ws/jaxws/jbws1969/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-05 18:43:38 UTC (rev 8656)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-05 18:45:15 UTC (rev 8657)
@@ -57,3 +57,7 @@
# [JBWS-2348] Fix jbws1969 testcase
org/jboss/test/ws/jaxws/jbws1969/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-05 18:43:38 UTC (rev 8656)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-05 18:45:15 UTC (rev 8657)
@@ -49,3 +49,7 @@
# [JBWS-2348] Fix jbws1969 testcase
org/jboss/test/ws/jaxws/jbws1969/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-05 18:43:38 UTC (rev 8656)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-05 18:45:15 UTC (rev 8657)
@@ -54,3 +54,7 @@
# [JBWS-2348] Fix jbws1969 testcase
org/jboss/test/ws/jaxws/jbws1969/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
15 years, 6 months
JBossWS SVN: r8656 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-05 13:43:38 -0500 (Wed, 05 Nov 2008)
New Revision: 8656
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2384] excluding test
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-05 18:28:18 UTC (rev 8655)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-05 18:43:38 UTC (rev 8656)
@@ -21,3 +21,7 @@
# [JBWS-2217] Fix BPEL samples before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-05 18:28:18 UTC (rev 8655)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-05 18:43:38 UTC (rev 8656)
@@ -18,3 +18,7 @@
# [JBWS-2217] Fix BPEL samples before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
15 years, 6 months
JBossWS SVN: r8655 - in container/jboss50: trunk/src/main/resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-05 13:28:18 -0500 (Wed, 05 Nov 2008)
New Revision: 8655
Modified:
container/jboss50/branches/jboss500CR2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2384] fixing aspect dependencies
Modified: container/jboss50/branches/jboss500CR2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/jboss500CR2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-11-05 18:08:14 UTC (rev 8654)
+++ container/jboss50/branches/jboss500CR2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-11-05 18:28:18 UTC (rev 8655)
@@ -266,7 +266,7 @@
</bean>
<bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppGeneratorDeploymentAspect">
- <property name="requires">URLPattern</property>
+ <property name="requires">VirtualHosts,URLPattern</property>
<property name="provides">WebMetaData</property>
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -339,6 +339,7 @@
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSDynamicEndpointDeploymentAspect"/>
<inject bean="WSEndpointAPIDeploymentAspect"/>
+ <inject bean="WSVirtualHostDeploymentAspect"/>
<inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointHandlerDeploymentAspect"/>
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-11-05 18:08:14 UTC (rev 8654)
+++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-11-05 18:28:18 UTC (rev 8655)
@@ -266,7 +266,7 @@
</bean>
<bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppGeneratorDeploymentAspect">
- <property name="requires">URLPattern</property>
+ <property name="requires">VirtualHosts,URLPattern</property>
<property name="provides">WebMetaData</property>
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -339,6 +339,7 @@
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSDynamicEndpointDeploymentAspect"/>
<inject bean="WSEndpointAPIDeploymentAspect"/>
+ <inject bean="WSVirtualHostDeploymentAspect"/>
<inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointHandlerDeploymentAspect"/>
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
15 years, 6 months
JBossWS SVN: r8654 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-05 13:08:14 -0500 (Wed, 05 Nov 2008)
New Revision: 8654
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
Log:
[JBWS-2266] applying user patch
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2008-11-05 17:16:50 UTC (rev 8653)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2008-11-05 18:08:14 UTC (rev 8654)
@@ -21,9 +21,9 @@
*/
package org.jboss.ws.extensions.validation;
-import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URL;
+import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -32,6 +32,7 @@
import org.jboss.wsf.common.DOMWriter;
import org.w3c.dom.Element;
import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
/**
* [JBWS-1172] Support schema validation for incoming messages
@@ -57,8 +58,7 @@
public void validateDocument(String inxml) throws Exception
{
- ByteArrayInputStream bais = new ByteArrayInputStream(inxml.getBytes());
- validateDocument(bais);
+ validateDocument(new InputSource(new StringReader(inxml)));
}
public void validateDocument(Element inxml) throws Exception
@@ -73,6 +73,12 @@
builder.parse(inxml);
}
+ public void validateDocument(InputSource inxml) throws Exception
+ {
+ DocumentBuilder builder = getDocumentBuilder();
+ builder.parse(inxml);
+ }
+
private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException
{
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
15 years, 6 months
JBossWS SVN: r8653 - stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-05 12:16:50 -0500 (Wed, 05 Nov 2008)
New Revision: 8653
Added:
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptor.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptorFactory.java
Modified:
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java
Log:
[JBWS-2307] Using Metro's ServiceInteceptor SPI to set stub properties
Modified: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java 2008-11-05 17:12:25 UTC (rev 8652)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java 2008-11-05 17:16:50 UTC (rev 8653)
@@ -43,6 +43,8 @@
import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import com.sun.xml.ws.api.client.ServiceInterceptorFactory;
+
/**
* This ServiceObjectFactory reconstructs a javax.xml.ws.Service
* for a given WSDL when the webservice client does a JNDI lookup
@@ -50,6 +52,7 @@
* @see ServiceReferenceable
*
* @author Heiko.Braun(a)jboss.com
+ * @author alessio.soldano(a)jboss.com
* Created: Jul 12, 2007
* */
public class ServiceObjectFactory implements ObjectFactory
@@ -113,65 +116,77 @@
// Get the URL to the wsdl
URL wsdlURL = serviceRef.getWsdlLocation();
-
- // Generic javax.xml.ws.Service
- if (serviceClass == Service.class)
+
+ ServiceRefServiceInterceptorFactory serviceInterceptorFactory = new ServiceRefServiceInterceptorFactory(serviceRef);
+ try
{
- if (wsdlURL != null)
+ //register the factory that adds a ServiceRefServiceInterceptor to the created Service;
+ //this is required to correctly set the stub properties upon Port creation.
+ ServiceInterceptorFactory.registerForThread(serviceInterceptorFactory);
+
+ // Generic javax.xml.ws.Service
+ if (serviceClass == Service.class)
{
- target = Service.create(wsdlURL, serviceQName);
+ if (wsdlURL != null)
+ {
+ target = Service.create(wsdlURL, serviceQName);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName);
+ }
}
+ // Generated javax.xml.ws.Service subclass
else
{
- throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName);
+ if (wsdlURL != null)
+ {
+ Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class });
+ target = ctor.newInstance(new Object[] { wsdlURL, serviceQName });
+ }
+ else
+ {
+ target = (Service)serviceClass.newInstance();
+ }
}
- }
- // Generated javax.xml.ws.Service subclass
- else
- {
- if (wsdlURL != null)
+
+ if (targetClassName != null && targetClassName.equals(serviceImplClass) == false)
{
- Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class });
- target = ctor.newInstance(new Object[] { wsdlURL, serviceQName });
- }
- else
- {
- target = (Service)serviceClass.newInstance();
- }
- }
-
- if (targetClassName != null && targetClassName.equals(serviceImplClass) == false)
- {
- try
- {
- Object port = null;
- if (serviceClass != Service.class)
+ try
{
- for (Method method : serviceClass.getDeclaredMethods())
+ Object port = null;
+ if (serviceClass != Service.class)
{
- String methodName = method.getName();
- Class retType = method.getReturnType();
- if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType))
+ for (Method method : serviceClass.getDeclaredMethods())
{
- port = method.invoke(target, new Object[0]);
- target = port;
- break;
+ String methodName = method.getName();
+ Class retType = method.getReturnType();
+ if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType))
+ {
+ port = method.invoke(target, new Object[0]);
+ target = port;
+ break;
+ }
}
}
+
+ if (port == null)
+ {
+ Method method = serviceClass.getMethod("getPort", new Class[] { Class.class });
+ port = method.invoke(target, new Object[] { targetClass });
+ target = port;
+ }
}
-
- if (port == null)
+ catch (InvocationTargetException ex)
{
- Method method = serviceClass.getMethod("getPort", new Class[] { Class.class });
- port = method.invoke(target, new Object[] { targetClass });
- target = port;
+ throw ex.getTargetException();
}
}
- catch (InvocationTargetException ex)
- {
- throw ex.getTargetException();
- }
}
+ finally
+ {
+ ServiceInterceptorFactory.unregisterForThread(serviceInterceptorFactory);
+ }
return target;
}
Added: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptor.java
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptor.java (rev 0)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptor.java 2008-11-05 17:16:50 UTC (rev 8653)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro.client;
+
+import javax.xml.ws.BindingProvider;
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
+
+import com.sun.istack.NotNull;
+import com.sun.xml.ws.api.client.ServiceInterceptor;
+import com.sun.xml.ws.developer.WSBindingProvider;
+
+/**
+ * A ServiceInterceptor that copies properties from the unified MD
+ * (for instance specified in the service-ref block of a JBoss-specific DD)
+ * to the context in the BindingProvider.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 05-Nov-2008
+ */
+public class ServiceRefServiceInterceptor extends ServiceInterceptor
+{
+ private UnifiedServiceRefMetaData serviceRefMD;
+
+ public ServiceRefServiceInterceptor(UnifiedServiceRefMetaData serviceRefMD)
+ {
+ this.serviceRefMD = serviceRefMD;
+ }
+
+ /**
+ * A callback to notify the event of creation of proxy object for SEI endpoint. The
+ * callback could set some properties on the {@link BindingProvider}.
+ *
+ * @param bp created proxy instance
+ * @param serviceEndpointInterface SEI of the endpoint
+ */
+ @Override
+ public void postCreateProxy(@NotNull WSBindingProvider bp, @NotNull Class<?> serviceEndpointInterface)
+ {
+ for (UnifiedPortComponentRefMetaData pcRef : serviceRefMD.getPortComponentRefs())
+ {
+ String sei = pcRef.getServiceEndpointInterface();
+ if (sei != null && sei.equals(serviceEndpointInterface.getName()))
+ {
+ for (UnifiedStubPropertyMetaData prop : pcRef.getStubProperties())
+ {
+ bp.getRequestContext().put(prop.getPropName(), prop.getPropValue());
+ }
+ }
+ }
+ }
+}
Property changes on: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptorFactory.java
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptorFactory.java (rev 0)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptorFactory.java 2008-11-05 17:16:50 UTC (rev 8653)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro.client;
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+
+import com.sun.xml.ws.api.WSService;
+import com.sun.xml.ws.api.client.ServiceInterceptor;
+import com.sun.xml.ws.api.client.ServiceInterceptorFactory;
+
+/**
+ * A ServiceInterceptorFactory providing ServiceRefServiceInterceptor instances
+ * using the given UnifiedServiceRefMetaData.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 05-Nov-2008
+ */
+public class ServiceRefServiceInterceptorFactory extends ServiceInterceptorFactory
+{
+ private UnifiedServiceRefMetaData serviceRefMD;
+
+ public ServiceRefServiceInterceptorFactory(UnifiedServiceRefMetaData serviceRefMD)
+ {
+ this.serviceRefMD = serviceRefMD;
+ }
+
+ @Override
+ public ServiceInterceptor create(WSService service)
+ {
+ return new ServiceRefServiceInterceptor(serviceRefMD);
+ }
+
+}
Property changes on: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefServiceInterceptorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 6 months
JBossWS SVN: r8652 - stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-05 12:12:25 -0500 (Wed, 05 Nov 2008)
New Revision: 8652
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml
Log:
Minor cleanup
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml 2008-11-05 11:28:06 UTC (rev 8651)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml 2008-11-05 17:12:25 UTC (rev 8652)
@@ -2,11 +2,6 @@
<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
<jboss-web>
- <!-- <class-loading>
- <loader-repository>jboss.cts:loader=WSWebServiceContext_wsservlet_vehicle_web.war
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
- </class-loading> -->
<security-domain>java:/jaas/JBossWS</security-domain>
<service-ref>
<service-ref-name>service/jbws2307service</service-ref-name>
@@ -22,6 +17,5 @@
<prop-value>kermit</prop-value>
</stub-property>
</port-component-ref>
- <!-- <wsdl-override>http://localhost:8080/WSHelloSecureService/jaxws/Hello?WSDL</wsdl-override> -->
</service-ref>
</jboss-web>
\ No newline at end of file
15 years, 6 months
JBossWS SVN: r8651 - in stack/metro/trunk/modules/testsuite/metro-tests: src/test/java/org/jboss/test/ws/jaxws and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-05 06:28:06 -0500 (Wed, 05 Nov 2008)
New Revision: 8651
Added:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/Hello.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloService.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/jboss-web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
Log:
[JBWS-2307] Adding testcase
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-04 16:15:51 UTC (rev 8650)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-05 11:28:06 UTC (rev 8651)
@@ -51,6 +51,30 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2206/META-INF"/>
</jar>
+ <!-- jbws2307 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2307-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2307/ClientServlet.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2307/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2307/HelloService.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-client">
+ <include name="wsdl/**"/>
+ <include name="*.xml"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2307-service.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-service/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2307/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2307/HelloImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2307/HelloService.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-service">
+ <include name="wsdl/**"/>
+ <include name="*.xml"/>
+ </webinf>
+ </war>
+
<!-- wsit-rm -->
<war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2307;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceRef;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Client servlet using the injected service
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class ClientServlet extends HttpServlet
+{
+ private Logger log = Logger.getLogger(ClientServlet.class);
+
+ @WebServiceRef(name="service/jbws2307service")
+ HelloService service;
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ boolean result = false;
+ try
+ {
+ log.info("service = "+service);
+ Hello hello = service.getHelloPort();
+ result = hello.getMessageContextTest();
+ log.info("result = " + result);
+ }
+ catch (Exception e)
+ {
+ log.error("Error while invoking service!", e);
+ throw new ServletException(e);
+ }
+ resp.getWriter().print(result);
+ }
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/Hello.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/Hello.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/Hello.java 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2307;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name="Hello", targetNamespace="http://helloservice.org/wsdl")
+(a)SOAPBinding(style=SOAPBinding.Style.RPC)
+public abstract interface Hello
+{
+ @WebMethod
+ @WebResult(name="result", partName="result")
+ public abstract String hello(@WebParam(name="String_1", partName="String_1") String paramString);
+
+ @WebMethod
+ @WebResult(name="result", partName="result")
+ public abstract boolean getMessageContextTest();
+
+ @WebMethod
+ @WebResult(name="result", partName="result")
+ public abstract boolean getServletContextTest();
+
+ @WebMethod
+ @WebResult(name="result", partName="result")
+ public abstract boolean getUserPrincipalTest();
+
+ @WebMethod
+ @WebResult(name="result", partName="result")
+ public abstract boolean isUserInRoleTest(@WebParam(name="String_1", partName="String_1") String paramString);
+}
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/Hello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloImpl.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloImpl.java 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2307;
+
+import java.security.Principal;
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.servlet.ServletContext;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+
+@WebService(portName = "HelloPort", serviceName = "HelloService", targetNamespace = "http://helloservice.org/wsdl", wsdlLocation = "WEB-INF/wsdl/HelloService.wsdl", endpointInterface = "org.jboss.test.ws.jaxws.jbws2307.Hello")
+public class HelloImpl implements Hello
+{
+
+ @Resource
+ protected WebServiceContext wsContext;
+
+ public String hello(String s)
+ {
+ return "Hello, " + s + "!";
+ }
+
+ public boolean getServletContextTest()
+ {
+ if (this.wsContext == null)
+ return false;
+
+ ServletContext v = (ServletContext)this.wsContext.getMessageContext().get("javax.xml.ws.servlet.context");
+ System.out.println("ServletContext=" + v);
+ return true;
+ }
+
+ public boolean getMessageContextTest()
+ {
+ if (this.wsContext == null)
+ return false;
+
+ MessageContext v = this.wsContext.getMessageContext();
+ System.out.println("MessageContext=" + v);
+ return true;
+ }
+
+ public boolean getUserPrincipalTest()
+ {
+ if (this.wsContext == null)
+ return false;
+
+ Principal v = this.wsContext.getUserPrincipal();
+ System.out.println("UserPrincipal=" + v);
+ return true;
+ }
+
+ public boolean isUserInRoleTest(String s)
+ {
+ if (this.wsContext == null)
+ return false;
+
+ return this.wsContext.isUserInRole(s);
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloService.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloService.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloService.java 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2307;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+@WebServiceClient(name = "HelloService", targetNamespace = "http://helloservice.org/wsdl", wsdlLocation = "WEB-INF/wsdl/HelloService.wsdl")
+public class HelloService extends Service
+{
+ private static final URL HELLOSERVICE_WSDL_LOCATION;
+
+ public HelloService(URL wsdlLocation, QName serviceName)
+ {
+ super(wsdlLocation, serviceName);
+ }
+
+ public HelloService()
+ {
+ super(HELLOSERVICE_WSDL_LOCATION, new QName("http://helloservice.org/wsdl", "HelloService"));
+ }
+
+ @WebEndpoint(name = "HelloPort")
+ public Hello getHelloPort()
+ {
+ return ((Hello)super.getPort(new QName("http://helloservice.org/wsdl", "HelloPort"), Hello.class));
+ }
+
+ static
+ {
+ URL url = null;
+ try
+ {
+ url = new URL("http://files1/releng/cts_5.x/cts-5.0c-temp/bin/WEB-INF/wsdl/HelloService....");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ HELLOSERVICE_WSDL_LOCATION = url;
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2307;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * JBWS-2307 testcase
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class JBWS2307TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war");
+ }
+
+ public void testClient() throws Exception
+ {
+ HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection();
+ BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ assertEquals("true", isr.readLine());
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
+<jboss-web>
+ <!-- <class-loading>
+ <loader-repository>jboss.cts:loader=WSWebServiceContext_wsservlet_vehicle_web.war
+ <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+ </loader-repository>
+ </class-loading> -->
+ <security-domain>java:/jaas/JBossWS</security-domain>
+ <service-ref>
+ <service-ref-name>service/jbws2307service</service-ref-name>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws2307.Hello</service-endpoint-interface>
+ <port-qname>{http://helloservice.org/wsdl}HelloPort</port-qname>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.password</prop-name>
+ <prop-value>thefrog</prop-value>
+ </stub-property>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.username</prop-name>
+ <prop-value>kermit</prop-value>
+ </stub-property>
+ </port-component-ref>
+ <!-- <wsdl-override>http://localhost:8080/WSHelloSecureService/jaxws/Hello?WSDL</wsdl-override> -->
+ </service-ref>
+</jboss-web>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web.xml 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>jbws2307_testcase_client</display-name>
+ <servlet>
+ <servlet-name>ClientServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2307.ClientServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ClientServlet</servlet-name>
+ <url-pattern>/jbws2307</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+ <service-ref>
+ <service-ref-name>service/jbws2307service</service-ref-name>
+ <service-interface>javax.xml.ws.Service</service-interface>
+ <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws2307.Hello</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+</web-app>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="HelloService" targetNamespace="http://helloservice.org/wsdl" xmlns:tns="http://helloservice.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <types/>
+ <message name="Hello_hello">
+ <part name="String_1" type="xsd:string"/></message>
+ <message name="Hello_helloResponse">
+ <part name="result" type="xsd:string"/></message>
+ <message name="getMessageContextTest"/>
+ <message name="getMessageContextTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <message name="getServletContextTest"/>
+ <message name="getServletContextTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <message name="getUserPrincipalTest"/>
+ <message name="getUserPrincipalTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <message name="isUserInRoleTest">
+ <part name="String_1" type="xsd:string"/></message>
+ <message name="isUserInRoleTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <portType name="Hello">
+ <operation name="hello" parameterOrder="String_1">
+ <input message="tns:Hello_hello"/>
+ <output message="tns:Hello_helloResponse"/></operation>
+ <operation name="getMessageContextTest" >
+ <input message="tns:getMessageContextTest"/>
+ <output message="tns:getMessageContextTestResponse"/></operation>
+ <operation name="getServletContextTest" >
+ <input message="tns:getServletContextTest"/>
+ <output message="tns:getServletContextTestResponse"/></operation>
+ <operation name="getUserPrincipalTest" >
+ <input message="tns:getUserPrincipalTest"/>
+ <output message="tns:getUserPrincipalTestResponse"/></operation>
+ <operation name="isUserInRoleTest" parameterOrder="String_1">
+ <input message="tns:isUserInRoleTest"/>
+ <output message="tns:isUserInRoleTestResponse"/></operation>
+ </portType>
+ <binding name="HelloBinding" type="tns:Hello">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="hello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="getMessageContextTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="getServletContextTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="getUserPrincipalTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="isUserInRoleTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ </binding>
+ <service name="HelloService">
+ <port name="HelloPort" binding="tns:HelloBinding">
+ <soap:address location="http://localhost:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/jboss-web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/jboss-web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/jboss-web.xml 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <security-domain>java:/jaas/JBossWS</security-domain>
+</jboss-web>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/web.xml 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>jbws2307_testcase_service</display-name>
+ <servlet>
+ <servlet-name>HelloImpl</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2307.HelloImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>FRN</role-name>
+ <role-link>friend</role-link>
+ </security-role-ref>
+ <!-- <security-role-ref>
+ <role-name>ADM</role-name>
+ <role-link>Administrator</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <role-name>MGR</role-name>
+ <role-link>Manager</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <role-name>EMP</role-name>
+ <role-link>Employee</role-link>
+ </security-role-ref> -->
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HelloImpl</servlet-name>
+ <url-pattern>/jaxws/Hello</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>WSHelloSecureService</web-resource-name>
+ <url-pattern>/jaxws/*</url-pattern>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <!-- <auth-constraint>
+ <role-name>Administrator</role-name>
+ </auth-constraint> -->
+ <auth-constraint>
+ <role-name>friend</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>default</realm-name>
+ </login-config>
+ <!-- <security-role>
+ <role-name>Administrator</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Manager</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Employee</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Guest</role-name>
+ </security-role> -->
+ <security-role>
+ <role-name>friend</role-name>
+ </security-role>
+</web-app>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2008-11-05 11:28:06 UTC (rev 8651)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="HelloService" targetNamespace="http://helloservice.org/wsdl" xmlns:tns="http://helloservice.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <types/>
+ <message name="Hello_hello">
+ <part name="String_1" type="xsd:string"/></message>
+ <message name="Hello_helloResponse">
+ <part name="result" type="xsd:string"/></message>
+ <message name="getMessageContextTest"/>
+ <message name="getMessageContextTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <message name="getServletContextTest"/>
+ <message name="getServletContextTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <message name="getUserPrincipalTest"/>
+ <message name="getUserPrincipalTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <message name="isUserInRoleTest">
+ <part name="String_1" type="xsd:string"/></message>
+ <message name="isUserInRoleTestResponse">
+ <part name="result" type="xsd:boolean"/></message>
+ <portType name="Hello">
+ <operation name="hello" parameterOrder="String_1">
+ <input message="tns:Hello_hello"/>
+ <output message="tns:Hello_helloResponse"/></operation>
+ <operation name="getMessageContextTest" >
+ <input message="tns:getMessageContextTest"/>
+ <output message="tns:getMessageContextTestResponse"/></operation>
+ <operation name="getServletContextTest" >
+ <input message="tns:getServletContextTest"/>
+ <output message="tns:getServletContextTestResponse"/></operation>
+ <operation name="getUserPrincipalTest" >
+ <input message="tns:getUserPrincipalTest"/>
+ <output message="tns:getUserPrincipalTestResponse"/></operation>
+ <operation name="isUserInRoleTest" parameterOrder="String_1">
+ <input message="tns:isUserInRoleTest"/>
+ <output message="tns:isUserInRoleTestResponse"/></operation>
+ </portType>
+ <binding name="HelloBinding" type="tns:Hello">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="hello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="getMessageContextTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="getServletContextTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="getUserPrincipalTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ <operation name="isUserInRoleTest">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></input>
+ <output>
+ <soap:body use="literal" namespace="http://helloservice.org/wsdl"/></output></operation>
+ </binding>
+ <service name="HelloService">
+ <port name="HelloPort" binding="tns:HelloBinding">
+ <soap:address location="http://localhost:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 6 months
JBossWS SVN: r8650 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-04 11:15:51 -0500 (Tue, 04 Nov 2008)
New Revision: 8650
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
Log:
rollback previous commit
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-11-04 15:10:17 UTC (rev 8649)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-11-04 16:15:51 UTC (rev 8650)
@@ -31,7 +31,7 @@
import org.jboss.wsf.spi.annotation.WebContext;
/**
- * Endpoint implementation
+ *
* @author darran.lofthouse(a)jboss.com
* @since Nov 2, 2006
*/
@@ -45,24 +45,16 @@
public String hello(final String message)
{
- MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
try
{
+ MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//www.jboss.org/...");
mbeanServer.getMBeanInfo(on);
}
catch (Exception e)
{
- try
- {
- ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//localhost/jaxws-jbws981,j2eeType=Servlet,name=EJB3Bean");
- mbeanServer.getMBeanInfo(on);
- }
- catch (Exception ee)
- {
- log.error("Unable to lookup deployment", e);
- return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @WebContext";
- }
+ log.error("Unable to lookup deployment", e);
+ return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @WebContext";
}
return message;
15 years, 6 months