JBossWS SVN: r14125 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-16 21:57:59 -0400 (Sat, 16 Apr 2011)
New Revision: 14125
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/SecurityActions.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java
Log:
[JBWS-3239] Fix NettyHttpServerAdapter classloading
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java 2011-04-17 01:54:10 UTC (rev 14124)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java 2011-04-17 01:57:59 UTC (rev 14125)
@@ -41,6 +41,7 @@
import org.jboss.wsf.framework.deployment.URLPatternDeploymentAspect;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
@@ -59,16 +60,19 @@
final class NettyHttpServerAdapter implements HttpServer
{
- /** JBossWS SPI provider. */
- private static final SPIProvider SPI_PROVIDER = SPIProviderResolver.getInstance().getProvider();
-
/** Deployment model factory. */
- private static final DeploymentModelFactory DEPLOYMENT_FACTORY = NettyHttpServerAdapter.SPI_PROVIDER
- .getSPI(DeploymentModelFactory.class);
+ private static final DeploymentModelFactory DEPLOYMENT_FACTORY;
/** Request handler factory. */
private static final NettyRequestHandlerFactory<NettyRequestHandlerImpl> REQUEST_HANDLER_FACTORY = NettyRequestHandlerFactoryImpl
.getInstance();
+
+ static
+ {
+ final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ DEPLOYMENT_FACTORY = spiProvider.getSPI(DeploymentModelFactory.class, cl);
+ }
/**
* Constructor.
@@ -103,7 +107,18 @@
final DeploymentAspectManagerImpl daManager = new DeploymentAspectManagerImpl();
daManager.setDeploymentAspects(this.getDeploymentAspects());
- daManager.deploy(dep);
+ ClassLoader orig = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(ClassLoaderProvider.getDefaultProvider()
+ .getServerIntegrationClassLoader());
+ daManager.deploy(dep);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(orig);
+ }
+
epImpl.setDeployment(dep);
final NettyHttpServer server = NettyHttpServerFactory.getNettyHttpServer(epImpl.getPort(), NettyHttpServerAdapter.REQUEST_HANDLER_FACTORY);
@@ -127,7 +142,17 @@
final DeploymentAspectManagerImpl daManager = new DeploymentAspectManagerImpl();
daManager.setDeploymentAspects(this.getDeploymentAspects());
- daManager.undeploy(epImpl.getDeployment());
+ ClassLoader orig = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(ClassLoaderProvider.getDefaultProvider()
+ .getServerIntegrationClassLoader());
+ daManager.undeploy(epImpl.getDeployment());
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(orig);
+ }
}
/**
@@ -181,18 +206,27 @@
{
final List<DeploymentAspect> retVal = new LinkedList<DeploymentAspect>();
- // TODO: native stack can't use framework classes directly
- retVal.add(new NettyHandlerDeploymentAspect());
- retVal.add(new BackwardCompatibleContextRootDeploymentAspect());
- retVal.add(new URLPatternDeploymentAspect());
- retVal.add(new EndpointAddressDeploymentAspect());
- retVal.add(new EndpointNameDeploymentAspect());
- retVal.add(new UnifiedMetaDataDeploymentAspect());
- retVal.add(new ServiceEndpointInvokerDeploymentAspect());
- retVal.add(new PublishContractDeploymentAspect());
- retVal.add(new EagerInitializeDeploymentAspect());
- retVal.add(new EndpointRegistryDeploymentAspect());
- retVal.add(new EndpointLifecycleDeploymentAspect());
+ ClassLoader orig = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
+ // TODO: native stack can't use framework classes directly
+ retVal.add(new NettyHandlerDeploymentAspect());
+ retVal.add(new BackwardCompatibleContextRootDeploymentAspect());
+ retVal.add(new URLPatternDeploymentAspect());
+ retVal.add(new EndpointAddressDeploymentAspect());
+ retVal.add(new EndpointNameDeploymentAspect());
+ retVal.add(new UnifiedMetaDataDeploymentAspect());
+ retVal.add(new ServiceEndpointInvokerDeploymentAspect());
+ retVal.add(new PublishContractDeploymentAspect());
+ retVal.add(new EagerInitializeDeploymentAspect());
+ retVal.add(new EndpointRegistryDeploymentAspect());
+ retVal.add(new EndpointLifecycleDeploymentAspect());
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(orig);
+ }
return retVal;
}
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/SecurityActions.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/SecurityActions.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/SecurityActions.java 2011-04-17 01:57:59 UTC (rev 14125)
@@ -0,0 +1,82 @@
+/*
+ * 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.ws.core.jaxws.spi.http;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 17-Feb-2010
+ *
+ */
+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;
+ }
+ });
+ }
+ }
+
+}
13 years
- 1
- 0
JBossWS SVN: r14124 - common/trunk/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-16 21:54:10 -0400 (Sat, 16 Apr 2011)
New Revision: 14124
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
Log:
[JBWS-3242] Allow for looking up jbossws-entities.properties
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2011-04-15 13:03:51 UTC (rev 14123)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2011-04-17 01:54:10 UTC (rev 14124)
@@ -36,6 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -103,7 +104,10 @@
{
public Properties run()
{
- InputStream is = classLoader.getResourceAsStream(entitiesResource);
+ //use a delegate classloader: first try lookup using the provided classloader,
+ //otherwise use server integration classloader which has the default configuration
+ final ClassLoader intCl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ InputStream is = new DelegateClassLoader(intCl, classLoader).getResourceAsStream(entitiesResource);
// get stream
if (is == null)
throw new IllegalArgumentException("Resource " + entitiesResource + " not found");
13 years
- 1
- 0
JBossWS SVN: r14123 - common/tags/jbossws-common-2.0.0.Alpha7.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-15 09:03:51 -0400 (Fri, 15 Apr 2011)
New Revision: 14123
Modified:
common/tags/jbossws-common-2.0.0.Alpha7/pom.xml
Log:
Updating pom.xml
Modified: common/tags/jbossws-common-2.0.0.Alpha7/pom.xml
===================================================================
--- common/tags/jbossws-common-2.0.0.Alpha7/pom.xml 2011-04-15 12:59:39 UTC (rev 14122)
+++ common/tags/jbossws-common-2.0.0.Alpha7/pom.xml 2011-04-15 13:03:51 UTC (rev 14123)
@@ -9,25 +9,25 @@
<packaging>jar</packaging>
<description>JBossWS Common</description>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Alpha7</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.10.Alpha1</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags/jbossws-common...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-2....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-common-2.0.0...</url>
</scm>
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.0.0.Alpha3</jbossws.spi.version>
<ant.version>1.7.1</ant.version>
<getopt.version>1.0.13</getopt.version>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
13 years
- 1
- 0
JBossWS SVN: r14122 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-15 08:59:39 -0400 (Fri, 15 Apr 2011)
New Revision: 14122
Added:
common/tags/jbossws-common-2.0.0.Alpha7/
Log:
Tagging jbossws-common-2.0.0.Alpha7
13 years
- 1
- 0
JBossWS SVN: r14121 - common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-15 08:48:26 -0400 (Fri, 15 Apr 2011)
New Revision: 14121
Modified:
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
Log:
Make WSConsume and WSProvider cmd line tools final
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-15 09:36:48 UTC (rev 14120)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-15 12:48:26 UTC (rev 14121)
@@ -66,7 +66,7 @@
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
*/
-public class WSConsume
+public final class WSConsume
{
private static final ClassLoader MODULES_LOADER = SecurityActions.getModulesClassLoader();
private List<File> bindingFiles = new ArrayList<File>();
@@ -107,6 +107,12 @@
}
}
+ //hide constructor
+ private WSConsume()
+ {
+ //NOOP
+ }
+
private static void mainInternal(final String[] args)
{
WSConsume importer = new WSConsume();
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-15 09:36:48 UTC (rev 14120)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-15 12:48:26 UTC (rev 14121)
@@ -62,7 +62,7 @@
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
*/
-public class WSProvide
+public final class WSProvide
{
private static final ClassLoader MODULES_LOADER = SecurityActions.getModulesClassLoader();
private ClassLoader loader = MODULES_LOADER != null ? MODULES_LOADER : SecurityActions.getContextClassLoader();
@@ -85,6 +85,12 @@
System.exit(generate.generate(endpoint));
}
+ //hide constructor
+ private WSProvide()
+ {
+ //NOOP
+ }
+
private String parseArguments(String[] args)
{
String shortOpts = "hwko:r:s:c:qtle";
13 years
- 1
- 0
JBossWS SVN: r14120 - common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-15 05:36:48 -0400 (Fri, 15 Apr 2011)
New Revision: 14120
Modified:
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
Log:
[JBWS-3222] Minor refactoring
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-15 09:34:06 UTC (rev 14119)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-15 09:36:48 UTC (rev 14120)
@@ -68,7 +68,7 @@
*/
public class WSConsume
{
- private static final ClassLoader MODULES_LOADER;
+ private static final ClassLoader MODULES_LOADER = SecurityActions.getModulesClassLoader();
private List<File> bindingFiles = new ArrayList<File>();
private File outputDir = new File("output");
private boolean generateSource;
@@ -84,11 +84,6 @@
private File sourceDir;
private String target;
- static
- {
- MODULES_LOADER = SecurityActions.getModulesClassLoader();
- }
-
public static final String PROGRAM_NAME = SecurityActions.getSystemProperty("program.name", WSConsume.class.getName());
public static void main(String[] args)
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-15 09:34:06 UTC (rev 14119)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-15 09:36:48 UTC (rev 14120)
@@ -64,8 +64,8 @@
*/
public class WSProvide
{
- private static final ClassLoader DEFAULT_LOADER;
- private ClassLoader loader = DEFAULT_LOADER;
+ private static final ClassLoader MODULES_LOADER = SecurityActions.getModulesClassLoader();
+ private ClassLoader loader = MODULES_LOADER != null ? MODULES_LOADER : SecurityActions.getContextClassLoader();
private File outputDir = new File("output");
private boolean generateSource;
private boolean generateWsdl;
@@ -76,13 +76,6 @@
private File resourceDir;
private File sourceDir;
- static
- {
- final ClassLoader modulesLoader = SecurityActions.getModulesClassLoader();
- final ClassLoader contextLoader = SecurityActions.getContextClassLoader();
- DEFAULT_LOADER = modulesLoader != null ? modulesLoader : contextLoader;
- }
-
public static final String PROGRAM_NAME = SecurityActions.getSystemProperty("program.name", WSProvide.class.getSimpleName());
public static void main(String[] args)
13 years
- 1
- 0
JBossWS SVN: r14119 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl and 31 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-15 05:34:06 -0400 (Fri, 15 Apr 2011)
New Revision: 14119
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3222] resuscitating JBossWS command line tools for Native
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-04-15 09:34:06 UTC (rev 14119)
@@ -130,14 +130,20 @@
@Override
public void provide(String endpointClass)
{
+ final ClassLoader origLoader = SecurityActions.getContextClassLoader();
try
{
+ SecurityActions.setContextClassLoader(loader);
provide(loader.loadClass(endpointClass));
}
catch (ClassNotFoundException e)
{
throw new WSException("Class not found: " + endpointClass);
}
+ finally
+ {
+ SecurityActions.setContextClassLoader(origLoader);
+ }
}
@Override
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.tools.jaxws.impl;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * TCCL utility methods.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class SecurityActions
+{
+
+ private SecurityActions()
+ {
+ // forbidden instantiation
+ }
+
+ /**
+ * 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/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-04-15 09:34:06 UTC (rev 14119)
@@ -197,6 +197,7 @@
if (stream != null)
{
args.add("-verbose");
+ args.add("-Xdebug");
}
else
{
Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+<module xmlns="urn:jboss:module:1.0" name="com.sun.tools.javac">
+ <dependencies>
+ <module name="system" export="false">
+ <exports>
+ <include-set>
+ <path name="com/sun/tools/javac"/>
+ </include-set>
+ </exports>
+ </module>
+ </dependencies>
+</module>
Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="com.sun.tools.ws">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.jws.api"/>
+ <module name="javax.xml.stream.api"/>
+ <module name="javax.xml.ws.api"/>
+ <module name="com.sun.xml.bind" services="import"/>
+ <module name="com.sun.xml.ws"/>
+ <module name="com.sun.xml.ws.policy"/>
+ </dependencies>
+
+</module>
Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="com.sun.xml.stream.buffer">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.xml.stream.api"/>
+ <module name="org.jvnet.staxex"/>
+ </dependencies>
+
+</module>
Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="com.sun.xml.ws">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="com.sun.xml.stream.buffer"/>
+ <module name="javax.api"/>
+ <module name="javax.xml.stream.api"/>
+ <module name="javax.xml.ws.api"/>
+ </dependencies>
+
+</module>
Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="com.sun.xml.ws.policy">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ </dependencies>
+</module>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -28,8 +28,12 @@
</resources>
<dependencies>
+ <module name="javax.api"/>
+ <module name="javax.jws.api"/>
<module name="javax.wsdl4j.api" export="true"/>
+ <module name="javax.xml.ws.api"/>
<module name="com.sun.xml.bind" services="export" export="true"/>
+ <module name="com.sun.tools.javac"/>
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
<module name="org.jboss.ws.common" export="true"/>
@@ -38,9 +42,13 @@
<module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true">
<imports>
<include path="META-INF"/>
+ <include path="dtd"/>
+ <include path="schema"/>
</imports>
<exports>
<include path="META-INF"/>
+ <include path="dtd"/>
+ <include path="schema"/>
</exports>
</module>
<module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -29,6 +29,7 @@
</resources>
<dependencies>
+ <module name="gnu.getopt"/>
<module name="javax.api"/>
<module name="javax.annotation.api"/>
<module name="javax.ejb.api"/>
@@ -37,10 +38,12 @@
<module name="javax.wsdl4j.api" />
<module name="javax.xml.ws.api"/>
<module name="org.jboss.jaxbintros"/>
+ <module name="org.jboss.modules"/>
<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.log4j"/>
<module name="org.apache.xerces" services="import"/>
</dependencies>
</module>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -29,6 +29,7 @@
</resources>
<dependencies>
+ <module name="com.sun.tools.ws" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="com.sun.xml.fastinfoset"/>
<module name="javax.api" />
Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.tools.wsconsume">
+
+ <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/>
+
+ <dependencies>
+ <module name="org.jboss.ws.common"/>
+ </dependencies>
+
+</module>
Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.tools.wsprovide">
+
+ <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/>
+
+ <dependencies>
+ <module name="org.jboss.ws.common"/>
+ </dependencies>
+
+</module>
Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jvnet.staxex">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.xml.stream.api"/>
+ </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 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -329,11 +329,36 @@
<include name="**/xmlsec.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}/com/sun/xml/fastinfoset/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/FastInfoset.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/stax-ex.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/codehaus/jettison/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jettison.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 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -86,9 +86,9 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class" />
</classes>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+ </manifest>
</war>
<!-- jaxws-handlerlifecycle -->
@@ -143,6 +143,9 @@
<include name="org/jboss/test/ws/jaxws/jbws771/*.class" />
<exclude name="org/jboss/test/ws/jaxws/jbws771/*TestCase.class" />
</fileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+ </manifest>
</jar>
<!-- jaxws-jbws871 -->
@@ -230,6 +233,9 @@
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.class" />
</fileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+ </manifest>
</jar>
<!-- jaxws-jbws1909 -->
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-04-15 09:34:06 UTC (rev 14119)
@@ -47,6 +47,8 @@
public void testWSToolsFromCommandLine() throws Exception
{
+ if (!isTargetJBoss6()) return; // wstools.sh(.bat) not available since AS7
+
// use absolute path for the output to be re-usable
File dest = createResourceFile("wstools" + FS + "java");
dest.mkdirs();
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -772,7 +772,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
<!-- EJB3 Ann driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude> <!-- F Cannot find service endpoint target -->
<exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <!-- TODO: implement EJB security integration -->
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <!-- F Failed to determine resource binding value for BindingDescription -->
@@ -820,18 +819,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
- <!-- # [JBWS-3222] Script tests -->
- <exclude>org/jboss/test/ws/jaxws/jbws771/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2528/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2529/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2591/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2593/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2633/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2637/**</exclude>
- <exclude>org/jboss/test/ws/tools/scripts/ScriptTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
-
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
@@ -872,6 +859,11 @@
<exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase*</exclude>
+ <!-- # [JBWS-3271] -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase*</exclude>
+
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
</excludes>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-04-15 08:12:06 UTC (rev 14118)
+++ stack/native/trunk/pom.xml 2011-04-15 09:34:06 UTC (rev 14119)
@@ -533,6 +533,18 @@
</profile>
<!--
+ Name: jboss700
+ Descr: JBoss-7.0.0 specific options
+ -->
+ <profile>
+ <id>jboss700</id>
+ <properties>
+ <jbossws.integration.target>jboss700</jbossws.integration.target>
+ <jboss.home>${jboss700.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
13 years
- 1
- 0
JBossWS SVN: r14118 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-15 04:12:06 -0400 (Fri, 15 Apr 2011)
New Revision: 14118
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3222] enabling CXF command line tools tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-15 08:01:35 UTC (rev 14117)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-15 08:12:06 UTC (rev 14118)
@@ -978,14 +978,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
- <!-- # [JBWS-3222] Script tests -->
- <exclude>org/jboss/test/ws/jaxws/jbws2528/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2529/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2591/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2593/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
-
<!-- # [JBWS-3205] JDKLogManager not used -->
<exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
@@ -1007,16 +999,16 @@
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
-
+
<!-- # [JBWS-3248] Unable to lookup AuthenticationManager using JNDI -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase*</exclude>
-
+
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
+
<!-- @WebServiceRef not implemented yet on AS7 -->
<exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
13 years
- 1
- 0
JBossWS SVN: r14117 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-15 04:01:35 -0400 (Fri, 15 Apr 2011)
New Revision: 14117
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Restore tools functionalities now that AS7 is update (svn merge -r 14110:14109 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .)
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -41,6 +41,7 @@
<module name="javax.xml.stream.api" />
<module name="javax.xml.ws.api" />
<module name="org.apache.neethi" />
+ <module name="org.apache.velocity" />
<module name="org.apache.ws.commons.xmlschema" />
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -28,7 +28,10 @@
</resources>
<dependencies>
+ <module name="javax.api" export="true"/>
+ <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="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -29,6 +29,7 @@
</resources>
<dependencies>
+ <module name="gnu.getopt"/>
<module name="javax.api"/>
<module name="javax.annotation.api"/>
<module name="javax.ejb.api"/>
@@ -36,10 +37,12 @@
<module name="javax.servlet.api"/>
<module name="javax.wsdl4j.api" />
<module name="javax.xml.ws.api"/>
+ <module name="org.jboss.modules"/>
<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.log4j"/>
<module name="org.apache.xerces" services="import"/>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -49,6 +49,7 @@
<include path="META-INF/"/>
</imports>
</module>
+ <module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
<module name="org.springframework.spring" optional="true" />
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-14 18:54:10 UTC (rev 14109)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., 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.
- -->
-
-<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.tools.wsconsume">
-
- <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/>
-
- <dependencies>
- <module name="org.jboss.ws.common"/>
- </dependencies>
-
-</module>
Copied: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml (from rev 14109, stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml)
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.tools.wsconsume">
+
+ <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/>
+
+ <dependencies>
+ <module name="org.jboss.ws.common"/>
+ </dependencies>
+
+</module>
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-14 18:54:10 UTC (rev 14109)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., 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.
- -->
-
-<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.tools.wsprovide">
-
- <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/>
-
- <dependencies>
- <module name="org.jboss.ws.common"/>
- </dependencies>
-
-</module>
Copied: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml (from rev 14109, stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml)
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.tools.wsprovide">
+
+ <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/>
+
+ <dependencies>
+ <module name="org.jboss.ws.common"/>
+ </dependencies>
+
+</module>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-15 03:32:50 UTC (rev 14116)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-15 08:01:35 UTC (rev 14117)
@@ -978,6 +978,14 @@
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <!-- # [JBWS-3222] Script tests -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2528/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2591/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2593/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
+
<!-- # [JBWS-3205] JDKLogManager not used -->
<exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
13 years
- 1
- 0
JBossWS SVN: r14116 - framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-14 23:32:50 -0400 (Thu, 14 Apr 2011)
New Revision: 14116
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
Log:
[JBPAPP-6253] backport - implementing support for protocol in wsprovide
Property changes on: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools
___________________________________________________________________
Added: svn:mergeinfo
+ /framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools:11863
Added: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java (rev 0)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2011-04-15 03:32:50 UTC (rev 14116)
@@ -0,0 +1,337 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import org.jboss.ws.Constants;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class WSProviderPlugin extends JBossWSTest implements WSProviderPluginDelegate
+{
+ private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ // tools delegate
+ WSContractProvider provider;
+
+ // redirect tools message to System.out ?
+ boolean toogleMessageOut = Boolean.getBoolean(WSProviderTestCase.class.getName()+".verbose");
+
+ // relative to test execution
+ File outputDirectory;
+
+ public WSProviderPlugin()
+ {
+ // create a new consumer for every test case
+ provider = WSContractProvider.newInstance();
+ if(toogleMessageOut) provider.setMessageStream(System.out);
+
+ // shared output directory, relative to test execution
+ outputDirectory = createResourceFile(".." + FS + "wsprovide" + FS + "java");
+ }
+
+ private ClassLoader getArtefactClassLoader() throws Exception {
+ URLClassLoader loader = new URLClassLoader(
+ new URL[] { outputDirectory.toURL() },
+ Thread.currentThread().getContextClassLoader()
+ );
+
+ return loader;
+ }
+
+ /**
+ * Enables/Disables WSDL generation.
+ *
+ */
+ public void testGenerateWsdl() throws Exception
+ {
+ provider.setGenerateWsdl(true);
+ provide();
+
+ verifyWSDL(outputDirectory);
+ }
+
+ /**
+ * Enables/Disables WSDL generation.
+ *
+ */
+ public void testGenerateWsdlWithExtension() throws Exception
+ {
+ provider.setGenerateWsdl(true);
+ provider.setExtension(true);
+ File outputDir = new File(outputDirectory.getAbsolutePath() + "-soap12");
+ provide(outputDir);
+
+ verifyWSDL(outputDir, true);
+ }
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ */
+ public void testGenerateSource() throws Exception
+ {
+ provider.setGenerateSource(true);
+ provide();
+
+ verifyJavaSource(outputDirectory);
+
+ }
+
+ private void verifyJavaSource(File directory) throws Exception
+ {
+ File javaSource = new File(
+ directory.getAbsolutePath()+
+ FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS + "jaxws" + FS + "AddResponse.java"
+ );
+
+ assertTrue("Source not generated", javaSource.exists());
+
+ javaSource = new File(directory.getAbsolutePath() + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS
+ + "jaxws" + FS + "GetKeysResponse.java");
+ assertTrue("Source not generated", javaSource.exists());
+ String contents;
+ if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [JBWS-2507] Support generics in wrapper classes");
+ }
+ else
+ {
+ contents = readFile(javaSource);
+ //[JBWS-2477] check support for generics
+ assertTrue("Didn't found method \"public Set<Integer> getReturn()\"", contents.contains("public Set<Integer> getReturn()"));
+ }
+
+ javaSource = new File(directory.getAbsolutePath() + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS
+ + "jaxws" + FS + "ProcessListResponse.java");
+ assertTrue("Source not generated", javaSource.exists());
+ contents = readFile(javaSource);
+ assertTrue("@XmlList not found", contents.contains("@XmlList"));
+
+ }
+
+ private String readFile(File file) throws Exception
+ {
+ BufferedReader input = new BufferedReader(new FileReader(file));
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ String line = null;
+ while ((line = input.readLine()) != null)
+ {
+ sb.append(line);
+ sb.append(System.getProperty("line.separator"));
+ }
+ }
+ finally
+ {
+ input.close();
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Sets the main output directory.
+ * If the directory does not exist, it will be created.
+ */
+ public void testOutputDirectory() throws Exception
+ {
+ provide();
+ ClassLoader loader = getArtefactClassLoader();
+ Class<?> responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse");
+ XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class);
+ assertNotNull("@XmlRootElement missing from response wrapper", rootElement);
+ assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator");
+ responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.ProcessListResponse");
+ XmlList xmlList = (XmlList) responseWrapper.getDeclaredField("_return").getAnnotation(XmlList.class);
+ assertNotNull("@XmlList missing from response wrapper's _return field", xmlList);
+ if (!isIntegrationMetro())
+ {
+ responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.ProcessCustomResponse");
+ XmlJavaTypeAdapter xmlJavaTypeAdapter = (XmlJavaTypeAdapter) responseWrapper.getDeclaredField("_return").getAnnotation(XmlJavaTypeAdapter.class);
+ assertNotNull("@XmlJavaTypeAdapter missing from response wrapper's _return field", xmlJavaTypeAdapter);
+ assertEquals("org.jboss.test.ws.jaxws.smoke.tools.CustomAdapter", xmlJavaTypeAdapter.value().getName());
+ }
+ else
+ {
+ System.out.println("FIXME: [JBWS-2479] @XmlJavaTypeAdapter on SEI causes exception");
+ }
+ }
+
+ /**
+ * Sets the resource directory. This directory will contain any generated
+ * WSDL and XSD files. If the directory does not exist, it will be created.
+ * If not specified, the output directory will be used instead.
+ *
+ */
+ public void testResourceDirectory() throws Exception
+ {
+ File directory = createResourceFile("wsprovide" + FS + "resources");
+ provider.setResourceDirectory(directory);
+ provide();
+
+ verifyWSDL(outputDirectory);
+ }
+
+ private void verifyWSDL(File directory) throws Exception
+ {
+ this.verifyWSDL(directory, false);
+ }
+
+ private void verifyWSDL(File directory, boolean soap12) throws Exception
+ {
+ File wsdl = new File(
+ directory.getAbsolutePath()+
+ FS + "CalculatorBeanService.wsdl"
+ );
+
+ assertTrue("WSDL not generated", wsdl.exists());
+ Element root = DOMUtils.parse( new FileInputStream(wsdl));
+ Element serviceElement = DOMUtils.getFirstChildElement(root, "service");
+ assertEquals(serviceElement.getAttribute("name"), "CalculatorBeanService");
+ Element bindingElement = DOMUtils.getFirstChildElement(root, "binding");
+ Element soapBindingElement = DOMUtils.getFirstChildElement(bindingElement,"binding");
+ if (soap12)
+ {
+ assertEquals("http://schemas.xmlsoap.org/wsdl/soap12/", soapBindingElement.getNamespaceURI());
+ }
+ else
+ {
+ assertEquals("http://schemas.xmlsoap.org/wsdl/soap/", soapBindingElement.getNamespaceURI());
+ }
+ }
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ */
+ public void testSourceDirectory() throws Exception
+ {
+ File sourceDir = createResourceFile("wsprovide" + FS + "sources");
+ provider.setSourceDirectory(sourceDir);
+ provider.setGenerateSource(true);
+ provide();
+
+ verifyJavaSource(sourceDir);
+ }
+
+ /**
+ * Sets the ClassLoader used to discover types.
+ * This defaults to the one used in instantiation.
+ *
+ */
+ public void testClassLoader() throws Exception
+ {
+ // Work around the sure jre settings
+ String javaHome = System.getProperty("java.home");
+ String jdkHome = javaHome.substring(0, javaHome.indexOf(FS + "jre"));
+
+ String targetDir = createResourceFile("").getParent();
+ URLClassLoader loader = new URLClassLoader(
+ new URL[]
+ {
+ new URL("file:"+targetDir+FS+"test-libs" + FS + "jaxws-classloading-service.jar"),
+ new URL("file:"+targetDir+FS+"test-libs" + FS + "jaxws-classloading-types.jar"),
+ new URL("file:"+jdkHome+FS+"lib" + FS + "tools.jar")
+ },
+ getArtefactClassLoader()
+ );
+
+ provider.setClassLoader(loader);
+ provider.setGenerateWsdl(true);
+ provider.setOutputDirectory(outputDirectory);
+ provider.provide("org.jboss.test.ws.jaxws.smoke.tools.service.HelloWorld");
+
+ File wsdl = new File(outputDirectory.getAbsolutePath() + FS + "HelloWorldService.wsdl");
+
+ assertTrue("WSDL not generated", wsdl.exists());
+ Element root = DOMUtils.parse( new FileInputStream(wsdl));
+ Element serviceElement = DOMUtils.getFirstChildElement(root, "service");
+ assertEquals(serviceElement.getAttribute("name"), "HelloWorldService");
+ }
+
+ /**
+ * Sets the PrintStream to use for status feedback. The simplest example
+ * would be to use System.out.
+ *
+ */
+ public void testMessageStream() throws Exception
+ {
+
+ if(isIntegrationMetro())
+ {
+ System.out.println("FIXME: [JBWS-1777] WSProvide output is not correctly redirected");
+ return;
+ }
+ else if(isIntegrationCXF())
+ {
+ System.out.println("FIXME: [JBWS-2508] Tools output is not correctly redirected");
+ return;
+ }
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ PrintStream pout = new PrintStream(bout);
+
+ provider.setMessageStream(pout);
+ provide();
+
+ String messageOut = new String(bout.toByteArray());
+
+ System.out.println("-- Begin captured output --");
+ System.out.println(messageOut);
+ System.out.println("-- End captured output --");
+
+ assertTrue("Provider messages not correctly redirected",
+ messageOut.replace('\\', '/').indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1 );
+ }
+
+ private void provide() throws Exception
+ {
+ this.provide(outputDirectory);
+ }
+
+ private void provide(File outputDirectory)
+ {
+ provider.setOutputDirectory(outputDirectory);
+ //JBWS-2479: using different beans because the whole smoke tools test is supposed to be run for every stack
+ //and we can't afford excluding it for Metro just because of JBWS-2479
+ provider.provide(!isIntegrationMetro() ? CalculatorBean.class : CalculatorBeanNoAdapter.class);
+ }
+}
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2011-04-15 03:21:26 UTC (rev 14115)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2011-04-15 03:32:50 UTC (rev 14116)
@@ -80,6 +80,11 @@
verifyWSDL(outputDirectory);
}
+
+ public void testGenerateWsdlWithExtension() throws Exception
+ {
+ dispatch("testGenerateWsdlWithExtension");
+ }
/**
* Enables/Disables Java source generation.
13 years
- 1
- 0