JBossWS SVN: r16001 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-19 11:40:35 -0400 (Mon, 19 Mar 2012)
New Revision: 16001
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
stack/native/branches/jbossws-native-3.1.2/pom.xml
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBPAPP-7599] Moving to Santuario 1.5.1, adding gcm based algorithms and defaulting to aes-128-gcm
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2012-03-19 14:24:23 UTC (rev 16000)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2012-03-19 15:40:35 UTC (rev 16001)
@@ -171,7 +171,7 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
<dependency>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-19 14:24:23 UTC (rev 16000)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-19 15:40:35 UTC (rev 16001)
@@ -22,6 +22,7 @@
package org.jboss.ws.extensions.security;
import java.io.IOException;
+import java.io.OutputStream;
import javax.xml.parsers.ParserConfigurationException;
@@ -88,9 +89,15 @@
return STR_URI;
}
+ @Override
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform transformObject) throws IOException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
+ {
+ return enginePerformTransform(input, null, transformObject);
+ }
@Override
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) throws IOException, CanonicalizationException,
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, OutputStream os, Transform transformObject) throws IOException, CanonicalizationException,
InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
{
@@ -114,7 +121,7 @@
element = token.getSTRTransformElement();
// Obtain the canonicalizer specified in the transformation parameters
- Element parameters = XMLUtils.selectNode(this._transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
+ Element parameters = XMLUtils.selectNode(transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
"TransformationParameters", 0);
if (parameters == null)
throw new TransformationException("wsse:TransformationParameters expected!");
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2012-03-19 14:24:23 UTC (rev 16000)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2012-03-19 15:40:35 UTC (rev 16001)
@@ -76,7 +76,7 @@
private static HashMap<String, Algorithm> algorithms;
- private static final String DEFAULT_ALGORITHM = "aes-128";
+ private static final String DEFAULT_ALGORITHM = "aes-128-gcm";
static
{
@@ -84,6 +84,9 @@
algorithms.put("aes-128", new Algorithm("AES", XMLCipher.AES_128, 128));
algorithms.put("aes-192", new Algorithm("AES", XMLCipher.AES_192, 192));
algorithms.put("aes-256", new Algorithm("AES", XMLCipher.AES_256, 256));
+ algorithms.put("aes-128-gcm", new Algorithm("AES", XMLCipher.AES_128_GCM, 128));
+ algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
+ algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
}
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-03-19 14:24:23 UTC (rev 16000)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-03-19 15:40:35 UTC (rev 16001)
@@ -73,7 +73,7 @@
<sun.jaxws.version>2.1.7</sun.jaxws.version>
<woodstox.version>3.2.9</woodstox.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
- <xmlsec.version>1.4.3</xmlsec.version>
+ <xmlsec.version>1.5.1</xmlsec.version>
<xalan.version>2.7.1.patch02</xalan.version>
<xerces.version>2.9.1</xerces.version>
</properties>
@@ -361,7 +361,7 @@
<version>${xerces.version}</version>
</dependency>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
</dependency>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 14:24:23 UTC (rev 16000)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 15:40:35 UTC (rev 16001)
@@ -51,7 +51,7 @@
<include>org.jvnet.staxex:stax-ex:jar</include>
<include>com.sun.xml.stream.buffer:streambuffer:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
- <include>org.apache:xmlsec:jar</include>
+ <include>org.apache.santuario:xmlsec:jar</include>
<include>org.codehaus.woodstox:wstx:jar</include>
</includes>
</dependencySet>
14 years
JBossWS SVN: r16000 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 19 other directories.
by jbossws-commits@lists.jboss.org
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-wssecurity-secext..."
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- elementFormDefault="qualified"
- blockDefault="#all" >
-
- <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..."
- schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..." />
-
- <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." />
-
- <!-- ////////// 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","Policy","wsp"));
- assertNotNull(el.getAttributeNodeNS("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...","Id"));
- //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","PolicyReference","wsp"));
- 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","PolicyReference","wsp"));
- 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-wssecurity-utilit..." >
- <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-wssecurity-utilit..." >
- <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-wssecurity-utilit..." >
- <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>
14 years
JBossWS SVN: r15999 - in stack/native/trunk: modules/core and 21 other directories.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-03-19 10:02:28 -0400 (Mon, 19 Mar 2012)
New Revision: 15999
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/policy/
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/
stack/native/trunk/modules/core/src/main/resources/schema/policy_200409.xsd
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/ws/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wspolicy/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wspolicy/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1645/
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
stack/native/trunk/pom.xml
Log:
[JBWS-3467] removing ws-policy support
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/pom.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/Message.properties 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/core/src/main/resources/schema/policy_200409.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/policy_200409.xsd 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/core/src/main/resources/schema/policy_200409.xsd 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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-wssecurity-secext..."
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- elementFormDefault="qualified"
- blockDefault="#all" >
-
- <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..."
- schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..." />
-
- <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." />
-
- <!-- ////////// 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/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -173,16 +173,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/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/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)
@@ -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/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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","Policy","wsp"));
- assertNotNull(el.getAttributeNodeNS("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...","Id"));
- //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","PolicyReference","wsp"));
- 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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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","PolicyReference","wsp"));
- 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/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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-wssecurity-utilit..." >
- <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/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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-wssecurity-utilit..." >
- <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/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl 2012-03-19 14:02:28 UTC (rev 15999)
@@ -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-wssecurity-utilit..." >
- <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/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-03-19 10:51:19 UTC (rev 15998)
+++ stack/native/trunk/pom.xml 2012-03-19 14:02:28 UTC (rev 15999)
@@ -92,7 +92,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>
@@ -366,11 +365,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>
14 years
JBossWS SVN: r15998 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/ws/annotation and 8 other directories.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-03-19 06:51:19 -0400 (Mon, 19 Mar 2012)
New Revision: 15998
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/validation/
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1172/
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-8481] Merged revisions 15997 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15997 | ropalka | 2012-03-19 11:42:34 +0100 (Mon, 19 Mar 2012) | 1 line
[JBWS-3466] removing SchemaValidation feature
.......
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
+ /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
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java 2012-03-19 10:42:34 UTC (rev 15997)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java 2012-03-19 10:51:19 UTC (rev 15998)
@@ -1,65 +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.ws.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
-import org.jboss.ws.extensions.validation.StrictlyValidErrorHandler;
-import org.jboss.ws.feature.SchemaValidationFeature;
-
-/**
- * This feature represents the use of schema validation with a
- * web service.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE })
-@EndpointFeature( id = SchemaValidationFeature.ID)
-@WebServiceFeatureAnnotation(id = SchemaValidationFeature.ID, bean = SchemaValidationFeature.class)
-public @interface SchemaValidation
-{
- /**
- * Optional property for the schema location. If this is not specified the schema
- * will be attempted to extract from the WSDL.
- *
- * The syntax is the same as for schemaLocation attributes in instance documents: e.g, "http://www.example.com file_name.xsd".
- */
- String schemaLocation() default "";
-
- /**
- * Optional property for the error handler.
- * If this is not specified the @{ValidationErrorHandler} will be used.
- */
- Class errorHandler() default StrictlyValidErrorHandler.class;
-
- /**
- * Specifies if the feature is enabled or disabled
- */
- boolean enabled() default true;
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 10:42:34 UTC (rev 15997)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 10:51:19 UTC (rev 15998)
@@ -41,7 +41,6 @@
import org.jboss.ws.core.jaxws.binding.BindingExt;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.feature.ChunkedEncodingFeature;
-import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureSet;
@@ -69,7 +68,6 @@
private static FeatureSet supportedFeatures = new FeatureSet();
static
{
- supportedFeatures.addFeature(new SchemaValidationFeature());
supportedFeatures.addFeature(new AddressingFeature());
supportedFeatures.addFeature(new MTOMFeature());
supportedFeatures.addFeature(new RespectBindingFeature());
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2012-03-19 10:42:34 UTC (rev 15997)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2012-03-19 10:51:19 UTC (rev 15998)
@@ -21,27 +21,11 @@
*/
package org.jboss.ws.core.soap;
-import java.io.InputStream;
-import java.util.ResourceBundle;
-import org.jboss.ws.api.util.BundleUtils;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBodyElement;
-import javax.xml.transform.Source;
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.SOAPContent.State;
-import org.jboss.ws.extensions.validation.SchemaExtractor;
-import org.jboss.ws.extensions.validation.SchemaValidationHelper;
-import org.jboss.ws.feature.SchemaValidationFeature;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.common.DOMUtils;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
/**
* An abstract implemenation of the SOAPBodyElement
@@ -54,12 +38,6 @@
*/
public class SOAPBodyElementDoc extends SOAPContentElement implements SOAPBodyElement
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointMetaData.class);
- // provide logging
- private static Logger log = Logger.getLogger(SOAPBodyElementDoc.class);
-
- private SchemaValidationFeature feature;
-
public SOAPBodyElementDoc(Name name)
{
super(name);
@@ -81,74 +59,8 @@
State prevState = soapContent.getState();
if (nextState != prevState)
{
- if (isValidationEnabled() && nextState == State.OBJECT_VALID)
- {
- log.info("Validating: " + prevState);
- validatePayload(soapContent.getPayload());
- }
-
prevState = super.transitionTo(nextState);
-
- if (isValidationEnabled() && prevState == State.OBJECT_VALID)
- {
- log.info("Validating: " + nextState);
- validatePayload(soapContent.getPayload());
- }
}
return prevState;
}
-
- private void validatePayload(Source source)
- {
- SchemaExtractor schemaExtractor = new SchemaExtractor();
- try
- {
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
- feature = epMetaData.getFeature(SchemaValidationFeature.class);
- URL xsdURL = feature.getSchemaLocation() != null ? new URL(feature.getSchemaLocation()) : null;
- InputStream[] xsdStreams = null;
- if (xsdURL == null)
- {
- URL wsdlURL = epMetaData.getServiceMetaData().getWsdlFileOrLocation();
- if (wsdlURL == null)
- {
- log.warn(BundleUtils.getMessage(bundle, "VALIDATION_ERROR"));
- }
- else
- {
- xsdStreams = schemaExtractor.getSchemas(wsdlURL);
- }
- }
- if (xsdURL != null)
- {
- ErrorHandler errorHandler = feature.getErrorHandler();
- Element xmlDOM = DOMUtils.sourceToElement(source);
- new SchemaValidationHelper(xsdURL).setErrorHandler(errorHandler).validateDocument(xmlDOM);
- }
- else //xsdStreams != null
- {
- ErrorHandler errorHandler = feature.getErrorHandler();
- Element xmlDOM = DOMUtils.sourceToElement(source);
- new SchemaValidationHelper(xsdStreams).setErrorHandler(errorHandler).validateDocument(xmlDOM);
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- WSException.rethrow(ex);
- }
- }
-
- private boolean isValidationEnabled()
- {
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- if (msgContext != null)
- feature = msgContext.getEndpointMetaData().getFeature(SchemaValidationFeature.class);
-
- return feature != null ? feature.isEnabled() : false;
- }
}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java 2012-03-19 10:42:34 UTC (rev 15997)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java 2012-03-19 10:51:19 UTC (rev 15998)
@@ -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.ws.feature;
-
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.common.Constants;
-import org.jboss.ws.extensions.validation.StrictlyValidErrorHandler;
-import org.xml.sax.ErrorHandler;
-
-/**
- * This feature represents the use of schema validation with a
- * web service.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-public final class SchemaValidationFeature extends WebServiceFeature
-{
- /**
- * Constant value identifying the SchemaValidationFeature
- */
- public static final String ID = Constants.NS_JBOSSWS_URI + "/features/schema-validation";
-
- /**
- * Optional property for the schema location. If this is not specified the schema
- * will be attempted to extract from the WSDL.
- *
- * The syntax is the same as for schemaLocation attributes in instance documents: e.g, "http://www.example.com file_name.xsd".
- */
- protected String schemaLocation;
-
- /**
- * Optional property for the error handler.
- * If this is not specified the @{ValidationErrorHandler} will be used.
- */
- protected ErrorHandler errorHandler = new StrictlyValidErrorHandler();
-
- /**
- * Create an <code>SchemaValidationFeature</code>.
- * The instance created will be enabled.
- */
- public SchemaValidationFeature()
- {
- this.enabled = true;
- }
-
- /**
- * Creates an <code>SchemaValidationFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- */
- public SchemaValidationFeature(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * Creates an <code>SchemaValidationFeature</code>.
- *
- * @param schemaLocation specifies the schema location for this feature
- */
- public SchemaValidationFeature(String schemaLocation)
- {
- this.schemaLocation = schemaLocation;
- this.enabled = true;
- }
-
- /**
- * Creates an <code>SchemaValidationFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- * @param schemaLocation specifies the schema location for this feature
- */
- public SchemaValidationFeature(boolean enabled, String schemaLocation)
- {
- this.schemaLocation = schemaLocation;
- this.enabled = enabled;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getID()
- {
- return ID;
- }
-
- public String getSchemaLocation()
- {
- return schemaLocation;
- }
-
- public void setSchemaLocation(String schemaLocation)
- {
- this.schemaLocation = schemaLocation;
- }
-
- public ErrorHandler getErrorHandler()
- {
- return errorHandler;
- }
-
- public void setErrorHandler(ErrorHandler errorHandler)
- {
- this.errorHandler = errorHandler;
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 10:42:34 UTC (rev 15997)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 10:51:19 UTC (rev 15998)
@@ -21,9 +21,7 @@
*/
package org.jboss.ws.metadata.builder.jaxws;
-import java.io.IOException;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.List;
import java.util.ResourceBundle;
@@ -38,12 +36,9 @@
import javax.xml.ws.spi.WebServiceFeatureAnnotation;
import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.annotation.SchemaValidation;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
-import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
@@ -53,10 +48,8 @@
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement;
import org.jboss.ws.metadata.wsdl.WSDLService;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-import org.xml.sax.ErrorHandler;
/**
* Process EndpointFeature annotations
@@ -88,10 +81,6 @@
MTOMFeature feature = new MTOMFeature(anFeature.enabled(), anFeature.threshold());
sepMetaData.addFeature(feature);
}
- else if (an.annotationType() == SchemaValidation.class)
- {
- processSchemaValidation(dep, sepMetaData, sepClass);
- }
else if (an.annotationType() == RespectBinding.class)
{
RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class);
@@ -195,42 +184,4 @@
}
}
- private void processSchemaValidation(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass)
- {
- SchemaValidation anFeature = sepClass.getAnnotation(SchemaValidation.class);
- SchemaValidationFeature feature = new SchemaValidationFeature(anFeature.enabled());
-
- String xsdLoc = anFeature.schemaLocation();
- if (xsdLoc.length() > 0)
- {
- if (dep instanceof ArchiveDeployment)
- {
- try
- {
- URL xsdURL = ((ArchiveDeployment)dep).getResourceResolver().resolve(xsdLoc);
- xsdLoc = xsdURL.toExternalForm();
- }
- catch (IOException ex)
- {
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_SCHEMA", xsdLoc), ex);
- }
- }
- feature.setSchemaLocation(xsdLoc);
- }
-
- Class<?> handlerClass = anFeature.errorHandler();
- if (handlerClass != null)
- {
- try
- {
- ErrorHandler errorHandler = (ErrorHandler)handlerClass.newInstance();
- feature.setErrorHandler(errorHandler);
- }
- catch (Exception ex)
- {
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_INSTANCIATE_ERROR_HANDLER", handlerClass), ex);
- }
- }
- sepMetaData.addFeature(feature);
- }
}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 10:42:34 UTC (rev 15997)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 10:51:19 UTC (rev 15998)
@@ -160,18 +160,6 @@
</metainf>
</jar>
- <!-- jaxws-jbws1172 -->
- <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1172.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1172/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1172/NonValidatingEndpoint.class" />
- <include name="org/jboss/test/ws/jaxws/jbws1172/ValidatingEndpoint.class" />
- <include name="org/jboss/test/ws/jaxws/jbws1172/types/*.class" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1172/WEB-INF">
- <include name="wsdl/**" />
- </webinf>
- </war>
-
<!-- jaxws-jbws1309-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1309.jar">
<fileset dir="${tests.output.dir}/test-classes">
14 years
JBossWS SVN: r15997 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/jaxws/client and 7 other directories.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-03-19 06:42:34 -0400 (Mon, 19 Mar 2012)
New Revision: 15997
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1172/
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-3466] removing SchemaValidation feature
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java 2012-03-19 09:52:46 UTC (rev 15996)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/SchemaValidation.java 2012-03-19 10:42:34 UTC (rev 15997)
@@ -1,65 +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.ws.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
-import org.jboss.ws.extensions.validation.StrictlyValidErrorHandler;
-import org.jboss.ws.feature.SchemaValidationFeature;
-
-/**
- * This feature represents the use of schema validation with a
- * web service.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE })
-@EndpointFeature( id = SchemaValidationFeature.ID)
-@WebServiceFeatureAnnotation(id = SchemaValidationFeature.ID, bean = SchemaValidationFeature.class)
-public @interface SchemaValidation
-{
- /**
- * Optional property for the schema location. If this is not specified the schema
- * will be attempted to extract from the WSDL.
- *
- * The syntax is the same as for schemaLocation attributes in instance documents: e.g, "http://www.example.com file_name.xsd".
- */
- String schemaLocation() default "";
-
- /**
- * Optional property for the error handler.
- * If this is not specified the @{ValidationErrorHandler} will be used.
- */
- Class errorHandler() default StrictlyValidErrorHandler.class;
-
- /**
- * Specifies if the feature is enabled or disabled
- */
- boolean enabled() default true;
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 09:52:46 UTC (rev 15996)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 10:42:34 UTC (rev 15997)
@@ -41,7 +41,6 @@
import org.jboss.ws.core.jaxws.binding.BindingExt;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.feature.ChunkedEncodingFeature;
-import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureSet;
@@ -69,7 +68,6 @@
private static FeatureSet supportedFeatures = new FeatureSet();
static
{
- supportedFeatures.addFeature(new SchemaValidationFeature());
supportedFeatures.addFeature(new AddressingFeature());
supportedFeatures.addFeature(new MTOMFeature());
supportedFeatures.addFeature(new RespectBindingFeature());
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2012-03-19 09:52:46 UTC (rev 15996)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2012-03-19 10:42:34 UTC (rev 15997)
@@ -21,27 +21,11 @@
*/
package org.jboss.ws.core.soap;
-import java.io.InputStream;
-import java.util.ResourceBundle;
-import org.jboss.ws.api.util.BundleUtils;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBodyElement;
-import javax.xml.transform.Source;
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.SOAPContent.State;
-import org.jboss.ws.extensions.validation.SchemaExtractor;
-import org.jboss.ws.extensions.validation.SchemaValidationHelper;
-import org.jboss.ws.feature.SchemaValidationFeature;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.common.DOMUtils;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
/**
* An abstract implemenation of the SOAPBodyElement
@@ -54,12 +38,6 @@
*/
public class SOAPBodyElementDoc extends SOAPContentElement implements SOAPBodyElement
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointMetaData.class);
- // provide logging
- private static Logger log = Logger.getLogger(SOAPBodyElementDoc.class);
-
- private SchemaValidationFeature feature;
-
public SOAPBodyElementDoc(Name name)
{
super(name);
@@ -81,74 +59,8 @@
State prevState = soapContent.getState();
if (nextState != prevState)
{
- if (isValidationEnabled() && nextState == State.OBJECT_VALID)
- {
- log.info("Validating: " + prevState);
- validatePayload(soapContent.getPayload());
- }
-
prevState = super.transitionTo(nextState);
-
- if (isValidationEnabled() && prevState == State.OBJECT_VALID)
- {
- log.info("Validating: " + nextState);
- validatePayload(soapContent.getPayload());
- }
}
return prevState;
}
-
- private void validatePayload(Source source)
- {
- SchemaExtractor schemaExtractor = new SchemaExtractor();
- try
- {
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
- feature = epMetaData.getFeature(SchemaValidationFeature.class);
- URL xsdURL = feature.getSchemaLocation() != null ? new URL(feature.getSchemaLocation()) : null;
- InputStream[] xsdStreams = null;
- if (xsdURL == null)
- {
- URL wsdlURL = epMetaData.getServiceMetaData().getWsdlFileOrLocation();
- if (wsdlURL == null)
- {
- log.warn(BundleUtils.getMessage(bundle, "VALIDATION_ERROR"));
- }
- else
- {
- xsdStreams = schemaExtractor.getSchemas(wsdlURL);
- }
- }
- if (xsdURL != null)
- {
- ErrorHandler errorHandler = feature.getErrorHandler();
- Element xmlDOM = DOMUtils.sourceToElement(source);
- new SchemaValidationHelper(xsdURL).setErrorHandler(errorHandler).validateDocument(xmlDOM);
- }
- else //xsdStreams != null
- {
- ErrorHandler errorHandler = feature.getErrorHandler();
- Element xmlDOM = DOMUtils.sourceToElement(source);
- new SchemaValidationHelper(xsdStreams).setErrorHandler(errorHandler).validateDocument(xmlDOM);
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- WSException.rethrow(ex);
- }
- }
-
- private boolean isValidationEnabled()
- {
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- if (msgContext != null)
- feature = msgContext.getEndpointMetaData().getFeature(SchemaValidationFeature.class);
-
- return feature != null ? feature.isEnabled() : false;
- }
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java 2012-03-19 09:52:46 UTC (rev 15996)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/SchemaValidationFeature.java 2012-03-19 10:42:34 UTC (rev 15997)
@@ -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.ws.feature;
-
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.common.Constants;
-import org.jboss.ws.extensions.validation.StrictlyValidErrorHandler;
-import org.xml.sax.ErrorHandler;
-
-/**
- * This feature represents the use of schema validation with a
- * web service.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-public final class SchemaValidationFeature extends WebServiceFeature
-{
- /**
- * Constant value identifying the SchemaValidationFeature
- */
- public static final String ID = Constants.NS_JBOSSWS_URI + "/features/schema-validation";
-
- /**
- * Optional property for the schema location. If this is not specified the schema
- * will be attempted to extract from the WSDL.
- *
- * The syntax is the same as for schemaLocation attributes in instance documents: e.g, "http://www.example.com file_name.xsd".
- */
- protected String schemaLocation;
-
- /**
- * Optional property for the error handler.
- * If this is not specified the @{ValidationErrorHandler} will be used.
- */
- protected ErrorHandler errorHandler = new StrictlyValidErrorHandler();
-
- /**
- * Create an <code>SchemaValidationFeature</code>.
- * The instance created will be enabled.
- */
- public SchemaValidationFeature()
- {
- this.enabled = true;
- }
-
- /**
- * Creates an <code>SchemaValidationFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- */
- public SchemaValidationFeature(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * Creates an <code>SchemaValidationFeature</code>.
- *
- * @param schemaLocation specifies the schema location for this feature
- */
- public SchemaValidationFeature(String schemaLocation)
- {
- this.schemaLocation = schemaLocation;
- this.enabled = true;
- }
-
- /**
- * Creates an <code>SchemaValidationFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- * @param schemaLocation specifies the schema location for this feature
- */
- public SchemaValidationFeature(boolean enabled, String schemaLocation)
- {
- this.schemaLocation = schemaLocation;
- this.enabled = enabled;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getID()
- {
- return ID;
- }
-
- public String getSchemaLocation()
- {
- return schemaLocation;
- }
-
- public void setSchemaLocation(String schemaLocation)
- {
- this.schemaLocation = schemaLocation;
- }
-
- public ErrorHandler getErrorHandler()
- {
- return errorHandler;
- }
-
- public void setErrorHandler(ErrorHandler errorHandler)
- {
- this.errorHandler = errorHandler;
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 09:52:46 UTC (rev 15996)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 10:42:34 UTC (rev 15997)
@@ -21,9 +21,7 @@
*/
package org.jboss.ws.metadata.builder.jaxws;
-import java.io.IOException;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.List;
import java.util.ResourceBundle;
@@ -38,12 +36,9 @@
import javax.xml.ws.spi.WebServiceFeatureAnnotation;
import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.annotation.SchemaValidation;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
-import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
@@ -53,10 +48,8 @@
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement;
import org.jboss.ws.metadata.wsdl.WSDLService;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-import org.xml.sax.ErrorHandler;
/**
* Process EndpointFeature annotations
@@ -88,10 +81,6 @@
MTOMFeature feature = new MTOMFeature(anFeature.enabled(), anFeature.threshold());
sepMetaData.addFeature(feature);
}
- else if (an.annotationType() == SchemaValidation.class)
- {
- processSchemaValidation(dep, sepMetaData, sepClass);
- }
else if (an.annotationType() == RespectBinding.class)
{
RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class);
@@ -195,42 +184,4 @@
}
}
- private void processSchemaValidation(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass)
- {
- SchemaValidation anFeature = sepClass.getAnnotation(SchemaValidation.class);
- SchemaValidationFeature feature = new SchemaValidationFeature(anFeature.enabled());
-
- String xsdLoc = anFeature.schemaLocation();
- if (xsdLoc.length() > 0)
- {
- if (dep instanceof ArchiveDeployment)
- {
- try
- {
- URL xsdURL = ((ArchiveDeployment)dep).getResourceResolver().resolve(xsdLoc);
- xsdLoc = xsdURL.toExternalForm();
- }
- catch (IOException ex)
- {
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_SCHEMA", xsdLoc), ex);
- }
- }
- feature.setSchemaLocation(xsdLoc);
- }
-
- Class<?> handlerClass = anFeature.errorHandler();
- if (handlerClass != null)
- {
- try
- {
- ErrorHandler errorHandler = (ErrorHandler)handlerClass.newInstance();
- feature.setErrorHandler(errorHandler);
- }
- catch (Exception ex)
- {
- throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_INSTANCIATE_ERROR_HANDLER", handlerClass), ex);
- }
- }
- sepMetaData.addFeature(feature);
- }
}
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 09:52:46 UTC (rev 15996)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 10:42:34 UTC (rev 15997)
@@ -160,18 +160,6 @@
</metainf>
</jar>
- <!-- jaxws-jbws1172 -->
- <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1172.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1172/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1172/NonValidatingEndpoint.class" />
- <include name="org/jboss/test/ws/jaxws/jbws1172/ValidatingEndpoint.class" />
- <include name="org/jboss/test/ws/jaxws/jbws1172/types/*.class" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1172/WEB-INF">
- <include name="wsdl/**" />
- </webinf>
- </war>
-
<!-- jaxws-jbws1309-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1309.jar">
<fileset dir="${tests.output.dir}/test-classes">
14 years
JBossWS SVN: r15996 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 17 other directories.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-03-19 05:52:46 -0400 (Mon, 19 Mar 2012)
New Revision: 15996
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/com/sun/xml/fastinfoset/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/fastinfoset/
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/core/client/RemoteConnectionFactory.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
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/build-jars-jaxws.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
[JBPAPP-8480] Merged revisions 15995 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15995 | ropalka | 2012-03-19 10:34:14 +0100 (Mon, 19 Mar 2012) | 1 line
[JBWS-3465] removing FastInfoset feature
.......
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
+ /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
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 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -118,10 +118,6 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
</dependency>
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,49 +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.ws.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
-import org.jboss.ws.feature.FastInfosetFeature;
-
-/**
- * This feature represents the use of FastInfoset
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE })
-@EndpointFeature( id = FastInfosetFeature.ID)
-@WebServiceFeatureAnnotation(id = FastInfosetFeature.ID, bean = FastInfosetFeature.class)
-public @interface FastInfoset {
-
- /**
- * Specifies if the feature is enabled or disabled
- */
- boolean enabled() default true;
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,62 +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.ws.core.client;
-
-import java.util.Map;
-
-import javax.xml.soap.MimeHeaders;
-
-import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.soap.FastInfosetMarshaller;
-import org.jboss.ws.core.soap.FastInfosetUnMarshaller;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
-
-/**
- * SOAPConnection implementation
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Mar-2008
- */
-public class FastInfosetConnectionHTTP extends SOAPProtocolConnectionHTTP
-{
- public UnMarshaller getUnmarshaller()
- {
- return new FastInfosetUnMarshaller();
- }
-
- public Marshaller getMarshaller()
- {
- return new FastInfosetMarshaller();
- }
-
- @Override
- protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata)
- {
- if (reqMessage != null)
- {
- MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
- mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_FASTINFOSET);
- mimeHeaders.addHeader(MimeConstants.ACCEPT, MimeConstants.TYPE_FASTINFOSET);
- }
- super.populateHeaders(reqMessage, metadata);
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -25,7 +25,6 @@
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.api.util.ServiceLoader;
-import org.jboss.ws.feature.FastInfosetFeature;
/**
* A factory for remote connections
@@ -50,11 +49,6 @@
if (key == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_REMOTE_CONNETION", targetAddress));
- if (epInfo.isFeatureEnabled(FastInfosetFeature.class))
- {
- key += ".fastinfoset";
- }
-
RemoteConnection con = (RemoteConnection)ServiceLoader.loadService(key, null, this.getClass().getClassLoader());
if (con == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_REMOTE_CONNETION", key));
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -63,7 +63,6 @@
import org.jboss.ws.core.client.ssl.SSLContextFactory;
import org.jboss.ws.core.client.transport.WSResponseHandler.Result;
import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.config.EndpointProperty;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.wsf.spi.metadata.config.CommonConfig;
@@ -356,10 +355,6 @@
String sizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
if (sizeValue != null)
chunkSize = Integer.valueOf(sizeValue);
-
- //fastinfoset always disable chunking
- if (epMetaData.isFeatureEnabled(FastInfosetFeature.class))
- chunkSize = 0;
}
//override using call props
try
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -41,7 +41,6 @@
import org.jboss.ws.core.jaxws.binding.BindingExt;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.feature.ChunkedEncodingFeature;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
@@ -70,7 +69,6 @@
private static FeatureSet supportedFeatures = new FeatureSet();
static
{
- supportedFeatures.addFeature(new FastInfosetFeature());
supportedFeatures.addFeature(new SchemaValidationFeature());
supportedFeatures.addFeature(new AddressingFeature());
supportedFeatures.addFeature(new MTOMFeature());
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,80 +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.ws.core.soap;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.common.Constants;
-import org.jboss.ws.core.CommonSOAPFaultException;
-import org.jboss.ws.common.DOMUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentParser;
-
-/**
- * A SOAPEnvelope builder for FastInfoset
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 12-Mar-2008
- */
-public class FastInfosetEnvelopeBuilder extends EnvelopeBuilderDOM
-{
- @Override
- public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
- {
- // Parse the XML input stream
- Element domEnv = null;
- try
- {
- DOMDocumentParser parser = new DOMDocumentParser();
- Document resDoc = DOMUtils.getDocumentBuilder().newDocument();
- parser.parse(resDoc, ins);
- domEnv = resDoc.getDocumentElement();
- }
- catch (Exception ex)
- {
- if (ignoreParseError)
- {
- return null;
- }
- QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
- throw new CommonSOAPFaultException(faultCode, ex.getMessage());
- }
-
- return build(soapMessage, domEnv);
- }
-
- @Override
- public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
- {
- throw new NotImplementedException();
- }
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,77 +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.ws.core.soap;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ResourceBundle;
-
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.core.client.Marshaller;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @author alessio.soldano(a)jboss.com
- * @since 12-Mar-2008
- */
-public class FastInfosetMarshaller implements Marshaller
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(FastInfosetMarshaller.class);
- /**
- * Marshaller will need to take the dataObject and convert
- * into primitive java data types and write to the
- * given output.
- *
- * @param dataObject Object to be writen to output
- * @param output The data output to write the object
- * data to.
- */
- public void write(Object dataObject, OutputStream output) throws IOException
- {
- if ((dataObject instanceof SOAPMessage) == false)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NOT_A_SOAPMESSAGE", dataObject));
-
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)dataObject;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "ATTACHMENTS_NOT_SUPPORTED_WITH_FASTINFOSET"));
-
- try
- {
- SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
- DOMDocumentSerializer serializer = new DOMDocumentSerializer();
- serializer.setOutputStream(output);
- serializer.serialize(soapEnv);
- }
- catch (SOAPException ex)
- {
- IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_SERIALIZE_SOAP_ENVELOPE"));
- ioex.initCause(ex);
- throw ioex;
- }
- }
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,46 +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.ws.core.soap;
-
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Mar-2008
- */
-public class FastInfosetUnMarshaller extends SOAPMessageUnMarshallerHTTP
-{
- @Override
- protected MessageFactoryImpl getMessageFactory()
- {
- CommonMessageContext context = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = context != null ? context.getEndpointMetaData() : null;
-
- MessageFactoryImpl factory = super.getMessageFactory();
- if (epMetaData != null)
- factory.setFeatures(epMetaData.getFeatures());
-
- return factory;
- }
-
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-19 09:52:46 UTC (rev 15996)
@@ -64,7 +64,6 @@
EMPTY_SOAP_BODY_NOT_SUPPORTED=Empty SOAP body with no child element not supported for RPC
NOT_A_SOAPMESSAGE=Not a SOAPMessage: {0}
-ATTACHMENTS_NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
CANNOT_SERIALIZE_SOAP_ENVELOPE=Cannot serialize SOAP Envelope
PARAMETER_META_DATA_NOT_AVAILABLE=Parameter meta data not available
ENTITY_REFERENCES_ARE_NOT_ALLOWED=Entity References are not allowed in SOAP documents
@@ -103,7 +102,6 @@
UNKNOWN_PROTOCOL=Unknown protocol: {0}
CANNOT_CREATE_DEFAULT_MESSAGE=Cannot create default message when protocol is dynamic
CANNOT_DECODE_MULTIPART_RELATED_MESSAGE=Cannot decode multipart related message
-FASTINFOSET_SUPPORT_IS_NOT_ENABLED=FastInfoset support is not enabled, use FastInfosetFeature to enable it.
UNSUPPORTED_CONTENT_TYPE=Unsupported content type: {0}
COULD_NOT_PARSE_CONTENT_TYPE=Could not parse content type:{0}
CANNOT_OBTAIN_SOAPBODY=Cannot obtain SOAPBody from SOAPMessage
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -48,7 +48,6 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.FeatureSet;
/**
@@ -265,13 +264,6 @@
soapMessage.setXOPMessage(true);
}
}
- else if (isFastInfosetContent(contentType))
- {
- if (!features.isFeatureEnabled(FastInfosetFeature.class))
- {
- throw new SOAPException(BundleUtils.getMessage(bundle, "FASTINFOSET_SUPPORT_IS_NOT_ENABLED"));
- }
- }
else if (isSoapContent(contentType) == false)
{
throw new SOAPException(BundleUtils.getMessage(bundle, "UNSUPPORTED_CONTENT_TYPE", contentType));
@@ -284,16 +276,7 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder;
- if (features.isFeatureEnabled(FastInfosetFeature.class))
- {
- envBuilder = new FastInfosetEnvelopeBuilder();
- }
- else
- {
- //the classloader for jbossws-native-core has enough visibility to get the proper envelope builder
- envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null, this.getClass().getClassLoader());
- }
+ final EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null, this.getClass().getClassLoader());
//if inputstream is empty, no need to build
if (inputStream.markSupported()) {
inputStream.mark(1);
@@ -340,12 +323,6 @@
return MimeConstants.TYPE_SOAP11.equalsIgnoreCase(baseType) || MimeConstants.TYPE_SOAP12.equalsIgnoreCase(baseType);
}
- private boolean isFastInfosetContent(ContentType type)
- {
- String baseType = type.getBaseType();
- return MimeConstants.TYPE_FASTINFOSET.equalsIgnoreCase(baseType);
- }
-
private boolean isMultipartRelatedContent(ContentType type)
{
String baseType = type.getBaseType();
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -61,7 +61,6 @@
import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder;
import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
import org.jboss.ws.extensions.xop.XOPContext;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.w3c.dom.Node;
@@ -363,10 +362,6 @@
contentType = multipartRelatedEncoder.getContentType();
}
}
- else if (msgContext != null && msgContext.getEndpointMetaData().getFeatures().isFeatureEnabled(FastInfosetFeature.class))
- {
- contentType = MimeConstants.TYPE_FASTINFOSET;
- }
//JBWS-2964:Create a new mimeHeaders to avoid changing another referenced mimeHeaders
MimeHeaders newMimeHeaders = new MimeHeaders();
Iterator iterator = mimeHeaders.getAllHeaders();
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -44,7 +44,6 @@
public static final String TYPE_XML_UTF8 = TYPE_TEXT_XML + "; charset=UTF-8";
public static final String TYPE_SOAP11 = TYPE_TEXT_XML;
public static final String TYPE_SOAP12 = "application/soap+xml";
- public static final String TYPE_FASTINFOSET = "application/fastinfoset";
// Encoding
public static final String TEXT_8BIT_ENCODING = "8bit";
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -39,7 +39,7 @@
{
private static final ResourceBundle bundle = BundleUtils.getBundle(ChunkedEncodingFeature.class);
/**
- * Constant value identifying the FastInfosetFeature
+ * Constant value identifying the ChunkedEncodingFeature
*/
public static final String ID = Constants.NS_JBOSSWS_URI + "/features/chunkedencoding";
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,67 +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.ws.feature;
-
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.common.Constants;
-
-/**
- * This feature represents the use of FastInfoset
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-public final class FastInfosetFeature extends WebServiceFeature
-{
- /**
- * Constant value identifying the FastInfosetFeature
- */
- public static final String ID = Constants.NS_JBOSSWS_URI + "/features/fastinfoset";
-
- /**
- * Create an <code>FastInfosetFeature</code>.
- * The instance created will be enabled.
- */
- public FastInfosetFeature()
- {
- this.enabled = true;
- }
-
- /**
- * Creates an <code>FastInfosetFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- */
- public FastInfosetFeature(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getID()
- {
- return ID;
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -39,12 +39,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.annotation.FastInfoset;
import org.jboss.ws.annotation.SchemaValidation;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -94,12 +92,6 @@
{
processSchemaValidation(dep, sepMetaData, sepClass);
}
- else if (an.annotationType() == FastInfoset.class)
- {
- FastInfoset anFeature = sepClass.getAnnotation(FastInfoset.class);
- FastInfosetFeature feature = new FastInfosetFeature(anFeature.enabled());
- sepMetaData.addFeature(feature);
- }
else if (an.annotationType() == RespectBinding.class)
{
RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class);
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-19 09:52:46 UTC (rev 15996)
@@ -20,7 +20,6 @@
NO_CLASSLOADER_ASSOCIATED=Deployment has no classloader associated
CANNOT_OBTAIN_ENDPOINTMD=Cannot obtain endpoint meta data
CANNOT_OBTAIN_SOAPPART=Cannot obtain SOAPPart from response message
-NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
CANNOT_OBTAIN_SEINVOKER=Cannot obtain ServiceEndpointInvoker
CANNOT_PROCESS_METRICS=Cannot process metrics
INVALID_ENDPOINT_ADDRESS=Invalid endpoint address: {0}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -81,7 +81,6 @@
import org.jboss.ws.core.utils.ThreadLocalAssociation;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.xop.XOPContext;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
@@ -98,8 +97,6 @@
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.w3c.dom.Document;
-import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer;
-
/**
* A request handler
*
@@ -425,22 +422,7 @@
}
else
{
- // FastInfoset support
- if (epMetaData.isFeatureEnabled(FastInfosetFeature.class) && resMessage instanceof SOAPMessage)
- {
- SOAPMessage soapMessage = (SOAPMessage)resMessage;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WITH_FASTINFOSET"));
-
- SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
- DOMDocumentSerializer serializer = new DOMDocumentSerializer();
- serializer.setOutputStream(output);
- serializer.serialize(soapEnv);
- }
- else
- {
- resMessage.writeTo(output);
- }
+ resMessage.writeTo(output);
}
}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.FastInfosetConnectionHTTP
\ No newline at end of file
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 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -36,7 +36,6 @@
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.native:jbossws-native-core</include>
- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>javax.jws:jsr181-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc: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 09:34:14 UTC (rev 15995)
+++ 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 09:52:46 UTC (rev 15996)
@@ -31,7 +31,6 @@
<dependencies>
<module name="com.sun.tools.ws" services="import" optional="true"/>
<module name="com.sun.xml.bind" services="import"/>
- <module name="com.sun.xml.fastinfoset" optional="true"/>
<module name="javax.api" />
<module name="javax.servlet.api" />
<module name="javax.jws.api" />
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 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -118,11 +118,6 @@
<include name="**/policy.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/com/sun/xml/fastinfoset/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/FastInfoset.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/stax-ex.jar"/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -86,16 +86,6 @@
</manifest>
</jar>
- <!-- jaxws-fastinfoset -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/test-resources/jaxws/fastinfoset/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class" />
- </classes>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-handlerlifecycle -->
<war warfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -80,7 +80,6 @@
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
<netty.version>3.2.6.Final</netty.version>
- <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version>
<sun.jaxws.version>2.2</sun.jaxws.version>
<sun.policy.version>2.0-b01</sun.policy.version>
<stax.api.version>1.0-2</stax.api.version>
@@ -179,11 +178,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- <version>${sun.fastinfoset.version}</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>policy</artifactId>
<version>${sun.policy.version}</version>
14 years
JBossWS SVN: r15995 - in stack/native/trunk: modules/core and 19 other directories.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-03-19 05:34:14 -0400 (Mon, 19 Mar 2012)
New Revision: 15995
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/com/sun/xml/fastinfoset/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/com/sun/xml/fastinfoset/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/fastinfoset/
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3465] removing FastInfoset feature
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/pom.xml 2012-03-19 09:34:14 UTC (rev 15995)
@@ -118,10 +118,6 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
</dependency>
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -1,49 +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.ws.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
-import org.jboss.ws.feature.FastInfosetFeature;
-
-/**
- * This feature represents the use of FastInfoset
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE })
-@EndpointFeature( id = FastInfosetFeature.ID)
-@WebServiceFeatureAnnotation(id = FastInfosetFeature.ID, bean = FastInfosetFeature.class)
-public @interface FastInfoset {
-
- /**
- * Specifies if the feature is enabled or disabled
- */
- boolean enabled() default true;
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -1,62 +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.ws.core.client;
-
-import java.util.Map;
-
-import javax.xml.soap.MimeHeaders;
-
-import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.soap.FastInfosetMarshaller;
-import org.jboss.ws.core.soap.FastInfosetUnMarshaller;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
-
-/**
- * SOAPConnection implementation
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Mar-2008
- */
-public class FastInfosetConnectionHTTP extends SOAPProtocolConnectionHTTP
-{
- public UnMarshaller getUnmarshaller()
- {
- return new FastInfosetUnMarshaller();
- }
-
- public Marshaller getMarshaller()
- {
- return new FastInfosetMarshaller();
- }
-
- @Override
- protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata)
- {
- if (reqMessage != null)
- {
- MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
- mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_FASTINFOSET);
- mimeHeaders.addHeader(MimeConstants.ACCEPT, MimeConstants.TYPE_FASTINFOSET);
- }
- super.populateHeaders(reqMessage, metadata);
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -25,7 +25,6 @@
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.api.util.ServiceLoader;
-import org.jboss.ws.feature.FastInfosetFeature;
/**
* A factory for remote connections
@@ -50,11 +49,6 @@
if (key == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_REMOTE_CONNETION", targetAddress));
- if (epInfo.isFeatureEnabled(FastInfosetFeature.class))
- {
- key += ".fastinfoset";
- }
-
RemoteConnection con = (RemoteConnection)ServiceLoader.loadService(key, null, this.getClass().getClassLoader());
if (con == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_REMOTE_CONNETION", key));
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -63,7 +63,6 @@
import org.jboss.ws.core.client.ssl.SSLContextFactory;
import org.jboss.ws.core.client.transport.WSResponseHandler.Result;
import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.config.EndpointProperty;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.wsf.spi.metadata.config.CommonConfig;
@@ -356,10 +355,6 @@
String sizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
if (sizeValue != null)
chunkSize = Integer.valueOf(sizeValue);
-
- //fastinfoset always disable chunking
- if (epMetaData.isFeatureEnabled(FastInfosetFeature.class))
- chunkSize = 0;
}
//override using call props
try
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -41,7 +41,6 @@
import org.jboss.ws.core.jaxws.binding.BindingExt;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.feature.ChunkedEncodingFeature;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
@@ -70,7 +69,6 @@
private static FeatureSet supportedFeatures = new FeatureSet();
static
{
- supportedFeatures.addFeature(new FastInfosetFeature());
supportedFeatures.addFeature(new SchemaValidationFeature());
supportedFeatures.addFeature(new AddressingFeature());
supportedFeatures.addFeature(new MTOMFeature());
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -1,80 +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.ws.core.soap;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.common.Constants;
-import org.jboss.ws.core.CommonSOAPFaultException;
-import org.jboss.ws.common.DOMUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentParser;
-
-/**
- * A SOAPEnvelope builder for FastInfoset
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 12-Mar-2008
- */
-public class FastInfosetEnvelopeBuilder extends EnvelopeBuilderDOM
-{
- @Override
- public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
- {
- // Parse the XML input stream
- Element domEnv = null;
- try
- {
- DOMDocumentParser parser = new DOMDocumentParser();
- Document resDoc = DOMUtils.getDocumentBuilder().newDocument();
- parser.parse(resDoc, ins);
- domEnv = resDoc.getDocumentElement();
- }
- catch (Exception ex)
- {
- if (ignoreParseError)
- {
- return null;
- }
- QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
- throw new CommonSOAPFaultException(faultCode, ex.getMessage());
- }
-
- return build(soapMessage, domEnv);
- }
-
- @Override
- public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
- {
- throw new NotImplementedException();
- }
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -1,77 +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.ws.core.soap;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ResourceBundle;
-
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.core.client.Marshaller;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @author alessio.soldano(a)jboss.com
- * @since 12-Mar-2008
- */
-public class FastInfosetMarshaller implements Marshaller
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(FastInfosetMarshaller.class);
- /**
- * Marshaller will need to take the dataObject and convert
- * into primitive java data types and write to the
- * given output.
- *
- * @param dataObject Object to be writen to output
- * @param output The data output to write the object
- * data to.
- */
- public void write(Object dataObject, OutputStream output) throws IOException
- {
- if ((dataObject instanceof SOAPMessage) == false)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NOT_A_SOAPMESSAGE", dataObject));
-
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)dataObject;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "ATTACHMENTS_NOT_SUPPORTED_WITH_FASTINFOSET"));
-
- try
- {
- SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
- DOMDocumentSerializer serializer = new DOMDocumentSerializer();
- serializer.setOutputStream(output);
- serializer.serialize(soapEnv);
- }
- catch (SOAPException ex)
- {
- IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_SERIALIZE_SOAP_ENVELOPE"));
- ioex.initCause(ex);
- throw ioex;
- }
- }
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -1,46 +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.ws.core.soap;
-
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Mar-2008
- */
-public class FastInfosetUnMarshaller extends SOAPMessageUnMarshallerHTTP
-{
- @Override
- protected MessageFactoryImpl getMessageFactory()
- {
- CommonMessageContext context = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = context != null ? context.getEndpointMetaData() : null;
-
- MessageFactoryImpl factory = super.getMessageFactory();
- if (epMetaData != null)
- factory.setFeatures(epMetaData.getFeatures());
-
- return factory;
- }
-
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-19 09:34:14 UTC (rev 15995)
@@ -64,7 +64,6 @@
EMPTY_SOAP_BODY_NOT_SUPPORTED=Empty SOAP body with no child element not supported for RPC
NOT_A_SOAPMESSAGE=Not a SOAPMessage: {0}
-ATTACHMENTS_NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
CANNOT_SERIALIZE_SOAP_ENVELOPE=Cannot serialize SOAP Envelope
PARAMETER_META_DATA_NOT_AVAILABLE=Parameter meta data not available
ENTITY_REFERENCES_ARE_NOT_ALLOWED=Entity References are not allowed in SOAP documents
@@ -103,7 +102,6 @@
UNKNOWN_PROTOCOL=Unknown protocol: {0}
CANNOT_CREATE_DEFAULT_MESSAGE=Cannot create default message when protocol is dynamic
CANNOT_DECODE_MULTIPART_RELATED_MESSAGE=Cannot decode multipart related message
-FASTINFOSET_SUPPORT_IS_NOT_ENABLED=FastInfoset support is not enabled, use FastInfosetFeature to enable it.
UNSUPPORTED_CONTENT_TYPE=Unsupported content type: {0}
COULD_NOT_PARSE_CONTENT_TYPE=Could not parse content type:{0}
CANNOT_OBTAIN_SOAPBODY=Cannot obtain SOAPBody from SOAPMessage
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -48,7 +48,6 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.FeatureSet;
/**
@@ -265,13 +264,6 @@
soapMessage.setXOPMessage(true);
}
}
- else if (isFastInfosetContent(contentType))
- {
- if (!features.isFeatureEnabled(FastInfosetFeature.class))
- {
- throw new SOAPException(BundleUtils.getMessage(bundle, "FASTINFOSET_SUPPORT_IS_NOT_ENABLED"));
- }
- }
else if (isSoapContent(contentType) == false)
{
throw new SOAPException(BundleUtils.getMessage(bundle, "UNSUPPORTED_CONTENT_TYPE", contentType));
@@ -284,16 +276,7 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder;
- if (features.isFeatureEnabled(FastInfosetFeature.class))
- {
- envBuilder = new FastInfosetEnvelopeBuilder();
- }
- else
- {
- //the classloader for jbossws-native-core has enough visibility to get the proper envelope builder
- envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null, this.getClass().getClassLoader());
- }
+ final EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null, this.getClass().getClassLoader());
//if inputstream is empty, no need to build
if (inputStream.markSupported()) {
inputStream.mark(1);
@@ -340,12 +323,6 @@
return MimeConstants.TYPE_SOAP11.equalsIgnoreCase(baseType) || MimeConstants.TYPE_SOAP12.equalsIgnoreCase(baseType);
}
- private boolean isFastInfosetContent(ContentType type)
- {
- String baseType = type.getBaseType();
- return MimeConstants.TYPE_FASTINFOSET.equalsIgnoreCase(baseType);
- }
-
private boolean isMultipartRelatedContent(ContentType type)
{
String baseType = type.getBaseType();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -61,7 +61,6 @@
import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder;
import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
import org.jboss.ws.extensions.xop.XOPContext;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.w3c.dom.Node;
@@ -363,10 +362,6 @@
contentType = multipartRelatedEncoder.getContentType();
}
}
- else if (msgContext != null && msgContext.getEndpointMetaData().getFeatures().isFeatureEnabled(FastInfosetFeature.class))
- {
- contentType = MimeConstants.TYPE_FASTINFOSET;
- }
//JBWS-2964:Create a new mimeHeaders to avoid changing another referenced mimeHeaders
MimeHeaders newMimeHeaders = new MimeHeaders();
Iterator iterator = mimeHeaders.getAllHeaders();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -44,7 +44,6 @@
public static final String TYPE_XML_UTF8 = TYPE_TEXT_XML + "; charset=UTF-8";
public static final String TYPE_SOAP11 = TYPE_TEXT_XML;
public static final String TYPE_SOAP12 = "application/soap+xml";
- public static final String TYPE_FASTINFOSET = "application/fastinfoset";
// Encoding
public static final String TEXT_8BIT_ENCODING = "8bit";
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -39,7 +39,7 @@
{
private static final ResourceBundle bundle = BundleUtils.getBundle(ChunkedEncodingFeature.class);
/**
- * Constant value identifying the FastInfosetFeature
+ * Constant value identifying the ChunkedEncodingFeature
*/
public static final String ID = Constants.NS_JBOSSWS_URI + "/features/chunkedencoding";
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -1,67 +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.ws.feature;
-
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.common.Constants;
-
-/**
- * This feature represents the use of FastInfoset
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-public final class FastInfosetFeature extends WebServiceFeature
-{
- /**
- * Constant value identifying the FastInfosetFeature
- */
- public static final String ID = Constants.NS_JBOSSWS_URI + "/features/fastinfoset";
-
- /**
- * Create an <code>FastInfosetFeature</code>.
- * The instance created will be enabled.
- */
- public FastInfosetFeature()
- {
- this.enabled = true;
- }
-
- /**
- * Creates an <code>FastInfosetFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- */
- public FastInfosetFeature(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getID()
- {
- return ID;
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -39,12 +39,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.annotation.FastInfoset;
import org.jboss.ws.annotation.SchemaValidation;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -94,12 +92,6 @@
{
processSchemaValidation(dep, sepMetaData, sepClass);
}
- else if (an.annotationType() == FastInfoset.class)
- {
- FastInfoset anFeature = sepClass.getAnnotation(FastInfoset.class);
- FastInfosetFeature feature = new FastInfosetFeature(anFeature.enabled());
- sepMetaData.addFeature(feature);
- }
else if (an.annotationType() == RespectBinding.class)
{
RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-19 09:34:14 UTC (rev 15995)
@@ -20,7 +20,6 @@
NO_CLASSLOADER_ASSOCIATED=Deployment has no classloader associated
CANNOT_OBTAIN_ENDPOINTMD=Cannot obtain endpoint meta data
CANNOT_OBTAIN_SOAPPART=Cannot obtain SOAPPart from response message
-NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
CANNOT_OBTAIN_SEINVOKER=Cannot obtain ServiceEndpointInvoker
CANNOT_PROCESS_METRICS=Cannot process metrics
INVALID_ENDPOINT_ADDRESS=Invalid endpoint address: {0}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
@@ -81,7 +81,6 @@
import org.jboss.ws.core.utils.ThreadLocalAssociation;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.xop.XOPContext;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
@@ -98,8 +97,6 @@
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.w3c.dom.Document;
-import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer;
-
/**
* A request handler
*
@@ -425,22 +422,7 @@
}
else
{
- // FastInfoset support
- if (epMetaData.isFeatureEnabled(FastInfosetFeature.class) && resMessage instanceof SOAPMessage)
- {
- SOAPMessage soapMessage = (SOAPMessage)resMessage;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WITH_FASTINFOSET"));
-
- SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
- DOMDocumentSerializer serializer = new DOMDocumentSerializer();
- serializer.setOutputStream(output);
- serializer.serialize(soapEnv);
- }
- else
- {
- resMessage.writeTo(output);
- }
+ resMessage.writeTo(output);
}
}
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset 2012-03-19 09:34:14 UTC (rev 15995)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.FastInfosetConnectionHTTP
\ No newline at end of file
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 09:34:14 UTC (rev 15995)
@@ -36,7 +36,6 @@
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.native:jbossws-native-core</include>
- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>javax.jws:jsr181-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 09:34:14 UTC (rev 15995)
@@ -31,7 +31,6 @@
<dependencies>
<module name="com.sun.tools.ws" services="import" optional="true"/>
<module name="com.sun.xml.bind" services="import"/>
- <module name="com.sun.xml.fastinfoset" optional="true"/>
<module name="javax.api" />
<module name="javax.servlet.api" />
<module name="javax.jws.api" />
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 09:34:14 UTC (rev 15995)
@@ -31,7 +31,6 @@
<dependencies>
<module name="com.sun.tools.ws" services="import" optional="true"/>
<module name="com.sun.xml.bind" services="import"/>
- <module name="com.sun.xml.fastinfoset" optional="true"/>
<module name="javax.api" />
<module name="javax.servlet.api" />
<module name="javax.jws.api" />
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 09:34:14 UTC (rev 15995)
@@ -118,11 +118,6 @@
<include name="**/policy.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/com/sun/xml/fastinfoset/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/FastInfoset.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/stax-ex.jar"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 09:34:14 UTC (rev 15995)
@@ -86,16 +86,6 @@
</manifest>
</jar>
- <!-- jaxws-fastinfoset -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/test-resources/jaxws/fastinfoset/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class" />
- </classes>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-handlerlifecycle -->
<war warfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-03-16 16:54:22 UTC (rev 15994)
+++ stack/native/trunk/pom.xml 2012-03-19 09:34:14 UTC (rev 15995)
@@ -88,7 +88,6 @@
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
<netty.version>3.2.6.Final</netty.version>
- <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version>
<sun.jaxws.version>2.2</sun.jaxws.version>
<sun.policy.version>2.0-b01</sun.policy.version>
<stax.api.version>1.0-2</stax.api.version>
@@ -220,11 +219,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- <version>${sun.fastinfoset.version}</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>policy</artifactId>
<version>${sun.policy.version}</version>
14 years
JBossWS SVN: r15994 - stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-8450/src/main/java/org/jboss/ws/core/soap/attachment.
by jbossws-commits@lists.jboss.org
Author: klape
Date: 2012-03-16 12:54:22 -0400 (Fri, 16 Mar 2012)
New Revision: 15994
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-8450/src/main/java/org/jboss/ws/core/soap/attachment/BoundaryDelimitedInputStream.java
Log:
[JBPAPP-8450] MTOM services returns two extra bytes at the end
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-8450/src/main/java/org/jboss/ws/core/soap/attachment/BoundaryDelimitedInputStream.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-8450/src/main/java/org/jboss/ws/core/soap/attachment/BoundaryDelimitedInputStream.java 2012-03-16 16:52:51 UTC (rev 15993)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-8450/src/main/java/org/jboss/ws/core/soap/attachment/BoundaryDelimitedInputStream.java 2012-03-16 16:54:22 UTC (rev 15994)
@@ -58,6 +58,8 @@
private boolean bufferingCompleted;
+ private boolean checkLeadingCRLF;
+
/**
* Constructs a <code>BoundaryDelimitedInputStream</code> using the passed
* <code>InputStream</code> as the source for the outer stream.
@@ -71,6 +73,7 @@
source = in;
this.boundary = (byte[]) boundary.clone();
boyerMoore = new SimpleBoyerMoore(this.boundary);
+ checkLeadingCRLF = boundary.length > 0 && boundary[0] != '\r';
}
/*
@@ -201,6 +204,13 @@
}
else
{
+ if (checkLeadingCRLF && boundaryPosition > 1)
+ {
+ if (buffer[boundaryPosition - 1] == '\n' && buffer[boundaryPosition - 2] == '\r')
+ {
+ boundaryPosition -= 2;
+ }
+ }
returnLength = boundaryPosition;
createLeftOvers(buffer, returnLength + boundary.length, position);
14 years
JBossWS SVN: r15993 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: klape
Date: 2012-03-16 12:52:51 -0400 (Fri, 16 Mar 2012)
New Revision: 15993
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-8450/
Log:
creating one off branch
14 years
JBossWS SVN: r15992 - stack/native/branches/jbossws-native-4.0.x.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-03-16 10:32:12 -0400 (Fri, 16 Mar 2012)
New Revision: 15992
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
Merged revisions 15991 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15991 | ropalka | 2012-03-16 15:30:43 +0100 (Fri, 16 Mar 2012) | 1 line
[JBPAPP-8189] removing stax:stax-api dependency
.......
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
+ /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
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-16 14:30:43 UTC (rev 15991)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-16 14:32:12 UTC (rev 15992)
@@ -227,6 +227,10 @@
<version>${sun.jaxws.version}</version>
<exclusions>
<exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
@@ -335,6 +339,12 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-lgpl</artifactId>
<version>${woodstox.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
14 years