[jboss-svn-commits] JBossWS SVN: r858 - in branches/tdiesler/trunk: . src/main/java/org/jboss/ws/binding src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/jaxrpc src/main/java/org/jboss/ws/jaxws/core src/main/java/org/jboss/ws/metadata/wsdl src/main/java/org/jboss/ws/soap src/main/java/org/jboss/ws/tools src/main/java/org/jboss/ws/tools/helpers src/main/java/org/jboss/ws/tools/metadata src/main/java/org/jboss/ws/wsse src/test/ant src/test/java/org/jboss/test/ws src/test/java/org/jboss/test/ws/jbws1124 src/test/java/org/jboss/test/ws/jbws1125 src/test/java/org/jboss/test/ws/samples/jmstransport src/test/java/org/jboss/test/ws/samples/wssecurity src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException src/test/java/org/jboss/test/ws/wsse src/test/resources src/test/resources/jbws1124 src/test/resources/jbws1124/META-INF src/test/resources/jbws1124/WEB-INF src/test/resources/jbws1124/WEB-INF/wsdl src/test/resources/jbws1125 src/test/resources/jbws1125/META-INF sr! c/test/resources/jbws1125/WEB-INF src/test/resources/jbws1125/WEB-INF/wsdl src/test/resources/samples/wssecurity src/test/resources/samples/wssecurity/store-pass-encrypt src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes src/test/resources/tools/jbws-206/wsdlFixture/UserException src/test/resources/wsse src/test/resources/wsse/store-pass-encrypt-class-cmd
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 30 14:28:20 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-30 14:26:13 -0400 (Wed, 30 Aug 2006)
New Revision: 858
Added:
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/JBWS1124TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpoint.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpointImpl.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/wssecurity/PasswordUtil.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/wssecurity/StorePassEncryptTestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/PasswordUtil.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/StorePassEncryptTestCase.java
branches/tdiesler/trunk/src/test/resources/jbws1124/
branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/
branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jboss-web.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/test-resource.txt
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/webservices.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl/
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/src/test/resources/jbws1124/wstools-config.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/
branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/
branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl/
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/src/test/resources/jbws1125/wstools-config.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/keystore.password
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes/AnonymousException.java
branches/tdiesler/trunk/src/test/resources/wsse/keystore.password
branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/
branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-client.xml
branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
Removed:
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/JBWS1124TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpoint.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpointImpl.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/
branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jboss-web.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/test-resource.txt
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/webservices.xml
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl/
branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/src/test/resources/jbws1124/wstools-config.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/
branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl/
branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/src/test/resources/jbws1125/wstools-config.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-client.xml
branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
Modified:
branches/tdiesler/trunk/.classpath
branches/tdiesler/trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAPBindingImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SecurityStore.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SimplePrincipal.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java
branches/tdiesler/trunk/src/test/ant/build-jars.xml
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java
branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java
branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl
Log:
merge with trunk
Modified: branches/tdiesler/trunk/.classpath
===================================================================
--- branches/tdiesler/trunk/.classpath 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/.classpath 2006-08-30 18:26:13 UTC (rev 858)
@@ -34,5 +34,7 @@
<classpathentry kind="lib" path="thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -244,7 +244,7 @@
public void initInputParams(Object[] inputParams)
{
List<ParameterMetaData> paramMetaDataList = opMetaData.getParameters();
- if (opMetaData.isDocumentWrapped())
+ if (opMetaData.isDocumentWrapped() && paramMetaDataList.size() != 0)
{
Object value = ParameterWrapping.wrapRequestParameters(opMetaData, inputParams);
ParameterMetaData paramMetaData = paramMetaDataList.get(0);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -509,15 +509,6 @@
}
// Try the filename as File
- try
- {
- fileURL = new URL(filename);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
if (fileURL == null)
{
try
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -66,12 +66,6 @@
if (opMetaData.getStyle() != Style.DOCUMENT)
throw new WSException("Unexpected style: " + opMetaData.getStyle());
- if (opMetaData.getNonHeaderParameters().size() != 1)
- throw new WSException("Unexpected number of input parameters: " + opMetaData.getParameters().size());
-
- if (opMetaData.getReturnParameter() == null && opMetaData.isOneWayOperation() == false)
- throw new WSException("Unexpected null return parameter");
-
if (opMetaData.getParameterStyle() != ParameterStyle.WRAPPED)
throw new WSException("Unexpected parameter style: " + opMetaData.getParameterStyle());
}
@@ -80,6 +74,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getParameters().size() == 0)
+ {
+ log.debug("Detected document/literal/wrapped with no parameter part");
+ return true;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getParameters().get(0);
List<String> varNames = paramMetaData.getWrappedVariables();
Class reqStructType = paramMetaData.getJavaType();
@@ -132,6 +133,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getReturnParameter() == null)
+ {
+ log.debug("Detected document/literal/wrapped with no return part");
+ return true;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getReturnParameter();
Class resStructType = paramMetaData.getJavaType();
@@ -170,6 +178,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getParameters().size() == 0)
+ {
+ log.debug("Detected document/literal/wrapped with no parameter part");
+ return null;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getParameters().get(0);
List<String> varNames = paramMetaData.getWrappedVariables();
Class reqStructType = paramMetaData.getJavaType();
@@ -277,6 +292,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getReturnParameter() == null)
+ {
+ log.debug("Detected document/literal/wrapped with no return part");
+ return null;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getReturnParameter();
List<String> varNames = paramMetaData.getWrappedVariables();
Class resStructType = paramMetaData.getJavaType();
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -23,13 +23,24 @@
// $Id: SOAPBindingImpl.java 716 2006-08-09 16:42:10Z thomas.diesler at jboss.com $
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Call;
+import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.binding.BindingException;
+import org.jboss.ws.binding.EndpointInvocation;
+import org.jboss.ws.binding.UnboundHeader;
+import org.jboss.ws.common.SOAPMessageContextBase;
import org.jboss.ws.jaxrpc.Use;
import org.jboss.ws.metadata.OperationMetaData;
+import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.soap.MessageFactoryImpl;
/**
@@ -40,6 +51,9 @@
*/
public class SOAP11BindingImpl extends SOAPBindingImpl
{
+ // provide logging
+ private static Logger log = Logger.getLogger(SOAPBindingImpl.class);
+
/** Create the SOAP-1.1 message */
protected SOAPMessage createMessage(OperationMetaData opMetaData) throws SOAPException
{
@@ -56,4 +70,35 @@
return soapMessage;
}
+
+ /** On the client side, generate the payload from IN parameters. */
+ public Object bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException
+ {
+ SOAPMessage reqMessage = (SOAPMessage) super.bindRequestMessage(opMetaData, epInv, unboundHeaders);
+
+ // Set the SOAPAction
+ MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
+ String soapAction = opMetaData.getSOAPAction();
+
+ // R2744 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field
+ // with a quoted value equal to the value of the soapAction attribute of
+ // soapbind:operation, if present in the corresponding WSDL description.
+
+ // R2745 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field
+ // with a quoted empty string value, if in the corresponding WSDL description,
+ // the soapAction attribute of soapbind:operation is either not present, or
+ // present with an empty string as its value.
+
+ SOAPMessageContextBase msgContext = MessageContextAssociation.peekMessageContext();
+ if (msgContext.getProperty(Call.SOAPACTION_USE_PROPERTY) != null)
+ log.info("Ignore Call.SOAPACTION_USE_PROPERTY because of BP-1.0 R2745, R2745");
+
+ String soapActionProperty = (String)msgContext.getProperty(Call.SOAPACTION_URI_PROPERTY);
+ if (soapActionProperty != null)
+ soapAction = soapActionProperty;
+
+ mimeHeaders.addHeader("SOAPAction", soapAction != null ? soapAction : "");
+
+ return reqMessage;
+ }
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAPBindingImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAPBindingImpl.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAPBindingImpl.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -37,7 +37,6 @@
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeaders;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
@@ -91,6 +90,7 @@
*/
public abstract class SOAPBindingImpl extends BindingImpl implements SOAPBinding
{
+ // provide logging
private static Logger log = Logger.getLogger(SOAPBindingImpl.class);
private boolean mtomEnabled;
@@ -231,11 +231,6 @@
}
}
- // Set the SOAPAction
- MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
- String soapAction = opMetaData.getSOAPAction();
- mimeHeaders.addHeader("SOAPAction", soapAction != null ? soapAction : "");
-
return reqMessage;
}
catch (Exception e)
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -728,6 +728,9 @@
if (destWsdl.getBinding(ncName) == null)
{
PortType srcPortType = srcBinding.getPortType();
+ if (srcPortType == null)
+ throw new WSException("Cannot find port type for binding: " + ncName);
+
processPortType(srcWsdl, srcPortType);
WSDLBinding destBinding = new WSDLBinding(destWsdl);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -232,13 +232,14 @@
// with a quoted empty string value, if in the corresponding WSDL description,
// the soapAction attribute of soapbind:operation is either not present, or
// present with an empty string as its value.
-
+
MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
String[] action = mimeHeaders.getHeader("SOAPAction");
if (action != null && action.length > 0)
{
String soapAction = action[0];
+ // R1109 The value of the SOAPAction HTTP header field in a HTTP request MESSAGE MUST be a quoted string.
if (soapAction.startsWith("\"") == false || soapAction.endsWith("\"") == false)
soapAction = "\"" + soapAction + "\"";
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -36,6 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.common.SOAPMessageContextBase;
+import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
@@ -87,15 +88,31 @@
Iterator bodyChildren = soapBody.getChildElements();
if (bodyChildren.hasNext() == false)
- throw new SOAPException("SOAPBody has no child element");
+ {
+ if (epMetaData.getStyle() == Style.RPC)
+ throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
+
+ // [JBWS-1125] Support empty soap body elements
+ for (OperationMetaData opAux : epMetaData.getOperations())
+ {
+ if (opAux.getParameters().size() == 0)
+ {
+ log.debug ("Dispatching empty SOAP body");
+ opMetaData = opAux;
+ break;
+ }
+ }
+ }
+ else
+ {
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next();
+ if (bodyChildren.hasNext())
+ throw new SOAPException("SOAPBody has more than on child element");
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next();
- if (bodyChildren.hasNext())
- throw new SOAPException("SOAPBody has more than on child element");
-
- Name soapName = soapBodyElement.getElementName();
- QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
- opMetaData = epMetaData.getOperation(xmlElementName);
+ Name soapName = soapBodyElement.getElementName();
+ QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
+ opMetaData = epMetaData.getOperation(xmlElementName);
+ }
}
// Dispatch to a generic operation that takes an org.w3c.dom.Element
@@ -105,8 +122,8 @@
{
if (opAux.isMessageEndpoint())
{
+ log.debug("Use generic message style dispatch");
opMetaData = opAux;
- log.debug("Use generic message style dispatch");
break;
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -451,7 +451,7 @@
Class cl = getJavaType(faultXMLType, false);
if (cl == null)
- buf.append(seiPkgName + "." + cleanUpFaultName(faultXMLType.getLocalPart()));
+ buf.append(seiPkgName + "." + cleanUpFaultName(faultXMLName.getLocalPart()));
else
buf.append( cl.getName());
buf.append( "," );
@@ -617,6 +617,9 @@
faultname = faultname.substring(0, index);
}
}
+
+ faultname = utils.firstLetterUpperCase(faultname);
+
return faultname;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -277,6 +277,7 @@
//Operation Level
WSDLBindingOperation wsdlBindingOperation = new WSDLBindingOperation(wsdlBinding);
wsdlBindingOperation.setRef(new QName(wsdl.getTargetNamespace(), opname));
+ wsdlBindingOperation.setSOAPAction(op.getSOAPAction());
wsdlBinding.addOperation(wsdlBindingOperation);
//TODO:FIXME JBWS-269
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.tools.metadata;
-// $Id: $
+// $Id$
import java.rmi.Remote;
import java.util.List;
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.ServiceMetaData;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SecurityStore.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SecurityStore.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SecurityStore.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,29 +1,33 @@
/*
-* 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.wsse;
+import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
import java.net.URL;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
@@ -40,9 +44,17 @@
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
+import java.util.StringTokenizer;
import org.jboss.logging.Logger;
+/**
+ * <code>SecurityStore</code> holds and loads the keystore and truststore required for encyption and signing.
+ *
+ * @author <a href="mailto:jason.greene at jboss.com">Jason T. Greene</a>
+ * @author <a href="mailto:jason.greene at jboss.com">Magesh Kumar B</a>
+ * @version $Revision$
+ */
public class SecurityStore
{
private static Logger log = Logger.getLogger(SecurityStore.class);
@@ -57,7 +69,7 @@
public SecurityStore() throws WSSecurityException
{
- this (null, null, null, null, null, null);
+ this(null, null, null, null, null, null);
}
public SecurityStore(URL keyStoreURL, String keyStoreType, String keyStorePassword) throws WSSecurityException
@@ -66,7 +78,8 @@
loadTrustStore(keyStoreURL, keyStoreType, keyStorePassword);
}
- public SecurityStore(URL keyStoreURL, String keyStoreType, String keyStorePassword, URL trustStoreURL, String trustStoreType, String trustStorePassword) throws WSSecurityException
+ public SecurityStore(URL keyStoreURL, String keyStoreType, String keyStorePassword, URL trustStoreURL, String trustStoreType, String trustStorePassword)
+ throws WSSecurityException
{
loadKeyStore(keyStoreURL, keyStoreType, keyStorePassword);
loadTrustStore(trustStoreURL, trustStoreType, trustStorePassword);
@@ -92,23 +105,33 @@
private KeyStore loadStore(String property, String type, URL storeURL, String storeType, String storePassword) throws WSSecurityException
{
+ if (storeURL == null)
+ {
+ String defaultStore = System.getProperty(property);
+ if (defaultStore == null)
+ {
+ return null;
+ }
+
+ File storeFile = new File(defaultStore);
+ try
+ {
+ storeURL = storeFile.toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ throw new WSSecurityException("Problems loading " + type + ": " + e.getMessage(), e);
+ }
+ }
+
if (storeType == null)
storeType = System.getProperty(property + "Type");
if (storeType == null)
storeType = "jks";
+ storePassword = getPassword(storePassword);
try
{
- if (storeURL == null)
- {
- String defaultStore = System.getProperty(property);
- if (defaultStore == null)
- throw new WSSecurityException(type + " url not specified");
-
- File storeFile = new File(defaultStore);
- storeURL = storeFile.toURL();
- }
-
log.debug("loadStore: " + storeURL);
InputStream stream = storeURL.openStream();
KeyStore keyStore = KeyStore.getInstance(storeType);
@@ -122,6 +145,105 @@
}
}
+ /**
+ * This method examines the password for the presence of a encryption algorithm, if found
+ * decrypts and returns the password, else returns the password as is.
+ */
+ private String getPassword(String password) throws WSSecurityException
+ {
+ if (password.charAt(0) == '{')
+ {
+ StringTokenizer tokenizer = new StringTokenizer(password, "{}");
+ String keyStorePasswordCmdType = tokenizer.nextToken();
+ String keyStorePasswordCmd = tokenizer.nextToken();
+ if (keyStorePasswordCmdType.equals("EXT"))
+ {
+ password = execPasswordCmd(keyStorePasswordCmd);
+ }
+ else if (keyStorePasswordCmdType.equals("CLASS"))
+ {
+ password = invokePasswordClass(keyStorePasswordCmd);
+ }
+ else
+ {
+ throw new WSSecurityException("Unknown keyStorePasswordCmdType: " + keyStorePasswordCmdType);
+ }
+ }
+
+ return password;
+ }
+
+ private String execPasswordCmd(String keyStorePasswordCmd) throws WSSecurityException
+ {
+ log.debug("Executing command: " + keyStorePasswordCmd);
+ try
+ {
+ Runtime rt = Runtime.getRuntime();
+ Process p = rt.exec(keyStorePasswordCmd);
+ InputStream stdin = p.getInputStream();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(stdin));
+ String password = reader.readLine();
+ stdin.close();
+ int exitCode = p.waitFor();
+ log.debug("Command exited with: " + exitCode);
+ return password;
+ }
+ catch (Exception e)
+ {
+ throw new WSSecurityException("Problems executing password command: " + keyStorePasswordCmd, e);
+ }
+ }
+
+ private String invokePasswordClass(String keyStorePasswordCmd) throws WSSecurityException
+ {
+ String password = null;
+ String classname = keyStorePasswordCmd;
+ String ctorArg = null;
+ int colon = keyStorePasswordCmd.indexOf(':');
+ if (colon > 0)
+ {
+ classname = keyStorePasswordCmd.substring(0, colon);
+ ctorArg = keyStorePasswordCmd.substring(colon + 1);
+ }
+ log.debug("Loading class: " + classname + ", ctorArg=" + ctorArg);
+ try
+ {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ Class c = loader.loadClass(classname);
+ Object instance = null;
+ if (ctorArg != null)
+ {
+ Class[] sig = { String.class };
+ Constructor ctor = c.getConstructor(sig);
+ Object[] args = { ctorArg };
+ instance = ctor.newInstance(args);
+ }
+ else
+ {
+ instance = c.newInstance();
+ }
+ try
+ {
+ log.debug("Checking for toCharArray");
+ Class[] sig = {};
+ Method toCharArray = c.getMethod("toCharArray", sig);
+ Object[] args = {};
+ log.debug("Invoking toCharArray");
+ password = new String((char[])toCharArray.invoke(instance, args));
+ }
+ catch (NoSuchMethodException e)
+ {
+ log.debug("No toCharArray found, invoking toString");
+ password = instance.toString();
+ }
+ }
+ catch (Exception e)
+ {
+ throw new WSSecurityException("Problems loading or invoking Password class : " + classname, e);
+ }
+ return password;
+ }
+
public static byte[] getSubjectKeyIdentifier(X509Certificate cert)
{
// Maybee we should make one ourselves if it isn't there?
@@ -140,10 +262,15 @@
public X509Certificate getCertificate(String alias) throws WSSecurityException
{
+ if (keyStore == null)
+ {
+ throw new WSSecurityException("KeyStore not set.");
+ }
+
X509Certificate cert;
try
{
- cert = (X509Certificate) keyStore.getCertificate(alias);
+ cert = (X509Certificate)keyStore.getCertificate(alias);
}
catch (Exception e)
{
@@ -153,7 +280,6 @@
if (cert == null)
throw new WSSecurityException("Certificate (" + alias + ") not in keystore");
-
return cert;
}
@@ -162,23 +288,28 @@
if (identifier == null)
return null;
+ if (keyStore == null)
+ {
+ throw new WSSecurityException("KeyStore not set.");
+ }
+
try
{
Enumeration i = keyStore.aliases();
while (i.hasMoreElements())
{
- String alias = (String) i.nextElement();
+ String alias = (String)i.nextElement();
Certificate cert = keyStore.getCertificate(alias);
- if (! (cert instanceof X509Certificate))
+ if (!(cert instanceof X509Certificate))
continue;
- byte[] subjectKeyIdentifier = getSubjectKeyIdentifier((X509Certificate) cert);
+ byte[] subjectKeyIdentifier = getSubjectKeyIdentifier((X509Certificate)cert);
if (subjectKeyIdentifier == null)
continue;
if (Arrays.equals(identifier, subjectKeyIdentifier))
- return (X509Certificate) cert;
+ return (X509Certificate)cert;
}
}
catch (KeyStoreException e)
@@ -191,20 +322,25 @@
public X509Certificate getCertificateByIssuerSerial(String issuer, String serial) throws WSSecurityException
{
+ if (keyStore == null)
+ {
+ throw new WSSecurityException("KeyStore not set.");
+ }
+
try
{
Enumeration i = keyStore.aliases();
while (i.hasMoreElements())
{
- String alias = (String) i.nextElement();
+ String alias = (String)i.nextElement();
Certificate cert = keyStore.getCertificate(alias);
- if (! (cert instanceof X509Certificate))
+ if (!(cert instanceof X509Certificate))
continue;
- X509Certificate x509 = (X509Certificate) cert;
+ X509Certificate x509 = (X509Certificate)cert;
if (issuer.equals(x509.getIssuerDN().toString()) && serial.equals(x509.getSerialNumber().toString()))
- return x509;
+ return x509;
}
}
catch (KeyStoreException e)
@@ -217,10 +353,15 @@
public PrivateKey getPrivateKey(String alias) throws WSSecurityException
{
+ if (keyStore == null)
+ {
+ throw new WSSecurityException("KeyStore not set.");
+ }
+
PrivateKey key;
try
{
- key = (PrivateKey) keyStore.getKey(alias, keyStorePassword.toCharArray());
+ key = (PrivateKey)keyStore.getKey(alias, getPassword(keyStorePassword).toCharArray());
}
catch (Exception e)
{
@@ -235,6 +376,11 @@
public PrivateKey getPrivateKey(X509Certificate cert) throws WSSecurityException
{
+ if (keyStore == null)
+ {
+ throw new WSSecurityException("KeyStore not set.");
+ }
+
try
{
String alias = keyStore.getCertificateAlias(cert);
@@ -258,6 +404,11 @@
throw new FailedAuthenticationException();
}
+ if (keyStore == null)
+ {
+ throw new WSSecurityException("TrustStore not set.");
+ }
+
// Check for the exact entry in the truststore first, then fallback to a CA check
try
{
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SimplePrincipal.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SimplePrincipal.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/SimplePrincipal.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.wsse;
+import java.io.Serializable;
import java.security.Principal;
/** A simple String based implementation of Principal.
@@ -28,8 +29,10 @@
* @author Thomas.Diesler at jboss.org
* @since 05-May-2006
*/
-public class SimplePrincipal implements Principal
+public class SimplePrincipal implements Principal, Serializable
{
+ private static final long serialVersionUID = 136345402844480211L;
+
private String name;
public SimplePrincipal(String name)
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -246,12 +246,12 @@
if (operationConfig.getUsername() != null)
{
- String user = ctx.getProperty(Stub.USERNAME_PROPERTY).toString();
- String pass = ctx.getProperty(Stub.PASSWORD_PROPERTY).toString();
+ Object user = ctx.getProperty(Stub.USERNAME_PROPERTY);
+ Object pass = ctx.getProperty(Stub.PASSWORD_PROPERTY);
if (user != null && pass != null)
{
- operations.add(new OperationDescription<EncodingOperation>(SendUsernameOperation.class, null, user, pass, null));
+ operations.add(new OperationDescription<EncodingOperation>(SendUsernameOperation.class, null, user.toString(), pass.toString(), null));
ctx.setProperty(StubExt.PROPERTY_AUTH_TYPE, StubExt.PROPERTY_AUTH_TYPE_WSSE);
}
}
Modified: branches/tdiesler/trunk/src/test/ant/build-jars.xml
===================================================================
--- branches/tdiesler/trunk/src/test/ant/build-jars.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/ant/build-jars.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -225,136 +225,7 @@
<include name="jboss-client.xml"/>
</metainf>
</jar>
-
- <!-- jbossws-jbws1010 -->
- <war warfile="${build.test.dir}/libs/jbossws-jbws1010.war" webxml="${build.test.dir}/resources/jbws1010/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1010-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1010/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <!-- jbossws-jbws1011 -->
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1011.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityLocal.class"/>
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityHome.class"/>
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityBean.class"/>
- <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1011/TestEndpointBean.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jbosscmp-jdbc.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/TestService.wsdl"/>
- </metainf>
- </jar>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1011-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jbws1107 -->
- <war warfile="${build.test.dir}/libs/jbossws-jbws1107.war" webxml="${build.test.dir}/resources/jbws1107/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1107/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1107-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1107/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jbws1121 -->
- <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
- <include name="org/jboss/test/ws/jbws1121/HelloWorldBean.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/*"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${build.test.dir}/resources/jbws1121">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1121-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/*"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1121">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </metainf>
- </jar>
- <ear destfile="${build.test.dir}/libs/jbossws-jbws1121.ear"
- appxml="${build.test.dir}/resources/jbws1121/META-INF/application.xml">
- <fileset dir="${build.test.dir}/libs">
- <include name="jbossws-jbws1121-client.jar"/>
- <include name="jbossws-jbws1121.war"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </ear>
-
<!-- jbossws-jaxws-binding -->
<war warfile="${build.test.dir}/libs/jbossws-jaxws-binding.war" webxml="${build.test.dir}/resources/jaxws/binding/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
@@ -731,6 +602,214 @@
</webinf>
</war>
+ <!-- jbossws-jbws1010 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1010.war" webxml="${build.test.dir}/resources/jbws1010/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1010-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1010/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1011 -->
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityLocal.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityHome.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityBean.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpointBean.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jbosscmp-jdbc.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/TestService.wsdl"/>
+ </metainf>
+ </jar>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1107 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1107.war" webxml="${build.test.dir}/resources/jbws1107/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1107/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1107-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1107/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1121 -->
+ <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ <include name="org/jboss/test/ws/jbws1121/HelloWorldBean.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1121-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.test.dir}/libs/jbossws-jbws1121.ear"
+ appxml="${build.test.dir}/resources/jbws1121/META-INF/application.xml">
+ <fileset dir="${build.test.dir}/libs">
+ <include name="jbossws-jbws1121-client.jar"/>
+ <include name="jbossws-jbws1121.war"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </ear>
+
+ <!-- jbossws-jbws1124one -->
+ <copy todir="${build.test.dir}/resources" overwrite="true">
+ <fileset dir="${test.resources.dir}">
+ <include name="jbws1124/META-INF/jboss-client.xml"/>
+ <include name="jbws1124/WEB-INF/test-resource.txt"/>
+ <include name="jbws1124/WEB-INF/jboss-web.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbws1124.domain" value="jbws1124one"/>
+ </filterset>
+ </copy>
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1124one.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="test-resource.txt"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <!-- jbossws-jbws1124two -->
+ <copy todir="${build.test.dir}/resources" overwrite="true">
+ <fileset dir="${test.resources.dir}">
+ <include name="jbws1124/META-INF/jboss-client.xml"/>
+ <include name="jbws1124/WEB-INF/test-resource.txt"/>
+ <include name="jbws1124/WEB-INF/jboss-web.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbws1124.domain" value="jbws1124two"/>
+ </filterset>
+ </copy>
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1124two.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="test-resource.txt"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
+ <!-- jbossws-jbws1125 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1125.war" webxml="${build.test.dir}/resources/jbws1125/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1125/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jbws1125/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1125/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1125-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1125/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1125/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1125/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jsr181-complex -->
<war warfile="${build.test.dir}/libs/jbossws-jsr181-complex.war" webxml="${build.test.dir}/resources/jsr181/complex/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
@@ -1614,6 +1693,47 @@
</metainf>
</jar>
+ <!-- jbossws-samples-store-pass-encrypt.war -->
+ <replace file="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
+ <war warfile="${build.test.dir}/libs/jbossws-samples-store-pass-encrypt.war" webxml="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/samples/wssecurity/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/samples/wssecurity/PasswordUtil.class"/>
+ <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/samples/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${build.test.dir}/libs/jbossws-samples-store-pass-encrypt-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/samples/wssecurity/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-wsse-account-signup.war -->
<war warfile="${build.test.dir}/libs/jbossws-wsse-account-signup.war" webxml="${build.test.dir}/resources/wsse/account-signup/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
@@ -1775,6 +1895,49 @@
</metainf>
</jar>
+ <!-- jbossws-wsse-store-pass-encrypt-class-cmd.war -->
+ <replace file="${build.test.dir}/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
+ <war warfile="${build.test.dir}/libs/jbossws-wsse-store-pass-encrypt-class-cmd.war" webxml="${build.test.dir}/resources/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/wsse/Hello.class"/>
+ <include name="org/jboss/test/ws/wsse/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/wsse/PasswordUtil.class"/>
+ <include name="org/jboss/test/ws/wsse/UserType.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/wsse/rpc/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="jboss-web.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/wsse/store-pass-encrypt-class-cmd">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/wsse">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+
+ <!-- jboss-wsse-store-pass-encrypt-class-cmd-client.jar -->
+ <jar jarfile="${build.test.dir}/libs/jbossws-wsse-store-pass-encrypt-class-cmd-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/wsse/Hello.class"/>
+ <include name="org/jboss/test/ws/wsse/UserType.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/wsse/rpc/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/wsse/store-pass-encrypt-class-cmd">
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/wsse/rpc/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-wsse-web-client.war -->
<war warfile="${build.test.dir}/libs/jbossws-wsse-web-client.war" webxml="${build.test.dir}/resources/wsse/webclient/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124 (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1124)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/JBWS1124TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1124/JBWS1124TestCase.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/JBWS1124TestCase.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,74 +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.jbws1124;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
-
-/**
- * Scoped class loading domains for WS endpoints
- *
- * http://jira.jboss.org/jira/browse/JBWS-1124
- *
- * @author Thomas.Diesler at jboss.org
- * @since 07-August-2006
- */
-public class JBWS1124TestCase extends JBossWSTest
-{
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1124TestCase.class, "jbossws-jbws1124one.war, jbossws-jbws1124two.war");
- }
-
- public void testEnpointOne() throws Exception
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1124one/TestEndpoint?wsdl");
- URL mappingURL = new File("resources/jbws1124/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.test.ws/jbws1124", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
- assertEquals("jbws1124one", port.getResourceString());
- }
-
-
- public void testEnpointTwo() throws Exception
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1124two/TestEndpoint?wsdl");
- URL mappingURL = new File("resources/jbws1124/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.test.ws/jbws1124", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
- assertEquals("jbws1124two", port.getResourceString());
- }
-
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/JBWS1124TestCase.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1124/JBWS1124TestCase.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpoint.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpoint.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,36 +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.jbws1124;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @author Thomas.Diesler at jboss.org
- * @since 07-August-2006
- */
-public interface TestEndpoint extends Remote
-{
-
- public String getResourceString() throws RemoteException;
-
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpoint.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpoint.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpointImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpointImpl.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpointImpl.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,59 +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.jbws1124;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.rmi.RemoteException;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-
-/**
- * @author Thomas.Diesler at jboss.org
- * @since 07-August-2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
- private Logger log = Logger.getLogger(TestEndpointImpl.class);
-
-
- public String getResourceString() throws RemoteException
- {
- try
- {
- InputStream ins = getClass().getClassLoader().getResourceAsStream("WEB-INF/test-resource.txt");
- String line = new BufferedReader(new InputStreamReader(ins)).readLine();
-
- log.info(line);
-
- return line;
- }
- catch (IOException ex)
- {
- throw new WSException(ex);
- }
- }
-
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpointImpl.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1124/TestEndpointImpl.java)
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125 (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,94 +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.jbws1125;
-
-// $Id: $
-
-import java.io.ByteArrayInputStream;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPMessage;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- * Support empty soap body elements
- *
- * http://jira.jboss.org/jira/browse/JBWS-1125
- *
- * @author Thomas.Diesler at jboss.com
- * @since 16-August-2006
- */
-public class JBWS1125TestCase extends JBossWSTest
-{
- private static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1125TestCase.class, "jbossws-jbws1125.war, jbossws-jbws1125-client.jar");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
-
- public void testClientAccess() throws Exception
- {
- String retObj = port.noParamPart();
- assertEquals("noParamPart", retObj);
-
- port.noReturnPart("hello");
- }
-
- public void _testMessageAccess() throws Exception
- {
- String reqEnv =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Body/>" +
- "</env:Envelope>";
-
- MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
-
- SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance();
- SOAPConnection con = conFactory.createConnection();
- SOAPMessage resMessage = con.call(soapMessage, "http://" + getServerHost() + ":8080/jbossws-jbws1125");
- SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next();
- assertEquals("noParamPartResponse", soapElement.getElementName().getLocalName());
-
- }
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,32 +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.jbws1125;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface TestEndpoint extends Remote
-{
- public String noParamPart() throws RemoteException;
-
- public void noReturnPart(String param) throws RemoteException;
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,41 +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.jbws1125;
-
-import org.jboss.logging.Logger;
-
-public class TestEndpointImpl implements TestEndpoint
-{
- private Logger log = Logger.getLogger(TestEndpointImpl.class);
-
- public String noParamPart()
- {
- log.info("noParamPart");
- return "noParamPart";
- }
-
- public void noReturnPart(String param)
- {
- log.info("noReturnPart: " + param);
- }
-
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,18 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noParamPart_RequestStruct
-{
-public TestEndpoint_noParamPart_RequestStruct(){
-}
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noParamPart_ResponseStruct
-{
-
-protected java.lang.String result;
-public TestEndpoint_noParamPart_ResponseStruct(){}
-
-public TestEndpoint_noParamPart_ResponseStruct(java.lang.String result){
-this.result=result;
-}
-public java.lang.String getResult() { return result ;}
-
-public void setResult(java.lang.String result){ this.result=result; }
-
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noReturnPart_RequestStruct
-{
-
-protected java.lang.String string_1;
-public TestEndpoint_noReturnPart_RequestStruct(){}
-
-public TestEndpoint_noReturnPart_RequestStruct(java.lang.String string_1){
-this.string_1=string_1;
-}
-public java.lang.String getString_1() { return string_1 ;}
-
-public void setString_1(java.lang.String string_1){ this.string_1=string_1; }
-
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java)
Deleted: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,18 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noReturnPart_ResponseStruct
-{
-public TestEndpoint_noReturnPart_ResponseStruct(){
-}
-}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java)
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -86,7 +86,7 @@
sender.send(message);
sender.close();
- done.acquire();
+ Thread.sleep(1000);
assertNotNull("Expected response message", responseListener.resMessage);
assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage));
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/wssecurity/PasswordUtil.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/samples/wssecurity/PasswordUtil.java)
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/wssecurity/StorePassEncryptTestCase.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/samples/wssecurity/StorePassEncryptTestCase.java)
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -54,5 +54,6 @@
{
checkUserType( "CustomException.java");
checkUserType( "MyException.java");
+ checkUserType( "AnonymousException.java");
}
}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/PasswordUtil.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/wsse/PasswordUtil.java)
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,26 +1,29 @@
/*
- * 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.test.ws.wsse;
+import java.rmi.RemoteException;
+import java.util.Properties;
+
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
@@ -37,6 +40,7 @@
*/
public class SimpleSignEncryptTestCase extends JBossWSTest
{
+
/** Construct the test case with a given name
*/
@@ -59,4 +63,34 @@
UserType retObj = hello.echoUserType(in0);
assertEquals(in0, retObj);
}
+
+ /**
+ * Test JSE endpoint
+ */
+ public void testEndpointNoProperties() throws Exception
+ {
+ Properties props = System.getProperties();
+ props.remove("org.jboss.ws.wsse.keyStore");
+ props.remove("org.jboss.ws.wsse.trustStore");
+ props.remove("org.jboss.ws.wsse.keyStorePassword");
+ props.remove("org.jboss.ws.wsse.trustStorePassword");
+ props.remove("org.jboss.ws.wsse.keyStoreType");
+ props.remove("org.jboss.ws.wsse.trustStoreType");
+
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
+ Hello hello = (Hello)service.getPort(Hello.class);
+
+ UserType in0 = new UserType("Kermit");
+
+ try
+ {
+ hello.echoUserType(in0);
+ fail("Expected exception not thrown");
+ }
+ catch (RemoteException e)
+ {
+ }
+
+ }
}
Copied: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/StorePassEncryptTestCase.java (from rev 857, trunk/src/test/java/org/jboss/test/ws/wsse/StorePassEncryptTestCase.java)
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/wsse/UsernameTestCase.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,26 +1,29 @@
/*
- * 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.test.ws.wsse;
+import java.rmi.RemoteException;
+import java.util.Properties;
+
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
import javax.xml.rpc.Stub;
@@ -57,6 +60,14 @@
((Stub)endpoint)._setProperty(Stub.USERNAME_PROPERTY, "kermit");
((Stub)endpoint)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog");
}
+
+ Properties props = System.getProperties();
+ props.remove("org.jboss.ws.wsse.keyStore");
+ props.remove("org.jboss.ws.wsse.trustStore");
+ props.remove("org.jboss.ws.wsse.keyStorePassword");
+ props.remove("org.jboss.ws.wsse.trustStorePassword");
+ props.remove("org.jboss.ws.wsse.keyStoreType");
+ props.remove("org.jboss.ws.wsse.trustStoreType");
}
public void testEchoString() throws Exception
@@ -74,4 +85,23 @@
Object retObj = endpoint.echoSimpleUserType(hello, userType);
assertEquals(userType, retObj);
}
+
+ public void testEchoStringNoUsername() throws Exception
+ {
+ String hello = "Hello";
+ String world = "world!";
+
+ ((Stub)endpoint)._setProperty(Stub.USERNAME_PROPERTY, null);
+ ((Stub)endpoint)._setProperty(Stub.PASSWORD_PROPERTY, null);
+
+ try
+ {
+ endpoint.echoString(hello, world);
+ fail("Expected exception not thrown");
+ }
+ catch (RemoteException e)
+ {
+ }
+
+ }
}
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124 (from rev 857, trunk/src/test/resources/jbws1124)
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF (from rev 857, trunk/src/test/resources/jbws1124/META-INF)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/jbws1124/META-INF/application-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/application-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>TestService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jbws1124.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/application-client.xml (from rev 857, trunk/src/test/resources/jbws1124/META-INF/application-client.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jbws1124/META-INF/jboss-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/jboss-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/@jbws1124.domain@/TestEndpoint?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/META-INF/jboss-client.xml (from rev 857, trunk/src/test/resources/jbws1124/META-INF/jboss-client.xml)
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jbws1124/WEB-INF/jaxrpc-mapping.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jaxrpc-mapping.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1124</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1124/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1124.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1124'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1124.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1124'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1124'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>getResourceString</java-method-name>
- <wsdl-operation>getResourceString</wsdl-operation>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1124'>wsdlMsgNS:TestEndpoint_getResourceStringResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jaxrpc-mapping.xml (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF/jaxrpc-mapping.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jbws1124/WEB-INF/jboss-web.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jboss-web.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-web>
-
- <class-loading>
- <loader-repository> jbossws.jbws1124:domain=@jbws1124.domain@ </loader-repository>
- </class-loading>
-
- <context-root>/@jbws1124.domain@</context-root>
-
-</jboss-web>
-
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/jboss-web.xml (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF/jboss-web.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/test-resource.txt
===================================================================
--- trunk/src/test/resources/jbws1124/WEB-INF/test-resource.txt 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/test-resource.txt 2006-08-30 18:26:13 UTC (rev 858)
@@ -1 +0,0 @@
- at jbws1124.domain@
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/test-resource.txt (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF/test-resource.txt)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jbws1124/WEB-INF/web.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/web.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jbws1124.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/web.xml (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF/web.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/webservices.xml
===================================================================
--- trunk/src/test/resources/jbws1124/WEB-INF/webservices.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/webservices.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1124' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jbws1124.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/webservices.xml (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF/webservices.xml)
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF/wsdl)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/src/test/resources/jbws1124/WEB-INF/wsdl/TestService.wsdl 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl/TestService.wsdl 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1124' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1124' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_getResourceString'/>
- <message name='TestEndpoint_getResourceStringResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='getResourceString'>
- <input message='tns:TestEndpoint_getResourceString'/>
- <output message='tns:TestEndpoint_getResourceStringResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='getResourceString'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1124' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1124' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/WEB-INF/wsdl/TestService.wsdl (from rev 857, trunk/src/test/resources/jbws1124/WEB-INF/wsdl/TestService.wsdl)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1124/wstools-config.xml
===================================================================
--- trunk/src/test/resources/jbws1124/wstools-config.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1124/wstools-config.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jbws1124.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1124" type-namespace="http://org.jboss.test.ws/jbws1124/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: branches/tdiesler/trunk/src/test/resources/jbws1124/wstools-config.xml (from rev 857, trunk/src/test/resources/jbws1124/wstools-config.xml)
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125 (from rev 857, trunk/src/test/resources/jbws1125)
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF (from rev 857, trunk/src/test/resources/jbws1125/META-INF)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/jbws1125/META-INF/application-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/application-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>HelloService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jbws1125.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/application-client.xml (from rev 857, trunk/src/test/resources/jbws1125/META-INF/application-client.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jbossws-jbws1125?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml (from rev 857, trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml)
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF (from rev 857, trunk/src/test/resources/jbws1125/WEB-INF)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1125</package-type>
- <namespaceURI>http://jbws1125.ws.test.jboss.org/jaws/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noParamPart_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noParamPart</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noParamPart_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noParamPartResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noReturnPart_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noReturnPart</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>string_1</java-variable-name>
- <xml-element-name>String_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noReturnPart_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noReturnPartResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1125.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://jbws1125.ws.test.jboss.org/jaws'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1125.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://jbws1125.ws.test.jboss.org/jaws'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://jbws1125.ws.test.jboss.org/jaws'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>noParamPart</java-method-name>
- <wsdl-operation>noParamPart</wsdl-operation>
- <wrapped-element/>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noParamPartResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>noReturnPart</java-method-name>
- <wsdl-operation>noReturnPart</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noReturnPart</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml (from rev 857, trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jbws1125/WEB-INF/web.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/web.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jbws1125.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/web.xml (from rev 857, trunk/src/test/resources/jbws1125/WEB-INF/web.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml
===================================================================
--- trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://jbws1125.ws.test.jboss.org/jaws' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jbws1125.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml (from rev 857, trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml)
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl (from rev 857, trunk/src/test/resources/jbws1125/WEB-INF/wsdl)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://jbws1125.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1125.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='noParamPart'>
- <sequence/>
- </complexType>
- <complexType name='noParamPartResponse'>
- <sequence>
- <element name='result' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='noReturnPart'>
- <sequence>
- <element name='String_1' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='noReturnPartResponse'>
- <sequence/>
- </complexType>
- <element name='noParamPart' type='tns:noParamPart'/>
- <element name='noParamPartResponse' type='tns:noParamPartResponse'/>
- <element name='noReturnPart' type='tns:noReturnPart'/>
- <element name='noReturnPartResponse' type='tns:noReturnPartResponse'/>
- </schema>
- </types>
-
- <!--
- BP-1.0 5.3.1 Bindings and Parts
- Use of wsdl:message elements with zero parts is permitted in Document styles to permit operations
- that can send or receive messages with empty soap:Bodys.
- -->
- <message name='TestEndpoint_noParamPart'>
- <!-- part element='ns1:noParamPart' name='parameters'/ -->
- </message>
- <message name='TestEndpoint_noParamPartResponse'>
- <part element='ns1:noParamPartResponse' name='result'/>
- </message>
-
- <message name='TestEndpoint_noReturnPart'>
- <part element='ns1:noReturnPart' name='parameters'/>
- </message>
- <message name='TestEndpoint_noReturnPartResponse'>
- <!-- part element='ns1:noReturnPartResponse' name='result'/ -->
- </message>
-
- <portType name='TestEndpoint'>
- <operation name='noParamPart'>
- <input message='tns:TestEndpoint_noParamPart'/>
- <output message='tns:TestEndpoint_noParamPartResponse'/>
- </operation>
- <operation name='noReturnPart'>
- <input message='tns:TestEndpoint_noReturnPart'/>
- <output message='tns:TestEndpoint_noReturnPartResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='noParamPart'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='noReturnPart'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl (from rev 857, trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl)
Deleted: branches/tdiesler/trunk/src/test/resources/jbws1125/wstools-config.xml
===================================================================
--- trunk/src/test/resources/jbws1125/wstools-config.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/jbws1125/wstools-config.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jbws1125.TestEndpoint" style="document">
- </service>
- <namespaces target-namespace="http://jbws1125.ws.test.jboss.org/jaws" type-namespace="http://jbws1125.ws.test.jboss.org/jaws/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
-
Copied: branches/tdiesler/trunk/src/test/resources/jbws1125/wstools-config.xml (from rev 857, trunk/src/test/resources/jbws1125/wstools-config.xml)
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/keystore.password (from rev 857, trunk/src/test/resources/samples/wssecurity/keystore.password)
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt)
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF)
Deleted: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>HelloService</display-name>
-
- <service-ref>
- <service-ref-name>service/HelloService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.samples.wssecurity.Hello</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/HelloService</service-ref-name>
- <config-name>Standard WSSecure Client</config-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jbossws-samples-store-pass-encrypt?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <config>
- <sign type="x509v3" alias="wsse"/>
- <encrypt type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- <encryption/>
- </requires>
- </config>
-</jboss-ws-security>
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml)
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF)
Deleted: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-
- <context-root>jbossws-samples-store-pass-encrypt</context-root>
-
- <webservice-description>
- <webservice-description-name>HelloService</webservice-description-name>
- <config-name>Standard WSSecurity Endpoint</config-name>
- </webservice-description>
-
-</jboss-web>
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>HelloService</servlet-name>
- <servlet-class>org.jboss.test.ws.samples.wssecurity.HelloJavaBean</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
===================================================================
--- trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <!--Note ${buildpath} will be replaced with the actual build directory path -->
- <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.samples.wssecurity.PasswordUtil ${buildpath}/resources/samples/wssecurity/keystore.password</key-store-password>
- <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <!--Note ${buildpath} will be replaced with the actual build directory path -->
- <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/samples/wssecurity/keystore.password</trust-store-password>
- <config>
- <sign type="x509v3" alias="wsse"/>
- <encrypt type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- <encryption/>
- </requires>
- </config>
-</jboss-ws-security>
Copied: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml (from rev 857, trunk/src/test/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml)
Modified: branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java
===================================================================
--- branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java 2006-08-30 18:26:13 UTC (rev 858)
@@ -10,4 +10,6 @@
org.jboss.test.webservice.userexception.CustomException, java.rmi.RemoteException;
public void testUserException(java.lang.String string_1) throws
org.jboss.test.webservice.userexception.MyException, java.rmi.RemoteException;
+ public void testAnonymousException(java.lang.String string_1) throws
+ org.jboss.test.webservice.userexception.AnonymousException, java.rmi.RemoteException;
}
Copied: branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes/AnonymousException.java (from rev 857, trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes/AnonymousException.java)
Modified: branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl
===================================================================
--- branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl 2006-08-30 18:26:13 UTC (rev 858)
@@ -24,6 +24,13 @@
</complexType>
<element name="CustomException" type="tns:CustomException" />
<element name="MyException" type="tns:MyException" />
+ <element name="anonymousException">
+ <complexType>
+ <sequence>
+ <element type="string" name="message"/>
+ </sequence>
+ </complexType>
+ </element>
</schema>
</types>
<message name="UserExceptionSEI_testCustomException" />
@@ -38,6 +45,13 @@
<message name="MyException">
<part name="MyException" element="ns2:MyException" />
</message>
+ <message name="UserExceptionSEI_testAnonymousException">
+ <part name="String_1" type="xsd:string" />
+ </message>
+ <message name="UserExceptionSEI_testAnonymousExceptionResponse" />
+ <message name="AnonymousException">
+ <part name="AnonymousException" element="ns2:anonymousException"/>
+ </message>
<portType name="UserExceptionSEI">
<operation name="testCustomException">
<input message="tns:UserExceptionSEI_testCustomException" />
@@ -51,6 +65,12 @@
message="tns:UserExceptionSEI_testUserExceptionResponse" />
<fault name="MyException" message="tns:MyException" />
</operation>
+ <operation name="testAnonymousException" parameterOrder="String_1">
+ <input message="tns:UserExceptionSEI_testAnonymousException" />
+ <output
+ message="tns:UserExceptionSEI_testAnonymousExceptionResponse" />
+ <fault name="AnonymousException" message="tns:AnonymousException" />
+ </operation>
</portType>
<binding name="UserExceptionSEIBinding"
type="tns:UserExceptionSEI">
@@ -84,6 +104,20 @@
<soap:fault name="MyException" use="literal" />
</fault>
</operation>
+ <operation name="testAnonymousException">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal"
+ namespace="http://org.jboss.ws" />
+ </input>
+ <output>
+ <soap:body use="literal"
+ namespace="http://org.jboss.ws" />
+ </output>
+ <fault name="AnonymousException">
+ <soap:fault name="AnonymousException" use="literal" />
+ </fault>
+ </operation>
</binding>
<service name="UserExceptionService">
<port name="UserExceptionSEIPort"
Copied: branches/tdiesler/trunk/src/test/resources/wsse/keystore.password (from rev 857, trunk/src/test/resources/wsse/keystore.password)
Copied: branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd (from rev 857, trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd)
Deleted: branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-client.xml
===================================================================
--- trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-client.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-client.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <config>
- <sign type="x509v3" alias="wsse"/>
- <encrypt type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- <encryption/>
- </requires>
- </config>
-</jboss-ws-security>
Copied: branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-client.xml (from rev 857, trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-client.xml)
Deleted: branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
===================================================================
--- trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2006-08-30 11:13:00 UTC (rev 857)
+++ branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2006-08-30 18:26:13 UTC (rev 858)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <!--Note ${buildpath} will be replaced with the actual build directory path -->
- <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.wsse.PasswordUtil ${buildpath}/resources/wsse/keystore.password</key-store-password>
- <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <!--Note ${buildpath} will be replaced with the actual build directory path -->
- <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/wsse/keystore.password</trust-store-password>
- <config>
- <sign type="x509v3" alias="wsse"/>
- <encrypt type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- <encryption/>
- </requires>
- </config>
-</jboss-ws-security>
Copied: branches/tdiesler/trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml (from rev 857, trunk/src/test/resources/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml)
More information about the jboss-svn-commits
mailing list