March 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16052 - in stack/native/trunk: modules/core/src/main/resources and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-27 08:59:28 -0400 (Tue, 27 Mar 2012) New Revision: 16052 Removed: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/jaxbintros/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1809/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jaxbintros/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1809/ Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/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/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: [JBWS-3474] removing jaxb intros & jaxr Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml 2012-03-27 11:18:25 UTC (rev 16051) +++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml 2012-03-27 12:59:28 UTC (rev 16052) @@ -52,7 +52,7 @@ </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> - <property name="requires" class="java.lang.String">UnifiedMetaDataModel, JAXBIntros</property> + <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property> <property name="provides" class="java.lang.String">PublishedContract</property> </deploymentAspect> @@ -61,12 +61,8 @@ </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property> + <property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot</property> <property name="provides" class="java.lang.String">UnifiedMetaDataModel</property> </deploymentAspect> - <deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect"> - <property name="provides" class="java.lang.String">JAXBIntros</property> - </deploymentAspect> - </deploymentAspects> 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-27 11:18:25 UTC (rev 16051) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-27 12:59:28 UTC (rev 16052) @@ -41,7 +41,6 @@ <include>com.sun.xml.bind:jaxb-xjc:jar</include> <include>com.sun.xml.ws:jaxws-tools:jar</include> <include>com.sun.xml.ws:jaxws-rt:jar</include> - <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include> <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-03-27 11:18:25 UTC (rev 16051) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-03-27 12:59:28 UTC (rev 16052) @@ -37,12 +37,10 @@ <module name="javax.servlet.api"/> <module name="javax.wsdl4j.api" /> <module name="javax.xml.ws.api"/> - <module name="org.jboss.jaxbintros"/> <module name="org.jboss.ws.api"/> <module name="org.jboss.ws.spi"/> <module name="org.jboss.logging"/> <module name="org.jboss.common-core"/> <module name="org.apache.xerces" services="import"/> - <module name="org.jboss.jaxbintros"/> </dependencies> </module> 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-27 11:18:25 UTC (rev 16051) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-27 12:59:28 UTC (rev 16052) @@ -25,29 +25,6 @@ <project>  -  -  - - <macrodef name="macro-deploy-juddi-sar"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}"> - <fileset dir="@{thirdpartydir}"> - <include name="**/juddi-service.sar"/> - </fileset> - </unzip> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/juddi.jar"/> - <include name="**/scout.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - -    @@ -58,11 +35,6 @@ <attribute name="modules-jbossid"/> <sequential>  - <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-native-client.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-core/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-native-core.jar"/> @@ -113,11 +85,6 @@ <include name="**/stax-ex.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/jboss/jaxbintros/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jboss-jaxb-intros.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/apache/commons/beanutils/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/commons-beanutils.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-27 11:18:25 UTC (rev 16051) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-27 12:59:28 UTC (rev 16052) @@ -30,22 +30,6 @@ <mkdir dir="${tests.output.dir}/test-libs" /> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jaxbintros/**/*.class" /> - <include name="org/jboss/test/helper/DOMWriter.class" /> - </classes> - - <webinf dir="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF"> - <include name="*.xml" /> - <include name="**/*.wsdl" /> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws771.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -81,15 +65,6 @@ </metainf> </jar> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1809/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" /> - </jar> -  <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/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-27 11:18:25 UTC (rev 16051) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-27 12:59:28 UTC (rev 16052) @@ -82,33 +82,7 @@ <version>3.8.1</version> <scope>test</scope> </dependency> -  <dependency> - <groupId>jboss.web</groupId> - <artifactId>jbossweb</artifactId> - <version>2.1.1.CR7</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <version>${apache.scout.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <version>${juddi.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-saaj</artifactId> - <version>${jboss.jaxr.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.javaee</groupId> <artifactId>jboss-javaee</artifactId> <version>${jboss.javaee.version}</version> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-03-27 11:18:25 UTC (rev 16051) +++ stack/native/trunk/pom.xml 2012-03-27 12:59:28 UTC (rev 16052) @@ -77,9 +77,6 @@ <jaxb.impl.version>2.2.4</jaxb.impl.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> - <jboss.jaxr.version>2.0.3</jboss.jaxr.version> - <apache.scout.version>1.1.1</apache.scout.version> - <juddi.version>0.9RC4</juddi.version> <netty.version>3.2.6.Final</netty.version> <sun.jaxws.version>2.2</sun.jaxws.version> <sun.policy.version>2.0-b01</sun.policy.version> @@ -309,22 +306,6 @@ <version>${jaxb.impl.version}</version> </dependency> <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <version>${jboss.jaxr.version}</version> - <type>sar</type> - </dependency> - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <version>${apache.scout.version}</version> - </dependency> - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <version>${juddi.version}</version> - </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> <version>${stax.api.version}</version>

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16051 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/jaxws/client and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-27 07:18:25 -0400 (Tue, 27 Mar 2012) New Revision: 16051 Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/ 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/feature/ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1850/ Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.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/metadata/umdm/EndpointMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 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/WSDL11Writer.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/dist/src/main/distro/build.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java Log: [JBWS-3474] removing features and annotations processing Deleted: 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-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/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-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/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-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/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-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/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-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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-utilit..."; - 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/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-03-27 11:18:25 UTC (rev 16051) @@ -31,16 +31,6 @@ <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-native-config-as7.xml" tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-03-27 11:18:25 UTC (rev 16051) @@ -77,7 +77,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/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-27 11:18:25 UTC (rev 16051) @@ -64,7 +64,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> @@ -75,7 +74,7 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> + <include>org.jboss.ws:jbossws-jboss*:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> 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-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-27 11:18:25 UTC (rev 16051) @@ -90,16 +90,6 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" /> </jar> -  - <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> -  <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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2012-03-27 10:02:50 UTC (rev 16050) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2012-03-27 11:18:25 UTC (rev 16051) @@ -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)

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16050 - in stack/native/trunk: modules and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-27 06:02:50 -0400 (Tue, 27 Mar 2012) New Revision: 16050 Removed: stack/native/trunk/.gitignore stack/native/trunk/README-COMMITTERS stack/native/trunk/eclipse/ stack/native/trunk/modules/client/ stack/native/trunk/modules/core/src/main/java/javax/ 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-benchmark.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/benchmark/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/ Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/pom.xml Log: [JBWS-3474] removing empty dirs and useless benchmark tests Deleted: stack/native/trunk/.gitignore =================================================================== --- stack/native/trunk/.gitignore 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/.gitignore 2012-03-27 10:02:50 UTC (rev 16050) @@ -1,45 +0,0 @@ - -# / -/target.properties -/.settings -/target -/profiles.xml -/clipboard.* - -# /modules/client/ -/modules/client/target - -# /modules/core/ -/modules/core/target - -# /modules/endorsed/ -/modules/endorsed/target - -# /modules/management/ -/modules/management/target - -# /modules/resources/ -/modules/resources/target - -# /modules/services/ -/modules/services/target - -# /modules/testsuite/framework-tests/ -/modules/testsuite/framework-tests/target -/modules/testsuite/framework-tests/wsprovide -/modules/testsuite/framework-tests/work -/modules/testsuite/framework-tests/wsconsume -/modules/testsuite/framework-tests/*.log -/modules/testsuite/framework-tests/*.txt - -# /modules/testsuite/framework-tests/src/test/ -/modules/testsuite/framework-tests/src/test/ant-import -/modules/testsuite/framework-tests/src/test/java -/modules/testsuite/framework-tests/src/test/resources - -# /modules/testsuite/native-tests/ -/modules/testsuite/native-tests/target -/modules/testsuite/native-tests/tools -/modules/testsuite/native-tests/wstools -/modules/testsuite/native-tests/*.log -/modules/testsuite/native-tests/*.txt Deleted: stack/native/trunk/README-COMMITTERS =================================================================== --- stack/native/trunk/README-COMMITTERS 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/README-COMMITTERS 2012-03-27 10:02:50 UTC (rev 16050) @@ -1,4 +0,0 @@ - * If you are using Eclipse then set your code style to eclipse/jboss-style.xml. - * If you are using Eclipse then set your check style to eclipse/jboss-format.xml. - * According to http://community.jboss.org/wiki/CopyrightOwnershipandLicenses - ensure you're putting correct license headers to Java and XML files. Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/core/pom.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -59,11 +59,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> 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-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -105,17 +105,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> - <include>org.jboss.naming:jnp-client:jar</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <scope>test</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <includes> Modified: stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -31,10 +31,9 @@ <target name="main"> <copy todir="${target.dir}/classes/resources"> <fileset dir="${basedir}/../core/target/resources"/> - <fileset dir="${basedir}/../client/src/main/resources/META-INF"/> </copy> <jar destfile="${source.jar}" basedir="${target.dir}/classes" update="true"/> <jar destfile="${binary.jar}" basedir="${target.dir}/classes" update="true"/> </target> - + </project> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -43,26 +43,6 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>wsconsume</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.test.classpath" refid="maven.test.classpath" /> - <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> - <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="project.version" value="${project.version}" /> - <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> - <property name="log4j.output.dir" value="${log4j.output.dir}"/> - <property name="endorsed.dirs" value="${endorsed.dirs}"/> - <property name="jboss.home" value="${jboss.home}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> - </tasks> - </configuration> - </execution> - <execution> <id>wstools</id> <phase>test-compile</phase> <goals> @@ -81,25 +61,6 @@ </configuration> </execution> <execution> - <id>wsprovide</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.test.classpath" refid="maven.test.classpath" /> - <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> - <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> - <property name="log4j.output.dir" value="${log4j.output.dir}"/> - <property name="jboss.home" value="${jboss.home}"/> - <property name="endorsed.dirs" value="${endorsed.dirs}"/> - <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" /> - </tasks> - </configuration> - </execution> - <execution> <id>build-jars</id> <phase>test-compile</phase> <goals> @@ -114,7 +75,6 @@ <ant antfile="scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" /> <ant antfile="scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" /> <ant antfile="scripts/build-jars-jaxws.xml" target="build-jars-jaxws" /> - <ant antfile="scripts/build-samples-jaxws.xml" target="build-samples-jaxws" /> </tasks> </configuration> </execution> Deleted: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<project> - - <target name="wsconsume" description="Consume JAX-WS contracts"> - - <taskdef name="wsconsume" classname="org.jboss.ws.tools.ant.WSConsumeTask"> - <classpath> - <pathelement path="${maven.test.classpath}"/> - </classpath> - </taskdef> - - <wsconsume-macro - wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" - package="org.jboss.test.ws.benchmark.jaxws.doclit" - outputDir="${tests.output.dir}" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - /> - - </target> - - <macrodef name="wsconsume-macro"> - - <attribute name="wsdl"/> - <attribute name="package"/> - <attribute name="outputDir"/> - <attribute name="jbossHome"/> - <attribute name="log4jConf"/> - <attribute name="loggingDir"/> - <attribute name="javaEndorsedDirs"/> - - <sequential> - <wsconsume - wsdl="@{wsdl}" - package="@{package}" - sourcedestdir="@{outputdir}/wsconsume/java" - destdir="@{outputdir}" - nocompile="true" - keep="true" - verbose="false" - target="2.2" - fork="true" - > - <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/> - <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> - <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> - </wsconsume> - </sequential> - - </macrodef> - -</project> Deleted: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<project> - - <target name="wsprovide" description="Provide the JAX-WS contracts."> - - <taskdef name="wsprovide" classname="org.jboss.ws.tools.ant.WSProvideTask"> - <classpath> - <pathelement path="${maven.test.classpath}"/> - </classpath> - </taskdef> - - </target> - - <macrodef name="wsprovide-macro"> - - <attribute name="sei"/> - <attribute name="destDir"/> - <attribute name="jbossHome"/> - <attribute name="outputDir"/> - <attribute name="log4jConf"/> - <attribute name="loggingDir"/> - <attribute name="resourcesDir"/> - <attribute name="javaEndorsedDirs"/> - - <sequential> - <wsprovide - sei="@{sei}" - fork="true" - keep="true" - genwsdl="true" - verbose="false" - classpath="@{outputDir}/test-classes" - destdir="@{outputDir}/test-classes/@{destDir}" - resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" - sourcedestdir="@{outputDir}/test-sources/@{resourcesDir}" - > - <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/> - <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> - <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> - </wsprovide> - </sequential> - - </macrodef> - -</project> Deleted: stack/native/trunk/modules/testsuite/native-tests/scripts/build-benchmark.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-benchmark.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-benchmark.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<project name="JBossWS Benchmarks"> - -  -  -  - - <target name="build-benchmark" depends="main"> - <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/> - </target> - -  -  -  - -  - <target name="tests-benchmark" depends="init" description="Run benchmark unit tests"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> - </antcall> - <antcall target="tests-report"/> - </target> - -</project> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -99,114 +99,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-benchmark-rpclit-appclient.jar"/> - </fileset> - </jar> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-benchmark-doclit-appclient.jar"/> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/href/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> 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-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -26,55 +26,10 @@ <description>JBossWS test archive builder</description> -  -  -  -  -  -  -  - <target name="build-jars-jaxws" description="Build the deployments."> <mkdir dir="${tests.output.dir}/test-libs" /> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class" /> - <include name="org/jboss/test/ws/benchmark/jaxws/**/*.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - </war> - - <war warfile="${tests.output.dir}/test-libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF"> - <include name="handlers.xml" /> - <include name="sun-jaxws.xml" /> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.esb"> - <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxws/esb/META-INF"> - <include name="*.xml" /> - </metainf> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-benchmark-doclit.war" /> - </fileset> - <fileset dir="${tests.output.dir}/test-resources/benchmark/jaxws/esb"> - <include name="*.xml" /> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Deleted: 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-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<project> - -  -  -  - - <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - -  - - </target> - -</project> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-03-27 06:26:49 UTC (rev 16049) +++ stack/native/trunk/pom.xml 2012-03-27 10:02:50 UTC (rev 16050) @@ -51,7 +51,6 @@ <modules> <module>modules/endorsed</module> <module>modules/core</module> - <module>modules/client</module> <module>modules/resources</module> <module>modules/services</module> </modules>

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16049 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-27 02:26:49 -0400 (Tue, 27 Mar 2012) New Revision: 16049 Modified: stack/cxf/trunk/pom.xml Log: Move to junit 3.8.2 Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-03-27 06:26:17 UTC (rev 16048) +++ stack/cxf/trunk/pom.xml 2012-03-27 06:26:49 UTC (rev 16049) @@ -1245,7 +1245,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>3.8.2</version> <scope>test</scope> </dependency> </dependencies>

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16048 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-27 02:26:17 -0400 (Tue, 27 Mar 2012) New Revision: 16048 Modified: stack/cxf/trunk/pom.xml Log: [JBWS-3473] Temporary move back to jbws-common 2.0.2.GA to solve jaxrpc regressions related to jbws-native cleanup Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) +++ stack/cxf/trunk/pom.xml 2012-03-27 06:26:17 UTC (rev 16048) @@ -61,7 +61,7 @@ <properties> <jbossws.api.version>1.0.0.GA</jbossws.api.version> <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version> + <jbossws.common.version>2.0.2.GA</jbossws.common.version>  <jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16047 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/addons and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 10:38:02 -0400 (Mon, 26 Mar 2012) New Revision: 16047 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: prepare for next dev. cycle Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-26 14:35:26 UTC (rev 16046) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-26 14:38:02 UTC (rev 16047) @@ -32,7 +32,7 @@ <description>JBossWS CXF stack</description> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version>  <parent> @@ -43,9 +43,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.0.3.GA</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cx...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/branches/jbossws-cxf-4...</url> </scm>

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16046 - stack/cxf/tags.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 10:35:26 -0400 (Mon, 26 Mar 2012) New Revision: 16046 Added: stack/cxf/tags/jbossws-cxf-4.0.3.GA/ Log: creating JBossWS CXF 4.0.3.GA EAP tag

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16045 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/addons and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 10:34:18 -0400 (Mon, 26 Mar 2012) New Revision: 16045 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: prepare for tagging Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -4,12 +4,11 @@ <name>JBoss Web Services - Stack CXF Distribution</name> <artifactId>jbossws-cxf-dist</artifactId> <packaging>pom</packaging> - <version>4.0.3-SNAPSHOT</version> <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/endorsed/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-26 14:34:18 UTC (rev 16045) @@ -32,7 +32,7 @@ <description>JBossWS CXF stack</description> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3.GA</version>  <parent> @@ -43,9 +43,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cx...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/branches/jbossws-cxf-4...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.0.3.GA</url> </scm>  @@ -60,10 +60,10 @@  <properties> <jbossws.api.version>1.0.0.GA</jbossws.api.version> - <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version> - <jbossws.common.tools.version>1.0.1-SNAPSHOT</jbossws.common.tools.version> - <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version> + <jbossws.spi.version>2.0.3.GA</jbossws.spi.version> + <jbossws.common.version>2.0.3.GA</jbossws.common.version> + <jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version> + <jbossws.shared.testsuite.version>4.0.3.GA</jbossws.shared.testsuite.version> <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version>  <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.4.6</cxf.version> @@ -76,7 +76,7 @@ <jboss.security.sx.version>2.0.4</jboss.security.sx.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> <picketbox.version>4.0.6.Beta1</picketbox.version> - <jaxws-jboss-httpserver-httpspi.version>1.0.2-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version> + <jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version> <jaxb.impl.version>2.2.4</jaxb.impl.version>

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16044 - in stack/native/branches/jbossws-native-4.0.x: modules/client and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 10:16:10 -0400 (Mon, 26 Mar 2012) New Revision: 16044 Modified: stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: prepare for next dev. cycle Modified: stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> 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-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -5,12 +5,11 @@ <name>JBoss Web Services - Stack Native Distribution</name> <artifactId>jbossws-native-dist</artifactId> <packaging>pom</packaging> - <version>4.0.3.GA</version> <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-26 14:12:27 UTC (rev 16043) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-26 14:16:10 UTC (rev 16044) @@ -31,7 +31,7 @@ <packaging>pom</packaging> <description>JBossWS Native stack</description> - <version>4.0.3.GA</version> + <version>4.0.4-SNAPSHOT</version>  <parent> @@ -42,9 +42,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url> </scm>

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r16043 - stack/native/tags.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 10:12:27 -0400 (Mon, 26 Mar 2012) New Revision: 16043 Added: stack/native/tags/jbossws-native-4.0.3.GA/ Log: creating JBossWS Native 4.0.3.GA tag

12 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2012