March 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r13894 - in stack/native/branches/jbossws-native-3.4.1.SP1: modules/client and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-14 04:40:10 -0400 (Mon, 14 Mar 2011) New Revision: 13894 Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/client/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/endorsed/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/management/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/resources/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/services/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/native-tests/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/pom.xml stack/native/branches/jbossws-native-3.4.1.SP1/pom.xml Log: Updating poms Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/client/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/client/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/client/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/endorsed/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/endorsed/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/endorsed/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/management/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/management/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/management/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/resources/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/resources/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/services/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/services/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/services/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/native-tests/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/native-tests/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.4.1.SP1/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/pom.xml 2011-03-14 08:21:56 UTC (rev 13893) +++ stack/native/branches/jbossws-native-3.4.1.SP1/pom.xml 2011-03-14 08:40:10 UTC (rev 13894) @@ -18,7 +18,7 @@ <packaging>pom</packaging> <description>JBossWS Native stack</description> - <version>3.4.1.GA</version> + <version>3.4.1.SP1</version>  <parent> @@ -29,9 +29,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/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> </scm>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13893 - in stack/native/branches/jbossws-native-3.4.1.SP1: modules/core/src/main/java/org/jboss/ws/core/jaxws/spi and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-14 04:21:56 -0400 (Mon, 14 Mar 2011) New Revision: 13893 Modified: stack/native/branches/jbossws-native-3.4.1.SP1/ stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/ Log: [JBWS-3198] merging fix in 3.4.1.SP1 Property changes on: stack/native/branches/jbossws-native-3.4.1.SP1 ___________________________________________________________________ Added: svn:mergeinfo + /stack/native/trunk:13578 Modified: stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-03-14 06:48:11 UTC (rev 13892) +++ stack/native/branches/jbossws-native-3.4.1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-03-14 08:21:56 UTC (rev 13893) @@ -481,7 +481,11 @@ QName portName = null; NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); portName = nepr.getEndpointName(); - + //From the JAXWS dispacth api, EPR's address MUST be used for invocations on the endpoint + if (getEndpointMetaData(portName) != null && nepr.getAddress() != null && nepr.getAddress().length() > 0) + { + getEndpointMetaData(portName).setEndpointAddress(nepr.getAddress()); + } Dispatch<T> dispatch = createDispatch(portName, type, mode); initAddressingProperties(dispatch, epr); initWebserviceFeatures(dispatch, this.features); Property changes on: stack/native/branches/jbossws-native-3.4.1.SP1/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT ___________________________________________________________________ Deleted: svn:mergeinfo -

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13892 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-14 02:48:11 -0400 (Mon, 14 Mar 2011) New Revision: 13892 Added: stack/native/branches/jbossws-native-3.4.1.SP1/ Log: Branching for 3.4.1.SP1

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13891 - stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-13 06:51:41 -0400 (Sun, 13 Mar 2011) New Revision: 13891 Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml Log: Synch org.jboss.as.webservices:main module with AS7 upstream master Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-13 10:45:10 UTC (rev 13890) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-13 10:51:41 UTC (rev 13891) @@ -41,6 +41,7 @@ <module name="org.jboss.as.managed-beans"/> <module name="org.jboss.as.server"/> <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> <module name="org.jboss.as.web"/> <module name="org.jboss.threads"/> <module name="org.jboss.modules"/>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13890 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-13 06:45:10 -0400 (Sun, 13 Mar 2011) New Revision: 13890 Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml Log: Synch org.jboss.as.webservices:main module with AS7 upstream master Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-13 10:45:10 UTC (rev 13890) @@ -39,6 +39,7 @@ <module name="org.jboss.as.managed-beans"/> <module name="org.jboss.as.server"/> <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> <module name="org.jboss.as.web"/> <module name="org.jboss.threads"/> <module name="org.jboss.modules"/>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13889 - in stack/cxf/branches/spring-as7/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/util and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-11 13:26:03 -0500 (Fri, 11 Mar 2011) New Revision: 13889 Added: stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/main/ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java Modified: stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java stack/cxf/branches/spring-as7/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java stack/cxf/branches/spring-as7/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/modules-deploy.conf stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java stack/cxf/branches/spring-as7/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/spring-as7/modules/testsuite/pom.xml Log: Adding deploy scripts for spring, temporarly adding dependency on spring module to some of the relevant jbossws/cxf modules, initial configuration of runtime CL for loading spring additional contexts Modified: stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java =================================================================== --- stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-03-11 18:26:03 UTC (rev 13889) @@ -21,17 +21,11 @@ */ package org.jboss.wsf.stack.cxf.client; -import java.io.IOException; -import java.io.InputStream; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; -import java.security.SecureClassLoader; -import java.util.ArrayList; -import java.util.Enumeration; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; import java.util.concurrent.Executor; import javax.xml.namespace.QName; @@ -48,6 +42,7 @@ import org.apache.cxf.jaxws.ServiceImpl; import org.jboss.logging.Logger; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory; +import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader; import org.w3c.dom.Element; /** @@ -410,112 +405,4 @@ } } - static final class DelegateClassLoader extends SecureClassLoader - { - private ClassLoader delegate; - - private ClassLoader parent; - - public DelegateClassLoader(final ClassLoader delegate, final ClassLoader parent) - { - super(parent); - this.delegate = delegate; - this.parent = parent; - } - - /** {@inheritDoc} */ - @Override - public Class<?> loadClass(final String className) throws ClassNotFoundException - { - if (parent != null) - { - try - { - return parent.loadClass(className); - } - catch (ClassNotFoundException cnfe) - { - //NOOP, use delegate - } - } - return delegate.loadClass(className); - } - - /** {@inheritDoc} */ - @Override - public URL getResource(final String name) - { - URL url = null; - if (parent != null) - { - url = parent.getResource(name); - } - return (url == null) ? delegate.getResource(name) : url; - } - - /** {@inheritDoc} */ - @Override - public Enumeration<URL> getResources(final String name) throws IOException - { - final ArrayList<Enumeration<URL>> foundResources = new ArrayList<Enumeration<URL>>(); - - foundResources.add(delegate.getResources(name)); - if (parent != null) - { - foundResources.add(parent.getResources(name)); - } - - return new Enumeration<URL>() - { - private int position = foundResources.size() - 1; - - public boolean hasMoreElements() - { - while (position >= 0) - { - if (foundResources.get(position).hasMoreElements()) - { - return true; - } - position--; - } - return false; - } - - public URL nextElement() - { - while (position >= 0) - { - try - { - return (foundResources.get(position)).nextElement(); - } - catch (NoSuchElementException e) - { - } - position--; - } - throw new NoSuchElementException(); - } - }; - } - - /** {@inheritDoc} */ - @Override - public InputStream getResourceAsStream(final String name) - { - URL foundResource = getResource(name); - if (foundResource != null) - { - try - { - return foundResource.openStream(); - } - catch (IOException e) - { - } - } - return null; - } - }; } Added: stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java =================================================================== --- stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java (rev 0) +++ stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java 2011-03-11 18:26:03 UTC (rev 13889) @@ -0,0 +1,145 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.wsf.stack.cxf.client.util; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.security.SecureClassLoader; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.NoSuchElementException; + +/** + * A delegate classloader + * + * @author alessio.soldano(a)jboss.com + * + */ +public class DelegateClassLoader extends SecureClassLoader +{ + private ClassLoader delegate; + + private ClassLoader parent; + + public DelegateClassLoader(final ClassLoader delegate, final ClassLoader parent) + { + super(parent); + this.delegate = delegate; + this.parent = parent; + } + + /** {@inheritDoc} */ + @Override + public Class<?> loadClass(final String className) throws ClassNotFoundException + { + if (parent != null) + { + try + { + return parent.loadClass(className); + } + catch (ClassNotFoundException cnfe) + { + //NOOP, use delegate + } + } + return delegate.loadClass(className); + } + + /** {@inheritDoc} */ + @Override + public URL getResource(final String name) + { + URL url = null; + if (parent != null) + { + url = parent.getResource(name); + } + return (url == null) ? delegate.getResource(name) : url; + } + + /** {@inheritDoc} */ + @Override + public Enumeration<URL> getResources(final String name) throws IOException + { + final ArrayList<Enumeration<URL>> foundResources = new ArrayList<Enumeration<URL>>(); + + foundResources.add(delegate.getResources(name)); + if (parent != null) + { + foundResources.add(parent.getResources(name)); + } + + return new Enumeration<URL>() + { + private int position = foundResources.size() - 1; + + public boolean hasMoreElements() + { + while (position >= 0) + { + if (foundResources.get(position).hasMoreElements()) + { + return true; + } + position--; + } + return false; + } + + public URL nextElement() + { + while (position >= 0) + { + try + { + return (foundResources.get(position)).nextElement(); + } + catch (NoSuchElementException e) + { + } + position--; + } + throw new NoSuchElementException(); + } + }; + } + + /** {@inheritDoc} */ + @Override + public InputStream getResourceAsStream(final String name) + { + URL foundResource = getResource(name); + if (foundResource != null) + { + try + { + return foundResource.openStream(); + } + catch (IOException e) + { + } + } + return null; + } +} \ No newline at end of file Modified: stack/cxf/branches/spring-as7/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java =================================================================== --- stack/cxf/branches/spring-as7/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java 2011-03-11 18:26:03 UTC (rev 13889) @@ -34,8 +34,8 @@ import junit.framework.TestCase; -import org.jboss.wsf.stack.cxf.client.ProviderImpl.DelegateClassLoader; import org.jboss.wsf.stack.cxf.client.ProviderImpl.DelegateEndpointImpl; +import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader; import org.w3c.dom.Element; /** Modified: stack/cxf/branches/spring-as7/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/dist/src/main/distro/build-deploy.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/dist/src/main/distro/build-deploy.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -124,7 +124,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss700" description="Deploy jbossws to jboss700"> + <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss700,check-spring,install-spring-module" description="Deploy jbossws to jboss700"> <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/> <copy todir="${jboss700.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> @@ -162,6 +162,13 @@ </antcall> </target> + <target name="install-spring-module" if="spring-required"> + <antcall target="deploy-spring-module" inheritall="false"> + <param name="installserver" value="${deploy.structure}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + </target> +    Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -42,5 +42,6 @@ <module name="org.apache.neethi" /> <module name="org.apache.ws.commons.xmlschema" /> <module name="wsdl4j.wsdl4j" /> + <module name="org.springframework.spring" optional="true"/> </dependencies> </module> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -52,5 +52,6 @@ <module name="org.jboss.ws.jaxws-client" services="import"/> <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="import"/> <module name="org.jboss.ws.spi" /> + <module name="org.springframework.spring" optional="true" /> </dependencies> </module> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -34,29 +34,33 @@ <module name="org.jboss.ws.jaxws-client" services="export" export="true"> <imports> <include path="META-INF/cxf"/> + <include path="META-INF"/> </imports> <exports> <include path="META-INF/cxf"/> + <include path="META-INF"/> </exports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" export="true"/> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true"> <imports> <include path="META-INF/cxf"/> + <include path="META-INF"/> </imports> <exports> <include path="META-INF/cxf"/> + <include path="META-INF"/> </exports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> <module name="org.apache.cxf" services="export" export="true"> <imports> <include path="META-INF/cxf"/> - <include path="META-INF/spring.*"/> + <include path="META-INF"/> </imports> <exports> <include path="META-INF/cxf"/> - <include path="META-INF/spring.*"/> + <include path="META-INF"/> </exports> </module> <module name="org.apache.xalan" services="export" export="true"/> @@ -64,5 +68,6 @@ <module name="org.jboss.as.webservices" services="export" export="true"/> <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> <module name="wsdl4j.wsdl4j" export="true"/> + <module name="org.springframework.spring" optional="true" export="true"/> </dependencies> </module> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -43,17 +43,18 @@ <module name="org.apache.cxf" services="import"> <imports> <include path="META-INF/cxf"/>  - <include path="META-INF/spring.*"/> + <include path="META-INF/"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/>  - <include path="META-INF/spring.*"/> + <include path="META-INF/"/> </imports> </module> <module name="org.jboss.common-core" /> <module name="org.jboss.logging" /> <module name="wsdl4j.wsdl4j" /> + <module name="org.springframework.spring" optional="true" /> </dependencies> </module> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -33,22 +33,24 @@ <module name="javax.xml.bind.api" /> <module name="com.sun.xml.bind" services="import"/> <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.api" /> <module name="org.jboss.ws.spi" /> <module name="org.jboss.ws.common" /> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> <module name="org.apache.cxf" services="import"> <imports> <include path="META-INF/cxf"/>  - <include path="META-INF/spring.*"/> + <include path="META-INF/"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/>  - <include path="META-INF/spring.*"/> + <include path="META-INF/"/> </imports> </module> <module name="org.apache.neethi" /> <module name="org.jboss.logging" /> + <module name="org.springframework.spring" optional="true" /> </dependencies> </module> Added: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml (rev 0) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.0" name="org.springframework.spring"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="org.apache.commons.logging" /> + </dependencies> +</module> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -391,6 +391,7 @@ <fileset dir="@{thirdpartydir}/modules"> <include name="**/module.xml"/> <exclude name="**/jboss/as/webservices/**/module.xml"/> + <exclude name="**/spring/**/module.xml"/> </fileset> </installModules> <copy toDir="@{targetdir}"> @@ -445,6 +446,25 @@   + <macrodef name="macro-install-spring-modules"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> +  + <copy todir="@{targetdir}/org/springframework/spring/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/spring-*.jar"/> + </fileset> + </copy> +  + <installModules targetDir="@{targetdir}"> + <fileset dir="@{thirdpartydir}/modules"> + <include name="**/spring/**/module.xml"/> + </fileset> + </installModules> + </sequential> + </macrodef> + <macrodef name="macro-install-spring"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -463,6 +483,12 @@ <macro-install-spring targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-spring-module"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + <macro-install-spring-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}"/> + </target> +    Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-03-11 18:26:03 UTC (rev 13889) @@ -1 +1 @@ -org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/** \ No newline at end of file +org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/**, org/springframework/spring/** \ No newline at end of file Added: stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java =================================================================== --- stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java (rev 0) +++ stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java 2011-03-11 18:26:03 UTC (rev 13889) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.wsf.stack.cxf.configuration; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 22-Feb-2011 + * + */ +class SecurityActions +{ + /** + * Get context classloader. + * + * @return the current context classloader + */ + static ClassLoader getContextClassLoader() + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + { + return Thread.currentThread().getContextClassLoader(); + } + else + { + return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { + public ClassLoader run() + { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + } + + /** + * Set context classloader. + * + * @param classLoader the classloader + */ + static void setContextClassLoader(final ClassLoader classLoader) + { + if (System.getSecurityManager() == null) + { + Thread.currentThread().setContextClassLoader(classLoader); + } + else + { + AccessController.doPrivileged(new PrivilegedAction<Object>() + { + public Object run() + { + Thread.currentThread().setContextClassLoader(classLoader); + return null; + } + }); + } + } + +} Modified: stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-11 18:26:03 UTC (rev 13889) @@ -159,7 +159,7 @@ GenericApplicationContext childCtx = new GenericApplicationContext(ctx); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); - reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver()); + reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver(SecurityActions.getContextClassLoader())); reader.loadBeanDefinitions(new InputStreamResource(is)); childCtx.refresh(); return childCtx; Modified: stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-03-11 18:26:03 UTC (rev 13889) @@ -36,6 +36,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.ResourceResolver; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory; +import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder; import org.jboss.wsf.stack.cxf.configuration.SpringBusHolder; @@ -63,8 +64,6 @@ BusFactory.setThreadDefaultBus(null); ArchiveDeployment aDep = (ArchiveDeployment) dep; - //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes - SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader()); ResourceResolver deploymentResolver = aDep.getResourceResolver(); org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver); @@ -74,6 +73,14 @@ if (jbosswsCxfXml != null) // Spring available { + //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes + ClassLoader loader = dep.getRuntimeClassLoader(); + if (true) //can't load jbossws/cxf classes + { + loader = new DelegateClassLoader(origClassLoader, loader); + } + SecurityActions.setContextClassLoader(loader); + URL cxfServletURL = null; try { @@ -98,6 +105,8 @@ else //Spring not available { + //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes + SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader()); DDBeans metadata = dep.getAttachment(DDBeans.class); holder = new NonSpringBusHolder(metadata); Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), @@ -114,6 +123,8 @@ } } + + @Override public void start(Deployment dep) { Modified: stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java =================================================================== --- stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java 2011-03-11 18:26:03 UTC (rev 13889) @@ -62,6 +62,7 @@ public NamespaceHandlerResolver(ClassLoader classLoader) { super(classLoader); + this.loader = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader()); } public NamespaceHandlerResolver(ClassLoader classLoader, String handlerMappingsLocation) Modified: stack/cxf/branches/spring-as7/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/testsuite/cxf-spring-tests/pom.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/testsuite/cxf-spring-tests/pom.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -29,6 +29,12 @@ <groupId>org.picketbox</groupId> <artifactId>picketbox-bare</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> Modified: stack/cxf/branches/spring-as7/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-11 18:21:09 UTC (rev 13888) +++ stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-11 18:26:03 UTC (rev 13889) @@ -869,6 +869,8 @@ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl*</exclude> </testExcludes> </configuration> <goals>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13888 - stack/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-11 13:21:09 -0500 (Fri, 11 Mar 2011) New Revision: 13888 Added: stack/cxf/branches/spring-as7/ Log: Branching for working on AS7 jbossws-cxf spring integration

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13887 - in stack/native/trunk/modules/testsuite: native-tests and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-03-11 08:02:05 -0500 (Fri, 11 Mar 2011) New Revision: 13887 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/trunk/modules/testsuite/pom.xml Log: removing JAXRPC test suite hacks Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2011-03-11 11:34:13 UTC (rev 13886) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2011-03-11 13:02:05 UTC (rev 13887) @@ -76,7 +76,6 @@ <property name="jboss.bind.address" value="${jboss.bind.address}" /> <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="jboss.home" value="${jboss.home}"/> - <property name="jaxrpc.enabled" value="${jaxrpc.enabled}"/> <ant antfile="scripts/antrun-wstools.xml" target="wstools" /> </tasks> </configuration> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-11 11:34:13 UTC (rev 13886) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-11 13:02:05 UTC (rev 13887) @@ -13,18 +13,13 @@  <target name="wstools" description="Generate the JAX-RPC artifacts."> - <condition property="generate.jaxrpc.artifacts" value="true"> - <and> - <equals arg1="${jaxrpc.enabled}" arg2="true"/> - </and> - </condition> <antcall target="generate-sources"/> <antcall target="compile-sources"/> <antcall target="copy-resources"/> </target>  - <target name="generate-sources" if="generate.jaxrpc.artifacts"> + <target name="generate-sources"> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath> @@ -53,8 +48,7 @@ </target> -  - <target name="compile-sources" if="generate.jaxrpc.artifacts"> + <target name="compile-sources"> <mkdir dir="${tests.output.dir}/wstools/java"/> <move todir="${tests.output.dir}/wstools/java"> @@ -80,8 +74,7 @@ </javac> </target> -  - <target name="copy-resources" if="generate.jaxrpc.artifacts"> + <target name="copy-resources"> <copy todir="${tests.output.dir}/test-resources"> <fileset dir="${tests.output.dir}/wstools/resources"> @@ -98,7 +91,6 @@ </copy> </target> -  <macrodef name="macro-wstools"> <attribute name="dest"/> <attribute name="config"/> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-03-11 11:34:13 UTC (rev 13886) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-11 13:02:05 UTC (rev 13887) @@ -406,7 +406,6 @@ <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs> - <jaxrpc.enabled>true</jaxrpc.enabled> </properties> <dependencies> <dependency> @@ -543,7 +542,6 @@ <jboss.version>6.0.1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss601</jbossws.integration.target> <endorsed.dirs>${jboss601.home}/lib/endorsed</endorsed.dirs> - <jaxrpc.enabled>true</jaxrpc.enabled> </properties> <dependencies> <dependency> @@ -661,7 +659,6 @@ <jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> - <jaxrpc.enabled>true</jaxrpc.enabled> </properties> <dependencies> <dependency>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13886 - in stack/native/trunk/modules: testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-03-11 06:34:13 -0500 (Fri, 11 Mar 2011) New Revision: 13886 Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml stack/native/trunk/modules/testsuite/pom.xml Log: enabling JAXRPC tools + fixing JAXRPC server side CP issue Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml 2011-03-11 08:46:58 UTC (rev 13885) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml 2011-03-11 11:34:13 UTC (rev 13886) @@ -30,7 +30,9 @@ <dependencies> <module name="javax.api"/> + <module name="org.apache.xerces" services="import"/> <module name="org.jboss.logging"/> <module name="org.jboss.common-core"/> </dependencies> + </module> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-03-11 08:46:58 UTC (rev 13885) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-11 11:34:13 UTC (rev 13886) @@ -661,7 +661,7 @@ <jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> - <jaxrpc.enabled>false</jaxrpc.enabled> + <jaxrpc.enabled>true</jaxrpc.enabled> </properties> <dependencies> <dependency> @@ -716,8 +716,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> -  - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> +  <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>  <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13885 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-03-11 03:46:58 -0500 (Fri, 11 Mar 2011) New Revision: 13885 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java Log: Separate ejb3 and pojo endpoints Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-10 14:46:37 UTC (rev 13884) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-11 08:46:58 UTC (rev 13885) @@ -92,8 +92,8 @@  <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.class"/> </fileset> </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3060/WEB-INF/web.xml"> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java 2011-03-11 08:46:58 UTC (rev 13885) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.jbws3060; + +import javax.ejb.Stateless; +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@Stateless +public class EndpointOneEJB3Impl +{ + private volatile static int count = 0; + + @WebMethod + public String echo(String input) + { + Logger.getLogger(this.getClass()).info("echo: " + input); + count++; + return input; + } + + @WebMethod + @Oneway + public void echoOneWay(String input) + { + Logger.getLogger(this.getClass()).info("echoOneWay: " + input); + count++; + } + + @WebMethod + public int getCount() + { + return count; + } +} Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2011-03-10 14:46:37 UTC (rev 13884) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2011-03-11 08:46:58 UTC (rev 13885) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3060; -import javax.ejb.Stateless; import javax.jws.Oneway; import javax.jws.WebMethod; import javax.jws.WebService; @@ -31,7 +30,6 @@ @WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne") @SOAPBinding(style = SOAPBinding.Style.RPC) -@Stateless public class EndpointOneImpl { private volatile static int count = 0; Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java 2011-03-11 08:46:58 UTC (rev 13885) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.jbws3060; + +import javax.ejb.Stateless; +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@Stateless +public class EndpointTwoEJB3Impl +{ + private volatile static int count = 0; + + @WebMethod + public String sayHello(String input) + { + Logger.getLogger(this.getClass()).info("sayHello: " + input); + count++; + return "Hi " + input; + } + + @WebMethod + @Oneway + public void sayHelloOneWay(String input) + { + Logger.getLogger(this.getClass()).info("sayHelloOneWay: " + input); + count++; + } + + @WebMethod + public int getCount() + { + return count; + } +} Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2011-03-10 14:46:37 UTC (rev 13884) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2011-03-11 08:46:58 UTC (rev 13885) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3060; -import javax.ejb.Stateless; import javax.jws.Oneway; import javax.jws.WebMethod; import javax.jws.WebService; @@ -31,7 +30,6 @@ @WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo") @SOAPBinding(style = SOAPBinding.Style.RPC) -@Stateless public class EndpointTwoImpl { private volatile static int count = 0;

13 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2011