Author: ropalka Date: 2012-03-19 10:24:23 -0400 (Mon, 19 Mar 2012) New Revision: 16000 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/addressing/policy/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/policy/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/policy_200409.xsd stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wspolicy/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wspolicy/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/tools/jbws1645/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-7572] Merged revisions 15999 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15999 | ropalka | 2012-03-19 15:02:28 +0100 (Mon, 19 Mar 2012) | 1 line [JBWS-3467] removing ws-policy support ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -142,10 +142,6 @@ <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>ws-commons</groupId> - <artifactId>policy</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-lgpl</artifactId> </dependency> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-19 14:24:23 UTC (rev 16000) @@ -43,7 +43,6 @@ import org.jboss.ws.common.ResourceLoaderAdapter; import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; -import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -102,8 +101,6 @@ //Setup policies and EPRs for each endpoint for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) { - PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getClientSidePolicyMetaDataBuilder(); - policyBuilder.processPolicyExtensions(epMetaData, wsdlDefinitions); processEPRs(epMetaData, wsdlDefinitions); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-03-19 14:24:23 UTC (rev 16000) @@ -42,8 +42,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.IOUtils; -import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; -import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -60,7 +58,6 @@ import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.wsdl.JAXBWSDLGenerator; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.tools.wsdl.WSDLGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.ws.tools.wsdl.WSDLWriterResolver; @@ -94,7 +91,6 @@ private ServerEndpointMetaData sepMetaData; private ServiceMetaData serviceMetaData; private URL wsdlLocation; - private URL policyLocation; } public void setGenerateWsdl(boolean generateWsdl) @@ -153,7 +149,6 @@ if (!toolMode) { - processPolicies(serviceMetaData, sepMetaData); setupOperationsFromWSDL(serviceMetaData, sepMetaData); } @@ -169,13 +164,6 @@ createJAXBContext(sepMetaData); populateXmlTypes(sepMetaData); - //Process an optional @PolicyAttachment annotation - if (sepClass.isAnnotationPresent(PolicyAttachment.class)) - { - PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode); - policyBuilder.processPolicyAnnotations(sepMetaData, sepClass); - } - // The server must always generate WSDL if (generateWsdl || !toolMode) generateWSDL(seiClass, serviceMetaData, sepMetaData); @@ -234,24 +222,6 @@ } } - private void processPolicies(ServiceMetaData serviceMetaData, EndpointMetaData epMetaData) - { - final URL wsdlLocation = serviceMetaData.getWsdlLocation(); - - if (wsdlLocation != null) - { - PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - //we can no longer use the user provided wsdl without parsing it right now, since we - //need to look for policies and eventually choose the supported policy alternatives - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlLocation); - policyBuilder.processPolicyExtensions(epMetaData, wsdlDefinitions); - //now we have the UMDM containing policy data; anyway we can't write a new wsdl file with - //the supported alternatives and so on, since we need to publish the file the user provided - serviceMetaData.setWsdlLocation(wsdlLocation); - } - } - private void setupOperationsFromWSDL(ServiceMetaData serviceMetaData, EndpointMetaData epMetaData) { WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties 2012-03-19 14:24:23 UTC (rev 16000) @@ -10,7 +10,6 @@ WSDL11_SUPPORT_MEPS=WSDl 1.1 only supports In-Only, and In-Out MEPS. FEATURE_NAME_MUST_NOT_BE_NULL=Feature name must not be null. FEATURE_NAME_NOT_RECOGNIZED=Feature name is not recognized {0} -ERROR_WHILE_CONVERTING_POLICY_TO_ELEMENT=Error while converting policy to element! A_SERVICE_MUST_HAVE_AN_ENDPOINT=A service must have an endpoint COULD_NOT_GENERATE_SCHEMA=Could not generate schema: {0} WSDL_FILE_ARGUMENT_CANNOT_BE_NULL=WSDL file argument cannot be null Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-03-19 14:24:23 UTC (rev 16000) @@ -321,7 +321,6 @@ { UnknownExtensibilityElement uee = (UnknownExtensibilityElement)extElement; boolean understood = false; - understood = understood || processPolicyElements(uee, dest); understood = understood || processEPR(uee, dest); //add processing of further extensibility element types below @@ -334,46 +333,6 @@ } /** - * Process the provided extensibility element looking for policies or policy references. - * Returns true if the provided element is policy related, false otherwise. - * - * @param extElement - * @param dest - * @return - */ - private boolean processPolicyElements(UnknownExtensibilityElement extElement, Extendable dest) - { - boolean result = false; - Element srcElement = extElement.getElement(); - final boolean is200409PolicyNamespace = Constants.URI_WS_POLICY.equals(srcElement.getNamespaceURI()); - final boolean is200702PolicyNamespace = WSDLGenerator.WSP_NS.equals(srcElement.getNamespaceURI()); - final boolean isPolicyNamespace = is200702PolicyNamespace || is200409PolicyNamespace; - - if (isPolicyNamespace) - { - //copy missing namespaces from the source element to our element - Element element = (Element)srcElement.cloneNode(true); - copyMissingNamespaceDeclarations(element, srcElement); - if (element.getLocalName().equals("Policy")) - { - WSDLExtensibilityElement el = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICY, element); - el.setRequired("true".equalsIgnoreCase(element.getAttribute("required"))); - dest.addExtensibilityElement(el); - result = true; - } - else if (element.getLocalName().equals("PolicyReference")) - { - WSDLExtensibilityElement el = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICYREFERENCE, element); - el.setRequired("true".equalsIgnoreCase(element.getAttribute("required"))); - dest.addExtensibilityElement(el); - result = true; - } - } - - return result; - } - - /** * Process the provided extensibility element looking for UsingAddressing. * Returns true if the provided element is UsingAddressing, false otherwise. * @@ -750,13 +709,6 @@ { WSDLInterface destInterface = new WSDLInterface(destWsdl, qname); - //policy extensions - QName policyURIsProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSP_POLICYURIS); - if (policyURIsProp != null && !"".equalsIgnoreCase(policyURIsProp.getLocalPart())) - { - destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policyURIsProp.getLocalPart())); - } - // documentation Element documentationElement = srcPortType.getDocumentationElement(); if (documentationElement != null && documentationElement.getTextContent() != null) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-19 14:24:23 UTC (rev 16000) @@ -21,8 +21,6 @@ */ package org.jboss.ws.tools.wsdl; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -35,10 +33,6 @@ import javax.xml.ws.soap.AddressingFeature; import javax.xml.ws.soap.SOAPBinding; -import org.apache.ws.policy.Policy; -import org.apache.ws.policy.util.PolicyFactory; -import org.apache.ws.policy.util.PolicyWriter; -import org.jboss.ws.WSException; import org.jboss.ws.api.addressing.AddressingConstants; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; @@ -47,11 +41,8 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.extensions.policy.PolicyScopeLevel; -import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.MetaDataExtension; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -72,7 +63,6 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; @@ -164,28 +154,6 @@ processOperation(wsdlInterface, wsdlBinding, operation); } - //Policies - MetaDataExtension ext = endpoint.getExtension(Constants.URI_WS_POLICY); - if (ext != null) - { - PolicyMetaExtension policyExt = (PolicyMetaExtension)ext; - for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT)) - { - addPolicyDefinition(policy); - addPolicyReference(policy, wsdlEndpoint); - } - for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT_TYPE)) - { - addPolicyDefinition(policy); - addPolicyURIAttribute(policy, wsdlInterface); - } - for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_BINDING)) - { - addPolicyDefinition(policy); - addPolicyReference(policy, wsdlBinding); - } - } - // Addressing policies - http://ws.apache.org/commons/neethi/ is not usable thus hacking the code ATM :( // TODO: implement WS-P facade? if (endpoint.isFeatureEnabled(AddressingFeature.class)) @@ -197,29 +165,6 @@ } } - protected void addPolicyDefinition(Policy policy) - { - try - { - PolicyWriter writer = PolicyFactory.getPolicyWriter(PolicyFactory.StAX_POLICY_WRITER); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - writer.writePolicy(policy, outputStream); - Element element = DOMUtils.parse(outputStream.toString(Constants.DEFAULT_XML_CHARSET)); - WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICY, element); - wsdl.addExtensibilityElement(ext); - //optional: to obtain a better looking wsdl, register ws-policy - //prefix in wsdl:definitions if it is not defined there yet - if (wsdl.getPrefix(element.getNamespaceURI())==null) - { - wsdl.registerNamespaceURI(element.getNamespaceURI(),element.getPrefix()); - } - } - catch (IOException ioe) - { - throw new WSException(BundleUtils.getMessage(bundle, "ERROR_WHILE_CONVERTING_POLICY_TO_ELEMENT")); - } - } - /** * JAX-WS 3.11 Service and Ports * <p> @@ -270,22 +215,6 @@ return policyId; } - protected void addPolicyReference(Policy policy, Extendable extendable) - { - QName policyRefQName = Constants.WSDL_ELEMENT_WSP_POLICYREFERENCE; - String prefix = wsdl.getPrefix(policyRefQName.getNamespaceURI()); - if (prefix == null) - { - prefix = "wsp"; - wsdl.registerNamespaceURI(policyRefQName.getNamespaceURI(), prefix); - } - Element element = DOMUtils.createElement(policyRefQName.getLocalPart(), prefix); - element.setAttribute("URI", policy.getPolicyURI()); - //TODO!! we need to understand if the policy is local or not... - WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICYREFERENCE, element); - extendable.addExtensibilityElement(ext); - } - /* * <wsp:PolicyReference URI="#SOME_ID"/> */ @@ -297,22 +226,6 @@ extendable.addExtensibilityElement(new WSDLExtensibilityElement(WSP_NS, policyReferenceElement)); } - protected void addPolicyURIAttribute(Policy policy, Extendable extendable) - { - //TODO!! we need to understand if the policy is local or not... - WSDLProperty prop = extendable.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - if (prop == null) - { - extendable.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policy.getPolicyURI())); - } - else - { - //PolicyURIs ships a comma separated list of URIs... - prop.setValue(prop.getValue() + "," + policy.getPolicyURI()); - } - - } - protected void processOperation(WSDLInterface wsdlInterface, WSDLBinding wsdlBinding, OperationMetaData operation) { WSDLInterfaceOperation interfaceOperation = new WSDLInterfaceOperation(wsdlInterface, operation.getQName()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-19 14:24:23 UTC (rev 16000) @@ -15,7 +15,6 @@ http\://www.w3.org/2003/11/wsdl=schema/wsdl20.xsd http\://www.w3.org/2005/05/xmlmime=schema/xml-media-types.xsd http\://www.w3.org/XML/1998/namespace=schema/xml.xsd -http\://schemas.xmlsoap.org/ws/2004/09/policy=schema/policy_200409.xsd http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schema/oasis-200401-wss-wssecurity-secext-1.0.xsd http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schema/oasis-200401-wss-wssecurity-utility-1.0.xsd http\://www.w3.org/2000/09/xmldsig#=schema/xmldsig-core-schema.xsd Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/policy_200409.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/policy_200409.xsd 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/policy_200409.xsd 2012-03-19 14:24:23 UTC (rev 16000) @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -(c) 2001-2004 BEA Systems Inc., International Business Machines Corporation, Microsoft Corporation, Inc., SAP AG, Sonic Software, and VeriSign, Inc. All rights reserved. - -Permission to copy and display the WS-Policy Specification (the "Specification", which includes WSDL and schema documents), in any medium without fee or royalty is hereby granted, provided that you include the following on ALL copies of the WS-Policy Specification, that you make: - -1. A link or URL to the WS-Policy Specification at one of the Authors' websites -2. The copyright notice as shown in the WS-Policy Specification. - -BEA Systems, IBM, Microsoft, SAP, Sonic Software, and VeriSign (collectively, the "Authors") each agree to grant you a license, under royalty-free and otherwise reasonable, non-discriminatory terms and conditions, to their respective essential patent claims that they deem necessary to implement the WS-Policy Specification. - -THE WS-POLICY SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE WS-POLICY SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE WS-POLICY SPECIFICATION. - -The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity pertaining to the WS-Policy Specification or its contents without specific, written prior permission. Title to copyright in the WS-Policy Specification will at all times remain with the Authors. - -No other rights are granted by implication, estoppel or otherwise. ---> -<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:tns="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-... - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - elementFormDefault="qualified" - blockDefault="#all" > - - <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-... /> - - <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-... /> - - <!-- ////////// WS-Policy ////////// --> - - <xs:element name="Policy" > - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:OperatorContentType" > - <xs:attribute name="TargetNamespace" - type="xs:anyURI" - use="optional" /> - <xs:attribute ref="wsu:Id" use="optional" /> - <xs:anyAttribute namespace="##any" processContents="lax" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="All" type="tns:OperatorContentType" /> - <xs:element name="ExactlyOne" type="tns:OperatorContentType" /> - - <xs:complexType name="OperatorContentType" > - <xs:choice minOccurs="0" maxOccurs="unbounded" > - <xs:element ref="tns:Policy" /> - <xs:element ref="tns:All" /> - <xs:element ref="tns:ExactlyOne" /> - <xs:element ref="tns:PolicyReference" /> - <xs:any namespace="##other" processContents="lax" /> - </xs:choice> - </xs:complexType> - - <xs:element name="PolicyReference" > - <xs:complexType> - <xs:attribute name="URI" type="xs:anyURI" /> - <xs:attribute name="Digest" type="xs:base64Binary" use="optional" /> - <xs:attribute name="DigestAlgorithm" type="xs:anyURI" use="optional" /> - <xs:anyAttribute namespace="##any" processContents="lax" /> - </xs:complexType> - </xs:element> - - <xs:attribute name="Optional" type="xs:boolean" /> - - <!-- ////////// WS-PolicyAttachment ////////// --> - - <xs:element name="UsingPolicy" > - <xs:complexType> - <xs:anyAttribute namespace="##any" processContents="lax" /> - </xs:complexType> - </xs:element> - - <xs:attribute name="PolicyURIs" > - <xs:simpleType> - <xs:list itemType="xs:anyURI" /> - </xs:simpleType> - </xs:attribute> - - <xs:element name="PolicyAttachment" > - <xs:complexType> - <xs:sequence> - <xs:element ref="tns:AppliesTo" /> - <xs:choice maxOccurs="unbounded" > - <xs:element ref="tns:Policy" /> - <xs:element ref="tns:PolicyReference" /> - </xs:choice> -<!-- omitted only because it causes the content model to be non-determistic - <xs:element ref="wsse:Security" minOccurs="0" /> ---> - <xs:any namespace="##other" - processContents="lax" - minOccurs="0" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:anyAttribute namespace="##any" processContents="lax" /> - </xs:complexType> - </xs:element> - - <xs:element name="AppliesTo" > - <xs:complexType> - <xs:sequence> - <xs:any namespace="##any" - processContents="lax" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:anyAttribute namespace="##any" processContents="lax" /> - </xs:complexType> - </xs:element> - -</xs:schema> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -162,16 +162,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <outputFileNameMapping>wscommons-policy.jar</outputFileNameMapping> - <includes> - <include>ws-commons:policy:jar</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> <include>junit:junit:jar</include> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -43,7 +43,6 @@ <module name="org.picketbox"/> <module name="org.apache.xerces" services="import"/> <module name="org.apache.santuario.xmlsec" /> - <module name="org.apache.ws.commons.policy" optional="true"/> <module name="org.javassist" /> <module name="org.jboss.netty" /> <module name="org.jboss.xb" /> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -88,11 +88,6 @@ <include name="**/jbossxb.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/apache/ws/commons/policy/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/wscommons-policy.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/xmlsec.jar"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -83,16 +83,6 @@ /> <wsconsume-macro - wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" - package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" - outputDir="${tests.output.dir}" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - /> - - <wsconsume-macro wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" outputDir="${tests.output.dir}" Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -30,7 +30,6 @@ <classpath> <pathelement path="${maven.test.classpath}"/> </classpath> - <classpath location="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"/> </taskdef> <wsprovide-macro @@ -44,17 +43,6 @@ resourcesDir="wsprovide/jaxws/samples/wssecurity" /> - <wsprovide-macro - sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean" - destDir="" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - outputDir="${tests.output.dir}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - resourcesDir="wsprovide/jaxws/samples/wssecurityAnnotatedpolicy" - /> - </target> <macrodef name="wsprovide-macro"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -241,27 +241,6 @@ </manifest> </war> - <!-- jaxws-samples-wssecurityAnnotatedpolicy-encrypt --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/UserType.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/ObjectFactory.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF"> - <include name="Policy.xml"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jaxws-samples-wssecuritypolicy-encrypt --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecuritypolicy-encrypt.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2012-03-19 14:24:23 UTC (rev 16000) @@ -21,33 +21,21 @@ */ package org.jboss.test.ws.common.wsdl11; -import java.io.File; -import java.io.Writer; import java.net.URL; -import java.util.List; import javax.xml.namespace.QName; -import org.jboss.test.ws.tools.validation.WSDLValidator; import org.jboss.ws.common.Constants; -import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; -import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.ws.common.IOUtils; -import org.w3c.dom.Element; /** * Test the unmarshalling of wsdl-1.1 into the unified wsdl structure @@ -160,120 +148,4 @@ assertNotNull(wsdlDefinitions); // should throw an Exception when SWA parts are not skipped } - /************************************************** - * Test WSDL 1.1 marshal/unmarshal with policies * - **************************************************/ - - public void testPolicyAttachment() throws Exception - { - URL wsdlFile = getResourceURL("common/wsdl11/PolicyAttachment.wsdl"); - testPolicyAttachment(wsdlFile); - wsdlFile = getResourceURL("common/wsdl11/PolicyAttachmentFragment.wsdl"); - testPolicyAttachment(wsdlFile); - } - - private void testPolicyAttachment(URL wsdlFile) throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile); - assertNotNull(wsdlDefinitions); - List<WSDLExtensibilityElement> list = wsdlDefinitions.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY); - assertNotNull(list); - assertEquals(list.size(),5); - for (WSDLExtensibilityElement extEl : list) - { - Element el = extEl.getElement(); - assertNotNull(el); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName,new QName("http://schemas.xmlsoap.org/ws/2004/09/policy","Poli...); - assertNotNull(el.getAttributeNodeNS("http://docs.oasis-open.org/wss/...; - //System.out.println(DOMWriter.printNode(extEl.getElement(),true)); - } - } - - public void testServicePolicyRef() throws Exception - { - URL wsdlFile = getResourceURL("common/wsdl11/PolicyAttachment.wsdl"); - testServicePolicyRef(wsdlFile); - wsdlFile = getResourceURL("common/wsdl11/PolicyAttachmentFragment.wsdl"); - testServicePolicyRef(wsdlFile); - } - - public void testServicePolicyRef(URL wsdlFile) throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - List<WSDLExtensibilityElement> list = wsdlService.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(list); - assertEquals(list.size(),1); - assertPolicyRef(list.get(0),"uselessServicePolicy"); - } - - public void testEndpointPolicyRef() throws Exception - { - URL wsdlFile = getResourceURL("common/wsdl11/PolicyAttachment.wsdl"); - testEndpointPolicyRef(wsdlFile); - wsdlFile = getResourceURL("common/wsdl11/PolicyAttachmentFragment.wsdl"); - testEndpointPolicyRef(wsdlFile); - } - - public void testEndpointPolicyRef(URL wsdlFile) throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoints()[0]; - - List<WSDLExtensibilityElement> extPortList = wsdlEndpoint.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extPortList); - assertEquals(extPortList.size(),1); - assertPolicyRef(extPortList.get(0),"uselessPortPolicy"); - - WSDLProperty extPortTypeProp = wsdlEndpoint.getInterface().getProperty( - Constants.WSDL_PROPERTY_POLICYURIS); - assertEquals(extPortTypeProp.getValue(),"#RmPolicy"); - - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - List<WSDLExtensibilityElement> extBinding = wsdlBinding.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extBinding); - assertEquals(extBinding.size(),2); - assertPolicyRef(extBinding.get(0),"RmPolicy"); - assertPolicyRef(extBinding.get(1),"X509EndpointPolicy"); - } - - private void assertPolicyRef(WSDLExtensibilityElement extEl, String policyURI) - { - Element el = extEl.getElement(); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName,new QName("http://schemas.xmlsoap.org/ws/2004/09/policy","Poli...); - assertNotNull(el); - assertEquals(el.getAttributeNode("URI").getValue(),"#"+policyURI); - } - - public void testPolicyAttachmentReadWrite() throws Exception - { - //Read wsdl containing policies from file and get the wsdl metadata model - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(getResourceURL("/common/wsdl11/PolicyAttachment.wsdl")); - assertNotNull(wsdlDefinitions); - //set wsdlOneOne to null to force wsdl generation from metadata model - wsdlDefinitions.setWsdlOneOneDefinition(null); - - //process the wsdl metadata model writing it back to another file - File wsdlDir = new File("./tools/wsdl-out"); - if (!wsdlDir.exists()) wsdlDir.mkdirs(); - Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlDir+"/GeneratedWsdlWithPolicies.wsdl"), Constants.DEFAULT_XML_CHARSET); - new WSDLWriter(wsdlDefinitions).write(fw, Constants.DEFAULT_XML_CHARSET); - fw.close(); - - //parse the obtained file and validate the resulting wsdl metadata model against the first one - WSDLDefinitions newWsdlDefinitions = factory.parse(new File(wsdlDir+"/GeneratedWsdlWithPolicies.wsdl").toURI().toURL()); - assertNotNull(newWsdlDefinitions); - WSDLValidator validator = new WSDLValidator(); - assertTrue(validator.validate(wsdlDefinitions,newWsdlDefinitions)); - } } Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java 2012-03-19 14:24:23 UTC (rev 16000) @@ -1,127 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.common.wsdl11; - -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.jboss.ws.common.Constants; -import org.jboss.ws.metadata.wsdl.WSDLBinding; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.w3c.dom.Element; - -/** - * Test the unmarshalling of wsdl-1.1 into the unified wsdl structure - * using known and unknown wsdl extensibility elements. - * - * @author alessio.soldano(a)jboss.com - * @since 15-Jan-2009 - */ -public class WSDLExtensElemTestCase extends JBossWSTest -{ - public void testPolicyEndpointExtensibilityElements() throws Exception - { - URL wsdlFile = getResourceURL("common/wsdl11/PolicyAttachment.wsdl"); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoints()[0]; - - List<WSDLExtensibilityElement> extPortList = wsdlEndpoint.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extPortList); - assertEquals(extPortList.size(),1); - assertPolicyRef(extPortList.get(0),"uselessPortPolicy"); - List<WSDLExtensibilityElement> portNotUnderstoodList = wsdlEndpoint.getNotUnderstoodExtElements(); - assertNotNull(portNotUnderstoodList); - assertEquals(0, portNotUnderstoodList.size()); - - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - List<WSDLExtensibilityElement> extBinding = wsdlBinding.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extBinding); - assertEquals(extBinding.size(),2); - assertPolicyRef(extBinding.get(0),"RmPolicy"); - assertPolicyRef(extBinding.get(1),"X509EndpointPolicy"); - List<WSDLExtensibilityElement> bindingNotUnderstoodList = wsdlBinding.getNotUnderstoodExtElements(); - assertNotNull(bindingNotUnderstoodList); - assertEquals(0, bindingNotUnderstoodList.size()); - } - - public void testPolicyAndUnkwnownEndpointExtensibilityElements() throws Exception - { - URL wsdlFile = getResourceURL("common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl"); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoints()[0]; - - List<WSDLExtensibilityElement> extPortList = wsdlEndpoint.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extPortList); - assertEquals(extPortList.size(),1); - assertPolicyRef(extPortList.get(0),"uselessPortPolicy"); - List<WSDLExtensibilityElement> portNotUnderstoodList = wsdlEndpoint.getNotUnderstoodExtElements(); - assertNotNull(portNotUnderstoodList); - assertEquals(1, portNotUnderstoodList.size()); - assertUnknownExtElem(portNotUnderstoodList.get(0), "foo1", "http://foo.org/foo1", "bar", true); - - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - List<WSDLExtensibilityElement> extBinding = wsdlBinding.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extBinding); - assertEquals(extBinding.size(),2); - assertPolicyRef(extBinding.get(0),"RmPolicy"); - assertPolicyRef(extBinding.get(1),"X509EndpointPolicy"); - List<WSDLExtensibilityElement> bindingNotUnderstoodList = wsdlBinding.getNotUnderstoodExtElements(); - assertNotNull(bindingNotUnderstoodList); - assertEquals(2, bindingNotUnderstoodList.size()); - assertUnknownExtElem(bindingNotUnderstoodList.get(0), "foo1", "http://foo.org/foo1", "bar", false); - assertUnknownExtElem(bindingNotUnderstoodList.get(1), "foo2", "http://foo.org/foo2", "bar", false); - } - - private static void assertPolicyRef(WSDLExtensibilityElement extEl, String policyURI) - { - Element el = extEl.getElement(); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName,new QName("http://schemas.xmlsoap.org/ws/2004/09/policy","Poli...); - assertEquals(el.getAttributeNode("URI").getValue(),"#"+policyURI); - } - - private static void assertUnknownExtElem(WSDLExtensibilityElement extEl, String prefix, String namespaceURI, String localName, boolean required) - { - Element el = extEl.getElement(); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName, new QName(namespaceURI, localName, prefix)); - assertEquals(required, "true".equals(el.getAttributeNS(Constants.NS_WSDL11, "required"))); - assertEquals(required, extEl.isRequired()); - } -} Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl 2012-03-19 14:24:23 UTC (rev 16000) @@ -1,134 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" - xmlns:tns="http://org.jboss.ws/jaxrpc" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:ns2="http://org.jboss.ws/jaxrpc/types" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... > - <wsp:Policy wsu:Id="RmPolicy" > - <rmp:RMAssertion> - <rmp:InactivityTimeout Milliseconds="600000" /> - <rmp:BaseRetransmissionInterval Milliseconds="3000" /> - <rmp:ExponentialBackoff /> - <rmp:AcknowledgementInterval Milliseconds="200" /> - </rmp:RMAssertion> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessServicePolicy" > - <fab:useless>nothing</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessPortPolicy" > - <fab:useless>nothing again</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:AsymmetricBinding> - <wsp:Policy> - <!-- Details omitted for readability --> - <sp:IncludeTimestamp /> - <sp:OnlySignEntireHeadersAndBody /> - </wsp:Policy> - </sp:AsymmetricBinding> - </wsp:Policy> - <wsp:Policy wsu:Id="SecureMessagePolicy" > - <sp:SignedParts> - <sp:Body /> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body /> - </sp:EncryptedParts> - </wsp:Policy> - <types> - <schema targetNamespace="http://org.jboss.ws/jaxrpc/types" xmlns:tns="http://org.jboss.ws/jaxrpc/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema"> - <complexType name="echoSimpleUserType"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="SimpleUserType_2" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="SimpleUserType"> - <sequence> - <element name="a" type="int"/> - <element name="b" type="int"/> - </sequence> - </complexType> - <complexType name="echoSimpleUserTypeResponse"> - <sequence> - <element name="result" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoString"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="String_2" type="string" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoStringResponse"> - <sequence> - <element name="result" type="string" nillable="true"/> - </sequence> - </complexType> - <element name="echoSimpleUserType" type="tns:echoSimpleUserType"/> - <element name="echoSimpleUserTypeResponse" type="tns:echoSimpleUserTypeResponse"/> - <element name="echoString" type="tns:echoString"/> - <element name="echoStringResponse" type="tns:echoStringResponse"/> - </schema> - </types> - <message name="JaxRpcTestService_echoSimpleUserType"> - <part name="parameters" element="ns2:echoSimpleUserType"/> - </message> - <message name="JaxRpcTestService_echoSimpleUserTypeResponse"> - <part name="result" element="ns2:echoSimpleUserTypeResponse"/> - </message> - <message name="JaxRpcTestService_echoString"> - <part name="parameters" element="ns2:echoString"/> - </message> - <message name="JaxRpcTestService_echoStringResponse"> - <part name="result" element="ns2:echoStringResponse"/> - </message> - <portType name="JaxRpcTestService" wsp:PolicyURIs="#RmPolicy"> - <operation name="echoSimpleUserType"> - <input message="tns:JaxRpcTestService_echoSimpleUserType"/> - <output message="tns:JaxRpcTestService_echoSimpleUserTypeResponse"/> - </operation> - <operation name="echoString"> - <input message="tns:JaxRpcTestService_echoString"/> - <output message="tns:JaxRpcTestService_echoStringResponse"/> - </operation> - </portType> - <binding name="JaxRpcTestServiceBinding" type="tns:JaxRpcTestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <wsp:PolicyReference URI="#RmPolicy" wsdl:required="true" /> - <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> - <operation name="echoSimpleUserType"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="echoString"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - <service name="TestService"> - <wsp:PolicyReference URI="#uselessServicePolicy" wsdl:required="true" /> - <port name="JaxRpcTestServicePort" binding="tns:JaxRpcTestServiceBinding"> - <wsp:PolicyReference URI="#uselessPortPolicy" wsdl:required="true" /> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl 2012-03-19 14:24:23 UTC (rev 16000) @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" - xmlns:tns="http://org.jboss.ws/jaxrpc" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:ns2="http://org.jboss.ws/jaxrpc/types" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:foo1="http://foo.org/foo1" - xmlns:foo2="http://foo.org/foo2" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... > - <wsp:Policy wsu:Id="RmPolicy" > - <rmp:RMAssertion> - <rmp:InactivityTimeout Milliseconds="600000" /> - <rmp:BaseRetransmissionInterval Milliseconds="3000" /> - <rmp:ExponentialBackoff /> - <rmp:AcknowledgementInterval Milliseconds="200" /> - </rmp:RMAssertion> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessServicePolicy" > - <fab:useless>nothing</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessPortPolicy" > - <fab:useless>nothing again</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:AsymmetricBinding> - <wsp:Policy> - <!-- Details omitted for readability --> - <sp:IncludeTimestamp /> - <sp:OnlySignEntireHeadersAndBody /> - </wsp:Policy> - </sp:AsymmetricBinding> - </wsp:Policy> - <wsp:Policy wsu:Id="SecureMessagePolicy" > - <sp:SignedParts> - <sp:Body /> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body /> - </sp:EncryptedParts> - </wsp:Policy> - <types> - <schema targetNamespace="http://org.jboss.ws/jaxrpc/types" xmlns:tns="http://org.jboss.ws/jaxrpc/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema"> - <complexType name="echoSimpleUserType"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="SimpleUserType_2" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="SimpleUserType"> - <sequence> - <element name="a" type="int"/> - <element name="b" type="int"/> - </sequence> - </complexType> - <complexType name="echoSimpleUserTypeResponse"> - <sequence> - <element name="result" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoString"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="String_2" type="string" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoStringResponse"> - <sequence> - <element name="result" type="string" nillable="true"/> - </sequence> - </complexType> - <element name="echoSimpleUserType" type="tns:echoSimpleUserType"/> - <element name="echoSimpleUserTypeResponse" type="tns:echoSimpleUserTypeResponse"/> - <element name="echoString" type="tns:echoString"/> - <element name="echoStringResponse" type="tns:echoStringResponse"/> - </schema> - </types> - <message name="JaxRpcTestService_echoSimpleUserType"> - <part name="parameters" element="ns2:echoSimpleUserType"/> - </message> - <message name="JaxRpcTestService_echoSimpleUserTypeResponse"> - <part name="result" element="ns2:echoSimpleUserTypeResponse"/> - </message> - <message name="JaxRpcTestService_echoString"> - <part name="parameters" element="ns2:echoString"/> - </message> - <message name="JaxRpcTestService_echoStringResponse"> - <part name="result" element="ns2:echoStringResponse"/> - </message> - <portType name="JaxRpcTestService" wsp:PolicyURIs="#RmPolicy"> - <operation name="echoSimpleUserType"> - <input message="tns:JaxRpcTestService_echoSimpleUserType"/> - <output message="tns:JaxRpcTestService_echoSimpleUserTypeResponse"/> - </operation> - <operation name="echoString"> - <input message="tns:JaxRpcTestService_echoString"/> - <output message="tns:JaxRpcTestService_echoStringResponse"/> - </operation> - </portType> - <binding name="JaxRpcTestServiceBinding" type="tns:JaxRpcTestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <wsp:PolicyReference URI="#RmPolicy" wsdl:required="true" /> - <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> - <foo1:bar wsdl:required="false"/> - <foo2:bar/> - <operation name="echoSimpleUserType"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="echoString"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - <service name="TestService"> - <wsp:PolicyReference URI="#uselessServicePolicy" wsdl:required="true" /> - <port name="JaxRpcTestServicePort" binding="tns:JaxRpcTestServiceBinding"> - <wsp:PolicyReference URI="#uselessPortPolicy" wsdl:required="true" /> - <foo1:bar wsdl:required="true"/> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl 2012-03-19 14:24:23 UTC (rev 16000) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" - xmlns:tns="http://org.jboss.ws/jaxrpc" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... > - <wsp:Policy wsu:Id="RmPolicy" > - <rmp:RMAssertion> - <rmp:InactivityTimeout Milliseconds="600000" /> - <rmp:BaseRetransmissionInterval Milliseconds="3000" /> - <rmp:ExponentialBackoff /> - <rmp:AcknowledgementInterval Milliseconds="200" /> - </rmp:RMAssertion> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessServicePolicy" > - <fab:useless>nothing</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessPortPolicy" > - <fab:useless>nothing again</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:AsymmetricBinding> - <wsp:Policy> - <!-- Details omitted for readability --> - <sp:IncludeTimestamp /> - <sp:OnlySignEntireHeadersAndBody /> - </wsp:Policy> - </sp:AsymmetricBinding> - </wsp:Policy> - <wsp:Policy wsu:Id="SecureMessagePolicy" > - <sp:SignedParts> - <sp:Body /> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body /> - </sp:EncryptedParts> - </wsp:Policy> - <types> - </types> - <portType name="JaxRpcTestService" wsp:PolicyURIs="#RmPolicy"> - </portType> - <binding name="JaxRpcTestServiceBinding" type="tns:JaxRpcTestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <wsp:PolicyReference URI="#RmPolicy" wsdl:required="true" /> - <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> - </binding> - <service name="TestService"> - <wsp:PolicyReference URI="#uselessServicePolicy" wsdl:required="true" /> - <port name="JaxRpcTestServicePort" binding="tns:JaxRpcTestServiceBinding"> - <wsp:PolicyReference URI="#uselessPortPolicy" wsdl:required="true" /> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-19 14:02:28 UTC (rev 15999) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-19 14:24:23 UTC (rev 16000) @@ -84,7 +84,6 @@ <sun.policy.version>2.0-b01</sun.policy.version> <stax.api.version>1.0-2</stax.api.version> <woodstox.version>3.2.6</woodstox.version> - <wscommons.policy.version>1.0</wscommons.policy.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xmlsec.version>1.5.1</xmlsec.version> <xerces.version>2.9.1</xerces.version> @@ -325,11 +324,6 @@ <version>${jboss.logging.version}</version> </dependency> <dependency> - <groupId>ws-commons</groupId> - <artifactId>policy</artifactId> - <version>${wscommons.policy.version}</version> - </dependency> - <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-lgpl</artifactId> <version>${woodstox.version}</version>