[jbossws-commits] JBossWS SVN: r16130 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/ws and 11 other directories.

Author: ropalka Date: 2012-04-10 04:39:42 -0400 (Tue, 10 Apr 2012) New Revision: 16130 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/ 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/feature/ 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/src/test/java/org/jboss/test/ws/jaxws/jbws1850/ 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/spi/ServiceDelegateImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.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/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 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/WSDL11Writer.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/dist/src/main/distro/build.xml 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/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java Log: [JBPAPP-8668] Merged revisions 16051 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16051 | ropalka | 2012-03-27 13:18:25 +0200 (Tue, 27 Mar 2012) | 1 line [JBWS-3474] removing features and annotations processing ....... 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,15999,16003,16013,16015,16021,16050 + /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,16003,16013,16015,16021,16050-16051 Deleted: 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-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -1,154 +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.jaxws.client; - -import java.util.List; -import java.util.Map; -import java.util.ResourceBundle; - -import javax.xml.ws.BindingProvider; -import javax.xml.ws.RespectBindingFeature; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.WebServiceFeature; - -import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.DOMWriter; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.feature.ChunkedEncodingFeature; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData; -import org.jboss.ws.metadata.umdm.FeatureSet; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsdl.Extendable; -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; - -/** - * Process WebServiceFeature provided on client side - * - * @author alessio.soldano(a)jboss.com - * @since 14-Jan-2009 - * - */ -public class ClientFeatureProcessor -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(ClientFeatureProcessor.class); - private static Logger log = Logger.getLogger(ClientFeatureProcessor.class); - - private static FeatureSet supportedFeatures = new FeatureSet(); - static - { - supportedFeatures.addFeature(new RespectBindingFeature()); - supportedFeatures.addFeature(new ChunkedEncodingFeature()); - } - - public static <T> void processFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub) - { - if (!supportedFeatures.hasFeature(feature.getClass())) - { - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_FEATURE", feature)); - } - processRespectBindingFeature(feature, epMetaData, stub); - processChunkedEncodingFeature(feature, epMetaData, stub); - - // overriding feature for this stub - FeatureAwareEndpointMetaData featureOverridableMetaData = (FeatureAwareEndpointMetaData)stub; - featureOverridableMetaData.setFeature(feature); - } - - /** - * Setup http chunked encoding - * - * @param <T> - * @param feature - * @param epMetaData - * @param stub - * @return - */ - private static <T> void processChunkedEncodingFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub) - { - if (feature instanceof ChunkedEncodingFeature) - { - Map<String, Object> ctx = ((BindingProvider)stub).getRequestContext(); - ctx.put(StubExt.PROPERTY_CHUNKED_ENCODING_SIZE, ((ChunkedEncodingFeature)feature).getChunkSize()); - } - } - - /** - * - * Perform respect binding checks - * - * @param <T> - * @param feature - * @param epMetaData - * @param stub - * @return - */ - private static <T> void processRespectBindingFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub) - { - if (feature instanceof RespectBindingFeature && feature.isEnabled()) - { - ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); - - WSDLService wsdlService = wsdlDefinitions.getService(serviceMetaData.getServiceName()); - if (wsdlService != null) - { - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(epMetaData.getPortName()); - if (wsdlEndpoint != null) - { - // Conformance 6.11 (javax.xml.ws.RespectBindingFeature): When the javax.xml.ws.RespectBindingFeature - // is enabled, a JAX-WS implementation MUST inspect the wsdl:binding at runtime to determine - // result and parameter bindings as well as any wsdl:extensions that have the required=true attribute. - // All required wsdl:extensions MUST be supported and honored by a JAX-WS implementation unless a - // specific wsdl:extension has be explicitly disabled via a WebServiceFeature. - checkNotUnderstoodExtElements(wsdlEndpoint, epMetaData); - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - checkNotUnderstoodExtElements(wsdlBinding, epMetaData); - } - else - { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_FIND_PORT", epMetaData.getPortName())); - } - } - } - } - - private static void checkNotUnderstoodExtElements(Extendable extendable, EndpointMetaData epMetaData) - { - List<WSDLExtensibilityElement> notUnderstoodList = extendable.getNotUnderstoodExtElements(); - for (WSDLExtensibilityElement el : notUnderstoodList) - { - boolean disabledByFeature = false; //TODO [JBWS-2459] - if (el.isRequired() && !disabledByFeature) - { - String s = DOMWriter.printNode(el.getElement(), true); - throw new WebServiceException(BundleUtils.getMessage(bundle, "NOT_UNDERSTOOD_ELEMENT_WAS_FOUND", s)); - } - } - } - -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -53,9 +53,7 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.ResourceLoaderAdapter; import org.jboss.ws.common.utils.DelegateClassLoader; -import org.jboss.ws.core.EndpointMetadataProvider; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxws.client.ClientFeatureProcessor; import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; @@ -235,15 +233,7 @@ } } - T port = (T)createProxy(seiClass, epMetaData); - initWebserviceFeatures(port, epMetaData.getFeatures().getFeatures()); - - //initialize webserviceFeature in service for getPort(Class<T> seiClass) and getPort(QName portName, Class<T> seiClass) - // This will override the features from policy - - initWebserviceFeatures(port, this.features); - - return port; + return (T)createProxy(seiClass, epMetaData); } private void assertSEIConstraints(Class seiClass) @@ -470,10 +460,7 @@ @Override public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Mode mode, WebServiceFeature... features) { - Dispatch<T> dispatch = createDispatch(portName, type, mode); - initWebserviceFeatures(dispatch, this.features); - initWebserviceFeatures(dispatch, features); - return dispatch; + return createDispatch(portName, type, mode); } @Override @@ -485,10 +472,7 @@ @Override public Dispatch<Object> createDispatch(QName portName, JAXBContext context, Mode mode, WebServiceFeature... features) { - Dispatch<Object> dispatch = createDispatch(portName, context, mode); - initWebserviceFeatures(dispatch, this.features); - initWebserviceFeatures(dispatch, features); - return dispatch; + return createDispatch(portName, context, mode); } @Override @@ -500,26 +484,19 @@ @Override public <T> T getPort(QName portName, Class<T> sei, WebServiceFeature... features) { - T port = getPort(portName, sei); - initWebserviceFeatures(port, this.features); - initWebserviceFeatures(port, features); - return port; + return getPort(portName, sei); } @Override public <T> T getPort(EndpointReference epr, Class<T> sei, WebServiceFeature... features) { - T port = getPort(sei); - initWebserviceFeatures(port, features); - return port; + return getPort(sei); } @Override public <T> T getPort(Class<T> sei, WebServiceFeature... features) { - T port = getPort(sei); - initWebserviceFeatures(port, features); - return port; + return getPort(sei); } /** @@ -593,16 +570,4 @@ return getPortInternal(epMetaData, seiClass); } - - private <T> void initWebserviceFeatures(T stub, WebServiceFeature... features) - { - if (features != null) - { - EndpointMetaData epMetaData = ((EndpointMetadataProvider)stub).getEndpointMetaData(); - for (WebServiceFeature feature : features) - { - ClientFeatureProcessor.processFeature(feature, epMetaData, stub); - } - } - } } Deleted: 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-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -1,129 +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.metadata.builder.jaxws; - -import java.lang.annotation.Annotation; -import java.util.List; -import java.util.ResourceBundle; - -import javax.xml.ws.RespectBinding; -import javax.xml.ws.RespectBindingFeature; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.spi.WebServiceFeatureAnnotation; - -import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.DOMWriter; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsdl.Extendable; -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.wsf.spi.deployment.Deployment; - -/** - * Process EndpointFeature annotations - * - * @author Thomas.Diesler(a)jboss.com - * @since 12-Mar-2008 - */ -public class EndpointFeatureProcessor -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointFeatureProcessor.class); - private static final Logger log = Logger.getLogger(EndpointFeatureProcessor.class); - - protected void processEndpointFeatures(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass) - { - for (Annotation an : sepClass.getAnnotations()) - { - WebServiceFeatureAnnotation wsfa = an.annotationType().getAnnotation(WebServiceFeatureAnnotation.class); - if (wsfa != null) - { - if (an.annotationType() == RespectBinding.class) - { - RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class); - RespectBindingFeature feature = new RespectBindingFeature(anFeature.enabled()); - sepMetaData.addFeature(feature); - } - else - { - throw new WebServiceException(BundleUtils.getMessage(bundle, "UNSUPPORTED_FEATURE", wsfa.bean())); - } - } - } - } - - protected void setupEndpointFeatures(ServerEndpointMetaData sepMetaData) - { - setupRespectBindingFeature(sepMetaData); - } - - private static void setupRespectBindingFeature(ServerEndpointMetaData sepMetaData) - { - RespectBindingFeature respectBindingFeature = sepMetaData.getFeature(RespectBindingFeature.class); - if (respectBindingFeature != null && respectBindingFeature.isEnabled()) - { - log.debug("RespectBindingFeature found, looking for required not understood extensibility elements..."); - ServiceMetaData serviceMetaData = sepMetaData.getServiceMetaData(); - WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); - - WSDLService wsdlService = wsdlDefinitions.getService(serviceMetaData.getServiceName()); - if (wsdlService != null) - { - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(sepMetaData.getPortName()); - if (wsdlEndpoint != null) - { - // Conformance 6.11 (javax.xml.ws.RespectBindingFeature): When the javax.xml.ws.RespectBindingFeature - // is enabled, a JAX-WS implementation MUST inspect the wsdl:binding at runtime to determine - // result and parameter bindings as well as any wsdl:extensions that have the required=true attribute. - // All required wsdl:extensions MUST be supported and honored by a JAX-WS implementation unless a - // specific wsdl:extension has be explicitly disabled via a WebServiceFeature. - checkNotUnderstoodExtElements(wsdlEndpoint, sepMetaData); - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - checkNotUnderstoodExtElements(wsdlBinding, sepMetaData); - } - else - { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_FIND_PORT", sepMetaData.getPortName())); - } - } - } - } - - private static void checkNotUnderstoodExtElements(Extendable extendable, ServerEndpointMetaData sepMetaData) - { - List<WSDLExtensibilityElement> notUnderstoodList = extendable.getNotUnderstoodExtElements(); - for (WSDLExtensibilityElement el : notUnderstoodList) - { - boolean disabledByFeature = false; //TODO [JBWS-2459] - if (el.isRequired() && !disabledByFeature) - { - String s = DOMWriter.printNode(el.getElement(), true); - throw new WebServiceException(BundleUtils.getMessage(bundle, "NOT_UNDERSTOOD_ELEMENT_WAS_FOUND", s)); - } - } - } - -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -57,7 +57,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.annotation.Documentation; import org.jboss.ws.api.binding.BindingCustomization; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; @@ -594,11 +593,6 @@ opMetaData.setParameterStyle(anBinding.parameterStyle()); } - if (method.isAnnotationPresent(Documentation.class)) - { - opMetaData.setDocumentation(method.getAnnotation(Documentation.class).content()); - } - Class<?>[] parameterTypes = method.getParameterTypes(); Type[] genericTypes = method.getGenericParameterTypes(); Annotation[][] parameterAnnotations = method.getParameterAnnotations(); 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-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -38,7 +38,6 @@ import javax.xml.ws.WebServiceProvider; import org.jboss.ws.WSException; -import org.jboss.ws.annotation.Documentation; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.IOUtils; @@ -131,14 +130,6 @@ // process config processEndpointConfig(dep, sepMetaData, sepClass, linkName); - // process web service features - EndpointFeatureProcessor epFeatureProcessor = new EndpointFeatureProcessor(); - epFeatureProcessor.processEndpointFeatures(dep, sepMetaData, sepClass); - - // Process endpoint documentation - if (seiClass.isAnnotationPresent(Documentation.class)) - sepMetaData.setDocumentation(seiClass.getAnnotation(Documentation.class).content()); - if (!toolMode) { setupOperationsFromWSDL(serviceMetaData, sepMetaData); @@ -185,9 +176,6 @@ // process webservices.xml contributions processWSDDContribution(dep, sepMetaData); - //setup web service feature contributions - epFeatureProcessor.setupEndpointFeatures(sepMetaData); - // Init the endpoint address initEndpointAddress(dep, sepMetaData); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -142,8 +142,6 @@ private List<Class> registeredTypes = new ArrayList<Class>(); // The features defined for this endpoint private FeatureSet features = new FeatureSet(); - // The documentation edfined through the @Documentation annotation - private String documentation; private ConfigObservable configObservable = new ConfigObservable(); @@ -383,16 +381,6 @@ this.features.addFeature(feature); } - public String getDocumentation() - { - return documentation; - } - - public void setDocumentation(String documentation) - { - this.documentation = documentation; - } - public List<OperationMetaData> getOperations() { return new ArrayList<OperationMetaData>(operations); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -228,12 +228,6 @@ } @Override - public String getDocumentation() - { - return this.delegee.getDocumentation(); - } - - @Override public Use getEncodingStyle() { return this.delegee.getEncodingStyle(); @@ -402,12 +396,6 @@ } @Override - public void setDocumentation(String documentation) - { - this.delegee.setDocumentation(documentation); - } - - @Override public void setEncodingStyle(Use value) { this.delegee.setEncodingStyle(value); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -67,7 +67,6 @@ private List<ParameterMetaData> parameters = new ArrayList<ParameterMetaData>(); private List<FaultMetaData> faults = new ArrayList<FaultMetaData>(); private ParameterMetaData returnParam; - private String documentation; public OperationMetaData(EndpointMetaData epMetaData, QName qname, String javaName) { @@ -523,14 +522,4 @@ } return buffer.toString(); } - - public String getDocumentation() - { - return documentation; - } - - public void setDocumentation(String documentation) - { - this.documentation = documentation; - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -28,8 +28,6 @@ import javax.xml.namespace.QName; -import org.jboss.logging.Logger; - /** * An Interface component describes sequences of messages that a service sends and/or receives. It does this * by grouping related messages into operations. An operation is a sequence of input and output messages, @@ -41,9 +39,6 @@ */ public class WSDLInterface extends Extendable { - // provide logging - private static final Logger log = Logger.getLogger(WSDLInterface.class); - private static final long serialVersionUID = 2453454924501233964L; // The parent WSDL definitions element. @@ -64,8 +59,6 @@ private Map<QName, WSDLInterfaceOperation> operations = new LinkedHashMap<QName, WSDLInterfaceOperation>(); /** Zero or more fault element information items */ private Map<QName, WSDLInterfaceFault> faults = new LinkedHashMap<QName, WSDLInterfaceFault>(); - - private WSDLDocumentation documentationElement; /** Construct a WSDL interface for a given WSDL definition */ public WSDLInterface(WSDLDefinitions wsdlDefinitions, QName name) @@ -158,14 +151,4 @@ { faults.put(fault.getName(), fault); } - - public WSDLDocumentation getDocumentationElement() - { - return documentationElement; - } - - public void setDocumentationElement(WSDLDocumentation documentationElement) - { - this.documentationElement = documentationElement; - } } 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-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -75,7 +75,6 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.api.addressing.AddressingConstants; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; @@ -320,47 +319,11 @@ if (extElement instanceof UnknownExtensibilityElement) { UnknownExtensibilityElement uee = (UnknownExtensibilityElement)extElement; - boolean understood = false; - understood = understood || processEPR(uee, dest); - //add processing of further extensibility element types below - - if (!understood) - { - processNotUnderstoodExtesibilityElement(uee, dest); - } + processNotUnderstoodExtesibilityElement(uee, dest); } } } - /** - * Process the provided extensibility element looking for UsingAddressing. - * Returns true if the provided element is UsingAddressing, false otherwise. - * - * @param extElement - * @param dest - * @return - */ - private boolean processEPR(UnknownExtensibilityElement extElement, Extendable dest) - { - final Element srcElement = extElement.getElement(); - final boolean isWSANamespace = AddressingConstants.Core.NS.equals(srcElement.getNamespaceURI()); - final boolean isEPRLocalName = AddressingConstants.Core.Elements.ENDPOINTREFERENCE.equals(srcElement.getLocalName()); - boolean result = false; - - if (isWSANamespace && isEPRLocalName) - { - Element element = (Element) srcElement.cloneNode(true); - copyMissingNamespaceDeclarations(element, srcElement); - - WSDLExtensibilityElement el = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_EPR, element); - el.setRequired(true); - dest.addExtensibilityElement(el); - result = true; - } - - return result; - } - private void processNotUnderstoodExtesibilityElement(UnknownExtensibilityElement extElement, Extendable dest) { Element element = (Element)extElement.getElement().cloneNode(true); @@ -709,13 +672,6 @@ { WSDLInterface destInterface = new WSDLInterface(destWsdl, qname); - // documentation - Element documentationElement = srcPortType.getDocumentationElement(); - if (documentationElement != null && documentationElement.getTextContent() != null) - { - destInterface.setDocumentationElement(new WSDLDocumentation(documentationElement.getTextContent())); - } - destWsdl.addInterface(destInterface); processPortTypeOperations(srcWsdl, destInterface, srcPortType, destBinding); @@ -765,13 +721,6 @@ log.trace("processOperationInput: " + srcMessage.getQName()); - QName wsaAction = (QName)wsdlOperationInput.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSA_ACTION); - if (wsaAction != null) - umdmOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_IN, wsaAction.getLocalPart())); - wsaAction = (QName)wsdlOperationInput.getExtensionAttribute(AddressingConstants.Metadata.Attributes.ACTION_QNAME); - if (wsaAction != null) - umdmOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_IN, wsaAction.getLocalPart())); - List<String> paramOrder = (List<String>)wsdlOperation.getParameterOrdering(); if (paramOrder != null) { @@ -867,12 +816,6 @@ log.trace("processOperationOutput: " + wsdlMessage.getQName()); umdmOperation.setPattern(Constants.WSDL20_PATTERN_IN_OUT); - QName wsaAction = (QName)wsdlOperationOutput.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSA_ACTION); - if (wsaAction != null) - umdmOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_OUT, wsaAction.getLocalPart())); - wsaAction = (QName)wsdlOperationOutput.getExtensionAttribute(AddressingConstants.Metadata.Attributes.ACTION_QNAME); - if (wsaAction != null) - umdmOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_OUT, wsaAction.getLocalPart())); List<String> paramOrder = (List<String>)wsdlOperation.getParameterOrdering(); if (paramOrder != null) @@ -958,12 +901,6 @@ QName messageName = wsdlMessage.getQName(); WSDLInterfaceOperationOutfault opOutFault = new WSDLInterfaceOperationOutfault(umdmOperation); - QName wsaAction = (QName)wsdlFault.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSA_ACTION); - if (wsaAction != null) - opOutFault.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_FAULT, wsaAction.getLocalPart())); - wsaAction = (QName)wsdlFault.getExtensionAttribute(AddressingConstants.Metadata.Attributes.ACTION_QNAME); - if (wsaAction != null) - opOutFault.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_FAULT, wsaAction.getLocalPart())); opOutFault.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_FAULT, faultName)); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -38,16 +38,13 @@ import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.DOMWriter; -import org.jboss.ws.metadata.wsdl.Extendable; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDocumentation; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLImport; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceMessageReference; @@ -55,17 +52,12 @@ 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; import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.w3c.dom.Attr; import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * A WSDL Writer that writes a WSDL 1.1 file. It works off @@ -175,7 +167,6 @@ writtenFaultMessages.clear(); appendTypes(builder, namespace); - appendUnknownExtensibilityElements(builder, wsdl); appendMessages(builder, namespace); appendInterfaces(builder, namespace); appendBindings(builder, namespace); @@ -183,74 +174,6 @@ builder.append("</definitions>"); } - protected void appendUnknownExtensibilityElements(StringBuilder builder, Extendable extendable) - { - for (WSDLExtensibilityElement ext : extendable.getAllExtensibilityElements()) - { - appendPolicyElements(builder, ext); - appendAddressingPolicyElements(builder, ext); - appendJAXWSCustomizationElements(builder, ext); - //add processing of further extensibility element types below - } - } - - private void appendPolicyElements(StringBuilder builder, WSDLExtensibilityElement extElem) - { - if (Constants.WSDL_ELEMENT_POLICY.equalsIgnoreCase(extElem.getUri()) || - Constants.WSDL_ELEMENT_POLICYREFERENCE.equalsIgnoreCase(extElem.getUri())) - { - appendElementSkippingKnownNs(builder, extElem.getElement()); - } - } - - private void appendAddressingPolicyElements(StringBuilder builder, WSDLExtensibilityElement extElem) - { - if (WSDLGenerator.WSP_NS.equalsIgnoreCase(extElem.getUri())) - { - appendElementSkippingKnownNs(builder, extElem.getElement()); - } - } - - private void appendJAXWSCustomizationElements(StringBuilder builder, WSDLExtensibilityElement extElem) - { - if (Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS.equalsIgnoreCase(extElem.getUri())) - { - appendElementSkippingKnownNs(builder, extElem.getElement()); - } - } - - private void appendElementSkippingKnownNs(StringBuilder builder, Element el) - { - builder.append("<"+el.getNodeName()); - NamedNodeMap attributes = el.getAttributes(); - for (int i = 0; i < attributes.getLength(); i++) - { - Attr attr = (Attr)attributes.item(i); - if (attr.getName().startsWith("xmlns:") && attr.getValue()!=null) - { - String prefix = attr.getName().substring(6); - if (attr.getValue().equalsIgnoreCase(wsdl.getNamespaceURI(prefix))) - continue; - } - builder.append(" "+attr.getName()+"='"+attr.getValue()+"'"); - } - builder.append(">"); - NodeList childrenList = el.getChildNodes(); - for (int i=0; i<childrenList.getLength(); i++) - { - Node node = childrenList.item(i); - if (node instanceof Element) - { - appendElementSkippingKnownNs(builder, (Element)node); - } - else - { - builder.append(DOMWriter.printNode(node, false)); - } - } - builder.append("</"+el.getNodeName()+">"); - } - protected void appendMessages(StringBuilder buffer, String namespace) { WSDLInterface[] interfaces = wsdl.getInterfaces(); @@ -282,7 +205,6 @@ buffer.append("<message name='" + interfaceName + "_" + opname + "' >"); for (WSDLInterfaceOperationInput input : operation.getInputs()) { - appendUnknownExtensibilityElements(buffer, input); //only one may contain extensibility elements appendMessageParts(buffer, input); } buffer.append("</message>"); @@ -400,21 +322,7 @@ continue; buffer.append("<portType name='" + intf.getName().getLocalPart() + "'"); - WSDLProperty policyProp = intf.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - if (policyProp != null) - { - String prefix = wsdl.getPrefix(Constants.URI_WS_POLICY); - buffer.append(" "); - buffer.append(prefix); - buffer.append(":"); - buffer.append(Constants.WSDL_ATTRIBUTE_WSP_POLICYURIS.getLocalPart()); - buffer.append("='"); - buffer.append(policyProp.getValue()); - buffer.append("'"); - } buffer.append(">"); - appendDocumentation(buffer, intf.getDocumentationElement()); - appendUnknownExtensibilityElements(buffer, intf); appendPortOperations(buffer, intf); buffer.append("</portType>"); } @@ -456,8 +364,6 @@ } buffer.append(">"); - appendDocumentation(buffer, operation.getDocumentationElement()); - appendUnknownExtensibilityElements(buffer, operation); String opname = operation.getName().getLocalPart(); String interfaceName = operation.getWsdlInterface().getName().getLocalPart(); @@ -508,16 +414,6 @@ } } - protected void appendDocumentation(StringBuilder buffer, WSDLDocumentation documentation) - { - if (documentation != null && documentation.getContent() != null) - { - buffer.append("<documentation>"); - buffer.append(documentation.getContent()); - buffer.append("</documentation>"); - } - } - protected void appendBindings(StringBuilder buffer, String namespace) { WSDLBinding[] bindings = wsdl.getBindings(); @@ -533,7 +429,6 @@ String style = "rpc"; if (wsdlStyle.equals(Constants.DOCUMENT_LITERAL)) style = "document"; - appendUnknownExtensibilityElements(buffer, binding); // The value of the REQUIRED transport attribute (of type xs:anyURI) indicates which transport of SOAP this binding corresponds to. // The URI value "http://schemas.xmlsoap.org/soap/http" corresponds to the HTTP binding. @@ -562,7 +457,6 @@ buffer.append("<operation name='" + interfaceOperation.getName().getLocalPart() + "'>"); String soapAction = (operation.getSOAPAction() != null ? operation.getSOAPAction() : ""); - appendUnknownExtensibilityElements(buffer, operation); buffer.append("<" + soapPrefix + ":operation soapAction=\"" + soapAction + "\"/>"); WSDLBindingOperationInput[] inputs = operation.getInputs(); @@ -570,7 +464,6 @@ throw new WSException(BundleUtils.getMessage(bundle, "WSDL11_SUPPORT_MEPS")); buffer.append("<input>"); - appendUnknownExtensibilityElements(buffer, inputs[0]); appendSOAPBinding(buffer, wsdlInterface, operation, inputs); buffer.append("</input>"); @@ -668,7 +561,6 @@ if (!namespace.equals(service.getName().getNamespaceURI())) continue; buffer.append("<service name='" + service.getName().getLocalPart() + "'>"); - appendUnknownExtensibilityElements(buffer, service); WSDLEndpoint[] endpoints = service.getEndpoints(); int lenend = endpoints.length; for (int j = 0; j < lenend; j++) @@ -690,7 +582,6 @@ String ebname = prefix + ":" + endpointBinding.getLocalPart(); buffer.append("<port name='" + name + "' binding='" + ebname + "'>"); buffer.append("<" + soapPrefix + ":address location='" + endpoint.getAddress() + "'/>"); - appendUnknownExtensibilityElements(buffer, endpoint); buffer.append("</port>"); } } 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-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -33,7 +33,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; -import org.jboss.ws.common.DOMUtils; import org.jboss.ws.core.soap.Style; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; @@ -46,9 +45,7 @@ import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDocumentation; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLImport; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault; @@ -61,7 +58,6 @@ import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.w3c.dom.Element; /** * Generates a WSDL object model. @@ -71,8 +67,6 @@ public abstract class WSDLGenerator { private static final ResourceBundle bundle = BundleUtils.getBundle(WSDLGenerator.class); - public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; - public static final String WSP_NS = "http://www.w3.org/ns/ws-policy"; protected WSDLDefinitions wsdl; protected boolean extension; @@ -111,27 +105,6 @@ wsdl.addBinding(wsdlBinding); wsdlEndpoint.setBinding(bindingQName); - if (endpoint.getDocumentation() != null) - { - String prefix = wsdl.getPrefix(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS); - if (prefix == null) - { - prefix = "jaxws"; - wsdl.registerNamespaceURI(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, prefix); - } - - Element javadocElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_JAVADOC.getLocalPart(), prefix); - javadocElement.setTextContent(endpoint.getDocumentation()); - Element classElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_CLASS.getLocalPart(), prefix); - classElement.setAttribute("name", interfaceQName.getLocalPart()); - classElement.appendChild(javadocElement); - Element bindingsElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_BINDINGS.getLocalPart(), prefix); - bindingsElement.appendChild(classElement); - WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, bindingsElement); - wsdlInterface.addExtensibilityElement(ext); - wsdlInterface.setDocumentationElement(new WSDLDocumentation(endpoint.getDocumentation())); - } - for (OperationMetaData operation : endpoint.getOperations()) { processOperation(wsdlInterface, wsdlBinding, operation); @@ -172,28 +145,6 @@ wsdlBinding.addFault(bindingFault); } - // process optional documentation - if (operation.getDocumentation() != null) - { - String prefix = wsdl.getPrefix(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS); - if (prefix == null) - { - prefix = "jaxws"; - wsdl.registerNamespaceURI(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, prefix); - } - - Element javadocElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_JAVADOC.getLocalPart(), prefix); - javadocElement.setTextContent(operation.getDocumentation()); - Element methodElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_METHOD.getLocalPart(), prefix); - methodElement.setAttribute("name", operation.getQName().getLocalPart()); - methodElement.appendChild(javadocElement); - Element bindingsElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_BINDINGS.getLocalPart(), prefix); - bindingsElement.appendChild(methodElement); - WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, bindingsElement); - interfaceOperation.addExtensibilityElement(ext); - interfaceOperation.setDocumentationElement(new WSDLDocumentation(operation.getDocumentation())); - } - wsdlInterface.addOperation(interfaceOperation); wsdlBinding.addOperation(bindingOperation); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-04-10 08:39:42 UTC (rev 16130) @@ -76,7 +76,6 @@ <pathelement location="${thirdparty.dir}/jbossws-native-factories.jar"/> <fileset dir="${thirdparty.dir}"> <exclude name="**/jbossws-jboss*.jar"/> - <exclude name="**/jboss-as-webservices-tests-integration.jar"/> </fileset> </path> 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-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 08:39:42 UTC (rev 16130) @@ -63,7 +63,6 @@ <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss:jbossxb:jar</include> - <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> 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-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-04-10 08:39:42 UTC (rev 16130) @@ -90,16 +90,6 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" /> </jar> - <!-- jaxws-jbws1850 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1850.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.class" /> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </jar> - <!-- jaxws-jbws1909 --> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1909.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1909/META-INF/MANIFEST.MF"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -21,30 +21,24 @@ */ package org.jboss.test.ws.tools.validation; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.Map; import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.common.Constants; -import org.jboss.ws.metadata.wsdl.Extendable; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; 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.WSDLInterfaceOperationInfault; 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.WSDLService; import org.jboss.ws.tools.exceptions.JBossWSToolsException; import org.jboss.ws.common.DOMUtils; @@ -87,7 +81,6 @@ { WSDLBinding binding1 = bindings1[i]; WSDLBinding binding2 = bindings2[i]; - bool = bool && validateExtensibilityElements(binding1, binding2); bool = bool && validateBindingOperations(binding1.getOperations(),binding2.getOperations()); } return bool; @@ -137,103 +130,6 @@ } /** - * Validates the extensibility elements contained into the specified Extendable - * objects. - * @param w1 - * @param w2 - * @return - * @throws JBossWSToolsException - */ - public static boolean validateExtensibilityElements(Extendable ext1, Extendable ext2) - throws JBossWSToolsException - { - boolean bool = true; - //add validation of further extensibility element types below - if (bool) bool = validatePolicyElements(ext1,ext2); - - return bool; - } - - - private static boolean validatePolicyElements(Extendable ext1, Extendable ext2) - throws JBossWSToolsException - { - //policies - List<WSDLExtensibilityElement> pol1 = new ArrayList<WSDLExtensibilityElement>( - ext1.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY)); - List<WSDLExtensibilityElement> pol2 = new ArrayList<WSDLExtensibilityElement>( - ext2.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY)); - //check whether lists are the same size - if (pol1.size() != pol2.size()) - throw new JBossWSToolsException("Policy WSDLExtensibilityElement mismatch!"); - //check equality - for (WSDLExtensibilityElement el1 : pol1) - { - boolean done = false; - Iterator it = pol2.iterator(); - WSDLExtensibilityElement el2 = null; - while (it.hasNext() && !done) - { - el2 = (WSDLExtensibilityElement)it.next(); - done = (el1.isRequired() == el2.isRequired()) && - checkElementEquality(el1.getElement(), el2.getElement()); - } - if (!done) - { - log.error("Failing policy validation on policy on: "+ext1+" and "+ext2); - return false; - } - pol2.remove(el2); - } - //policy references - List<WSDLExtensibilityElement> polRef1 = new ArrayList<WSDLExtensibilityElement>( - ext1.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE)); - List<WSDLExtensibilityElement> polRef2 = new ArrayList<WSDLExtensibilityElement>( - ext2.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE)); - //check whether lists are the same size - if (polRef1.size() != polRef2.size()) - throw new JBossWSToolsException("Policy ref WSDLExtensibilityElement mismatch!"); - //check equality - for (WSDLExtensibilityElement el1 : polRef1) - { - boolean done = false; - Iterator it = polRef2.iterator(); - WSDLExtensibilityElement el2 = null; - while (it.hasNext() && !done) - { - el2 = (WSDLExtensibilityElement)it.next(); - done = (el1.isRequired() == el2.isRequired()) && - checkElementEquality(el1.getElement(), el2.getElement()); - } - if (!done) - { - log.error("Failing policy validation on policy ref on: "+ext1+" and "+ext2); - return false; - } - polRef2.remove(el2); - } - //check properties - WSDLProperty prop1 = ext1.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - WSDLProperty prop2 = ext2.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - if (prop1 != null || prop2 != null) - { - if (prop1 == null || prop2 == null || prop1.isRequired() != prop2.isRequired()) - throw new JBossWSToolsException("Policy prop WSDLExtensibilityElement mismatch!"); - String value1 = prop1.getValue(); - String value2 = prop2.getValue(); - if (value1 != null || value2 != null) - { - if (value1 == null || value2 == null || !value1.equalsIgnoreCase(value2)) - { - log.error("Failing policy validation on policy uri prop on: "+ext1+" and "+ext2); - return false; - } - } - } - return true; - } - - /** * Validates the namespace definitions in the wsdl * @param w1 WSDL Definitions for the first wsdl * @param w2 WSDL Definitions for the second wsdl @@ -326,10 +222,9 @@ bool = checkQNameEquality(s1.getName(),s2.getName()); if(bool) { - bool = validateExtensibilityElements(s1, s2); WSDLEndpoint[] we1 = s1.getEndpoints(); WSDLEndpoint[] we2 = s2.getEndpoints(); - bool = bool && validateWSDLEndpoints(we1, we2); + bool = validateWSDLEndpoints(we1, we2); } } return bool; @@ -389,7 +284,6 @@ { boolean bool = checkQNameEquality(w1.getName(),w2.getName()); - bool = bool && validateExtensibilityElements(w1, w2); if(bool) { //validate the inputs @@ -470,9 +364,6 @@ bool = checkQNameEquality(xmlName1,xmlName2); if(bool == false) throw new JBossWSToolsException(xmlName1 + " & " + xmlName2 + " mismatch"); - bool = validateExtensibilityElements(i1, i2); - if(bool == false) - throw new JBossWSToolsException("WSDLExtensibilityElement mismatch"); return bool; } @@ -524,7 +415,6 @@ WSDLBindingOperationInput bindin1 = wb1[i]; WSDLBindingOperationInput bindin2 = wb2[i]; bool = checkStringEquality(bindin1.getMessageLabel(),bindin2.getMessageLabel()); - bool = bool & validateExtensibilityElements(bindin1, bindin2); if(!bool) return bool; } @@ -541,7 +431,6 @@ WSDLBindingOperationOutput bindout2 = wboutarr2[i]; bool = checkStringEquality(bindout1.getMessageLabel(),bindout2.getMessageLabel()); } - bool = bool & validateExtensibilityElements(b1, b2); return bool; } @@ -568,7 +457,6 @@ bool = checkQNameEquality(e1.getName(),e2.getName()); if(bool == false) throw new JBossWSToolsException("Endpoint Names do not match"); - bool = bool && validateExtensibilityElements(e1, e2); } return bool; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2012-04-10 08:30:31 UTC (rev 16129) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2012-04-10 08:39:42 UTC (rev 16130) @@ -100,8 +100,6 @@ { boolean bool = false; bool = WSDLValidationHelper.validateNSDefinitions(wsdlExp,wsdlAct); - if ( bool ) - bool = WSDLValidationHelper.validateExtensibilityElements(wsdlExp,wsdlAct); if( bool) bool = WSDLValidationHelper.validateBindings(wsdlExp,wsdlAct); if( bool)