[jbossws-commits] JBossWS SVN: r16082 - in stack/native/trunk: modules/core and 10 other directories.

Author: ropalka Date: 2012-04-03 05:52:44 -0400 (Tue, 03 Apr 2012) New Revision: 16082 Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/com/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/ Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.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/FaultMetaData.java stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: [JBWS-3474] removing jaxb & sun tools dependencies Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/core/pom.xml 2012-04-03 09:52:44 UTC (rev 16082) @@ -93,30 +93,10 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-tools</artifactId> - </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.spec.javax.xml.bind</groupId> - <artifactId>jboss-jaxb-api_2.2_spec</artifactId> - </dependency> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-03 09:52:44 UTC (rev 16082) @@ -131,7 +131,6 @@ if (desFactory == null) throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_DESERIALIZER_FACTORY", xmlType)); - // Try jaxb deserialization try { // http://jira.jboss.org/jira/browse/JBWS-955 Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java 2012-04-03 09:52:44 UTC (rev 16082) @@ -1,71 +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.accessor; - -import org.jboss.ws.WSException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.api.RawAccessor; - -/** - * A JAXB object accessor. - * - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - */ -@SuppressWarnings("unchecked") -public class JAXBAccessor implements Accessor -{ - private RawAccessor accessor; - - JAXBAccessor(RawAccessor accessor) - { - this.accessor = accessor; - } - - public Object get(Object bean) - { - try - { - return accessor.get(bean); - } - catch (AccessorException a) - { - WSException ex = new WSException(a.getMessage()); - ex.setStackTrace(a.getStackTrace()); - throw ex; - } - } - - public void set(Object bean, Object value) - { - try - { - accessor.set(bean, value); - } - catch (AccessorException a) - { - WSException ex = new WSException(a.getMessage()); - ex.setStackTrace(a.getStackTrace()); - throw ex; - } - } -} Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java 2012-04-03 09:52:44 UTC (rev 16082) @@ -1,71 +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.accessor; - -import java.util.ResourceBundle; - -import javax.xml.namespace.QName; - -import org.jboss.ws.WSException; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.umdm.WrappedParameter; - -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.RawAccessor; - -final class JAXBAccessorFactory implements AccessorFactory -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(JAXBAccessorFactory.class); - private final Class clazz; - private final JAXBRIContext ctx; - - JAXBAccessorFactory(Class clazz, JAXBRIContext ctx) - { - this.clazz = clazz; - this.ctx = ctx; - } - - public Accessor create(WrappedParameter parameter) - { - RawAccessor<Object, Object> accessor; - try - { - QName name = parameter.getName(); - accessor = ctx.getElementPropertyAccessor( - clazz, - name.getNamespaceURI().intern(), // JAXB internally optimizes String usage towards intern() - name.getLocalPart().intern() // see com.sun.xml.bind.v2.util.QNameMap; - ); - } - catch (Throwable t) - { - WSException ex = new WSException(t.getMessage()); - ex.setStackTrace(t.getStackTrace()); - throw ex; - } - - if (accessor == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_OBTAIN_ACCESSOR", parameter)); - - return new JAXBAccessor(accessor); - } -} Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java 2012-04-03 09:52:44 UTC (rev 16082) @@ -1,55 +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.accessor; - -import java.util.ResourceBundle; - -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; - -import com.sun.xml.bind.api.JAXBRIContext; - -public class JAXBAccessorFactoryCreator implements AccessorFactoryCreator -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(JAXBAccessorFactoryCreator.class); - private JAXBRIContext ctx; - - public void setJAXBContext(JAXBRIContext ctx) - { - this.ctx = ctx; - } - - public AccessorFactory create(ParameterMetaData parameter) - { - if (ctx == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "JAXBCONTEXT_NOT_AVAILABLE")); - return new JAXBAccessorFactory(parameter.getJavaType(), ctx); - } - - public AccessorFactory create(FaultMetaData fault) - { - if (ctx == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "JAXBCONTEXT_NOT_AVAILABLE")); - return new JAXBAccessorFactory(fault.getFaultBean(), ctx); - } -} 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-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-03 09:52:44 UTC (rev 16082) @@ -27,7 +27,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -58,7 +57,6 @@ import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.accessor.AccessorFactory; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; -import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.config.JBossWSConfigFactory; @@ -118,8 +116,6 @@ private List<OperationMetaData> operations = new ArrayList<OperationMetaData>(); // Maps the java method to the operation meta data private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); - // All of the registered types - private List<Class> registeredTypes = new ArrayList<Class>(); // The features defined for this endpoint private FeatureSet features = new FeatureSet(); @@ -527,7 +523,6 @@ { TypeMappingImpl typeMapping = serviceMetaData.getTypeMapping(); List<TypeMappingMetaData> typeMappings = serviceMetaData.getTypesMetaData().getTypeMappings(); - registeredTypes = new ArrayList<Class>(typeMappings.size()); for (TypeMappingMetaData tmMetaData : typeMappings) { String javaTypeName = tmMetaData.getJavaTypeName(); @@ -536,45 +531,27 @@ { List<Class> types = typeMapping.getJavaTypes(xmlType); - // TODO: Clarification. In which cases is the type already registered? - boolean registered = false; - for (Class current : types) + try { - if (current.getName().equals(javaTypeName)) - { - registeredTypes.add(current); - registered = true; - break; - } - } + ClassLoader classLoader = getClassLoader(); + Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); - if (registered == false) - { - try - { - ClassLoader classLoader = getClassLoader(); - Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + if (JavaUtils.isPrimitive(javaTypeName)) + javaType = JavaUtils.getWrapperType(javaType); - if (JavaUtils.isPrimitive(javaTypeName)) - javaType = JavaUtils.getWrapperType(javaType); - - // Needed for runtime JAXB context - registeredTypes.add(javaType); - - if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) - { - typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); - } - else - { - typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); - } + if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + { + typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); } - catch (ClassNotFoundException e) + else { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); + typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); } } + catch (ClassNotFoundException e) + { + log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); + } } } } @@ -582,26 +559,17 @@ private void eagerInitializeAccessors() { // Collect the list of all used types - boolean useJAXBAccessorFactory = false; List<Class> types = new ArrayList<Class>(); for (OperationMetaData opMetaData : operations) { for (ParameterMetaData paramMetaData : opMetaData.getParameters()) { - AccessorFactoryCreator factoryCreator = paramMetaData.getAccessorFactoryCreator(); - if (factoryCreator instanceof JAXBAccessorFactoryCreator) - useJAXBAccessorFactory = true; - types.add(paramMetaData.getJavaType()); } ParameterMetaData retParam = opMetaData.getReturnParameter(); if (retParam != null) { - AccessorFactoryCreator factoryCreator = retParam.getAccessorFactoryCreator(); - if (factoryCreator instanceof JAXBAccessorFactoryCreator) - useJAXBAccessorFactory = true; - types.add(retParam.getJavaType()); } } @@ -762,11 +730,6 @@ toInitialise.configHandlerMetaData(); } - public List<Class> getRegisteredTypes() - { - return Collections.unmodifiableList(registeredTypes); - } - class ConfigObservable extends Observable { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-03 09:52:44 UTC (rev 16082) @@ -27,8 +27,6 @@ import java.util.Arrays; import java.util.ResourceBundle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.namespace.QName; import javax.xml.ws.WebServiceException; @@ -36,9 +34,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.JavaUtils; -import org.jboss.ws.metadata.accessor.AccessorFactory; -import org.jboss.ws.metadata.accessor.ReflectiveFieldAccessorFactoryCreator; -import org.jboss.ws.metadata.accessor.ReflectiveMethodAccessorFactoryCreator; /** * A Fault component describes a fault that a given operation supports. @@ -211,17 +206,7 @@ if (JavaUtils.isAssignableFrom(Exception.class, javaType) == false) throw new WSException(BundleUtils.getMessage(bundle, "FAULT_JAVA_TYPE_NOT_EXCEPTION", javaTypeName)); } - private AccessorFactory getAccessorFactory(Class faultBean) - { - // This should catch all cases due to the constraints that JAX-WS puts on the fault bean - // However, if issues arrise then switch this to a full jaxb reflection library - XmlAccessorType type = (XmlAccessorType)faultBean.getAnnotation(XmlAccessorType.class); - if (type != null && type.value() == XmlAccessType.FIELD) - return new ReflectiveFieldAccessorFactoryCreator().create(this); - return new ReflectiveMethodAccessorFactoryCreator().create(this); - } - public Object toFaultBean(Exception serviceException) { Object faultBeanInstance; 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-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-03 09:52:44 UTC (rev 16082) @@ -36,17 +36,11 @@ <include>org.jboss.ws.native:jbossws-native-services:jar</include> <include>org.jboss.ws.native:jbossws-native-core</include> <include>javax.jws:jsr181-api:jar</include> - <include>com.sun.xml.bind:jaxb-impl:jar</include> - <include>com.sun.xml.bind:jaxb-xjc:jar</include> - <include>com.sun.xml.ws:jaxws-tools:jar</include> - <include>com.sun.xml.ws:jaxws-rt: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> - <include>com.sun.xml.ws:policy:jar</include> <include>javax.xml.stream:stax-api:jar</include> <include>org.jvnet.staxex:stax-ex:jar</include> - <include>com.sun.xml.stream.buffer:streambuffer:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.jboss.netty:netty:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> @@ -110,21 +104,9 @@ <useProjectArtifact>false</useProjectArtifact> </dependencySet> - <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping> - <includes> - <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> <includes> <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-03 09:52:44 UTC (rev 16082) @@ -32,12 +32,9 @@ <module name="javax.jws.api" export="true"/> <module name="javax.wsdl4j.api" export="true"/> <module name="javax.xml.ws.api" export="true"/> - <module name="com.sun.xml.bind" services="export" export="true"/> - <module name="com.sun.tools.javac" export="true"/> <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> <module name="org.jboss.ws.common" services="import" export="true"/> - <module name="org.jboss.ws.jaxws-client" services="export" export="true"/> <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/> <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> <imports> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-03 09:52:44 UTC (rev 16082) @@ -29,14 +29,11 @@ </resources> <dependencies> - <module name="com.sun.tools.ws" services="import" optional="true"/> - <module name="com.sun.xml.bind" services="import"/> <module name="javax.api" /> <module name="javax.servlet.api" /> <module name="javax.jws.api" /> <module name="javax.mail.api" /> <module name="javax.wsdl4j.api" /> - <module name="javax.xml.bind.api" /> <module name="javax.xml.stream.api" /> <module name="javax.xml.rpc.api" /> <module name="javax.xml.ws.api" /> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-03 09:52:44 UTC (rev 16082) @@ -60,26 +60,6 @@ <include name="**/jbossxb.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/com/sun/tools/ws/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jaxws-tools.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/com/sun/xml/stream/buffer/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/streambuffer.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/com/sun/xml/ws/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jaxws-rt.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/com/sun/xml/ws/policy/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/policy.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/stax-ex.jar"/> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-04-03 09:52:44 UTC (rev 16082) @@ -57,13 +57,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.5.0</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> @@ -128,42 +121,6 @@ </testResource> </testResources> <plugins> - <plugin> <!-- This copies jboss-jaxws-api_2.2_spec & jboss-jaxb-api_2.2_spec jars to endorsed dir before the integration-tests are run --> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.spec.javax.xml.bind</groupId> - <artifactId>jboss-jaxb-api_2.2_spec</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> <plugin> <!-- This copies jbossws-native-factories jar to endorsed dir before the integration-tests are run --> <artifactId>maven-resources-plugin</artifactId> <executions> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-04-03 08:54:31 UTC (rev 16081) +++ stack/native/trunk/pom.xml 2012-04-03 09:52:44 UTC (rev 16082) @@ -73,13 +73,9 @@ <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <saaj.api.version>1.0.1.Final</saaj.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> - <jaxb.api.version>1.0.3.Final</jaxb.api.version> - <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> <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> <stax.api.version>1.0-2</stax.api.version> <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> @@ -185,87 +181,6 @@ <version>${commons.logging.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>policy</artifactId> - <version>${sun.policy.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.txw2</groupId> - <artifactId>txw2</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.istack</groupId> - <artifactId>istack-commons-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-tools</artifactId> - <version>${sun.jaxws.version}</version> - <exclusions> - <exclusion> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - <version>${sun.jaxws.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.messaging.saaj</groupId> - <artifactId>saaj-impl</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.jvnet</groupId> - <artifactId>mimepull</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.gmbal</groupId> - <artifactId>gmbal-api-only</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> <version>${jsr181.api.version}</version> @@ -291,21 +206,6 @@ <version>${saaj.api.version}</version> </dependency> <dependency> - <groupId>org.jboss.spec.javax.xml.bind</groupId> - <artifactId>jboss-jaxb-api_2.2_spec</artifactId> - <version>${jaxb.api.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.impl.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>${jaxb.impl.version}</version> - </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> <version>${stax.api.version}</version>