JBossWS SVN: r9198 - in stack/native/trunk/modules/testsuite: native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 09:47:18 -0500 (Mon, 02 Feb 2009)
New Revision: 9198
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2433] enabling another JMS test
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml 2009-02-02 14:28:41 UTC (rev 9197)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml 2009-02-02 14:47:18 UTC (rev 9198)
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <!-- should be created automatically
<mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=RequestQueue">
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
</mbean>
- -->
<mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=ResponseQueue">
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
</mbean>
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-02 14:28:41 UTC (rev 9197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-02 14:47:18 UTC (rev 9198)
@@ -10,7 +10,6 @@
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
# [JBWS-2433] Investigate why MessageDriven EJB3 tests are failing
-org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
# [JBAS-5257] Cannot deploy through jax-ws endpoint API
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-02 14:28:41 UTC (rev 9197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-02 14:47:18 UTC (rev 9198)
@@ -10,7 +10,6 @@
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
# [JBWS-2433] Investigate why MessageDriven EJB3 tests are failing
-org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
# [JBWS-2217] Fix BPEL jaxrpc samples
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 14:28:41 UTC (rev 9197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 14:47:18 UTC (rev 9198)
@@ -10,7 +10,6 @@
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
# [JBWS-2433] Investigate why MessageDriven EJB3 tests are failing
-org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
# [JBWS-2217] Fix BPEL jaxrpc samples
15 years, 5 months
JBossWS SVN: r9197 - in stack/cxf/trunk/modules: client/src/main/resources/META-INF/services and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-02 09:28:41 -0500 (Mon, 02 Feb 2009)
New Revision: 9197
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderFactoryImpl.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
Log:
[JBWS-1774] CXF WSProvider, first cut
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderFactoryImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderFactoryImpl.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderFactoryImpl.java 2009-02-02 14:28:41 UTC (rev 9197)
@@ -0,0 +1,41 @@
+/*
+ * 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.wsf.stack.cxf.tools;
+
+import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.jboss.wsf.spi.tools.WSContractProviderFactory;
+
+/**
+ * A WSContractProviderFactory for the CXF stack
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-Feb-2009
+ */
+public class CXFProviderFactoryImpl implements WSContractProviderFactory
+{
+ public WSContractProvider createProvider(ClassLoader loader)
+ {
+ WSContractProvider metroProvider = new CXFProviderImpl();
+ metroProvider.setClassLoader(loader);
+ return metroProvider;
+ }
+}
Property changes on: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2009-02-02 14:28:41 UTC (rev 9197)
@@ -0,0 +1,221 @@
+/*
+ * 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.wsf.stack.cxf.tools;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.cxf.tools.java2ws.JavaToWS;
+import org.jboss.ws.tools.io.NullPrintStream;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+
+/**
+ * A WSContractProvider for the CXF stack
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-Feb-2009
+ */
+public class CXFProviderImpl extends WSContractProvider
+{
+ private ClassLoader loader;
+ private boolean generateWsdl = false;
+ private boolean generateSource = false;
+ private File outputDir = new File("output");
+ private File resourceDir = null;
+ private File sourceDir = null;
+ private PrintStream messageStream;
+
+ public CXFProviderImpl()
+ {
+ }
+
+ public void setGenerateWsdl(boolean generateWsdl)
+ {
+ this.generateWsdl = generateWsdl;
+ }
+
+ public void setGenerateSource(boolean generateSource)
+ {
+ this.generateSource = generateSource;
+ }
+
+ public void setOutputDirectory(File directory)
+ {
+ this.outputDir = directory;
+ }
+
+ public void setResourceDirectory(File directory)
+ {
+ this.resourceDir = directory;
+ }
+
+ public void setSourceDirectory(File directory)
+ {
+ this.sourceDir = directory;
+ }
+
+ public void setClassLoader(ClassLoader loader)
+ {
+ this.loader = loader;
+ }
+
+ public void setMessageStream(PrintStream messageStream)
+ {
+ this.messageStream = messageStream;
+ }
+
+ public void provide(String endpointClass)
+ {
+ try
+ {
+ provide(loader.loadClass(endpointClass));
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new IllegalArgumentException("Class not found: " + endpointClass);
+ }
+ }
+
+ public void provide(Class<?> endpointClass)
+ {
+ // Swap the context classloader
+ // The '--classpath' switch might provide an URLClassLoader
+ ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+
+ if (loader != null)
+ Thread.currentThread().setContextClassLoader(loader);
+
+ try
+ {
+ List<String> args = new ArrayList<String>();
+
+ // Use the output directory as the default
+ File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir;
+ File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir;
+
+ if (generateSource)
+ {
+
+ }
+
+ if (sourceDir != null)
+ {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+
+ args.add("-s");
+ args.add(sourceDir.getAbsolutePath());
+ }
+
+ if (!outputDir.exists() && !outputDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + outputDir.getName());
+
+ args.add("-classdir");
+ args.add(outputDir.getAbsolutePath());
+
+ if (resourceDir != null)
+ {
+ if (!resourceDir.exists() && !resourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + resourceDir.getName());
+ args.add("-d");
+ args.add(resourceDir.getAbsolutePath());
+ }
+
+ PrintStream stream = messageStream;
+ if (stream != null)
+ {
+ args.add("-verbose");
+ }
+ else
+ {
+ stream = NullPrintStream.getInstance();
+ }
+
+ if (generateWsdl)
+ {
+ args.add("-wsdl");
+ }
+
+ String cp = buildClasspathString(loader);
+ if (cp != null)
+ {
+ args.add("-cp");
+ args.add(cp);
+ }
+
+ args.add("-wrapperbean");
+
+ // the SEI
+ args.add(endpointClass.getCanonicalName());
+
+ JavaToWS j2w = new JavaToWS(args.toArray(new String[0]));
+ j2w.run();
+ }
+ catch (Throwable t)
+ {
+ if (messageStream != null)
+ {
+ messageStream.println("Failed to invoke JavaToWS");
+ t.printStackTrace(messageStream);
+ }
+ else
+ {
+ t.printStackTrace();
+ }
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
+ }
+
+ private String buildClasspathString(ClassLoader cl)
+ {
+ String cp = null;
+
+ if (cl instanceof URLClassLoader)
+ {
+ StringBuilder builder = new StringBuilder();
+ URLClassLoader urlLoader = (URLClassLoader)cl;
+ for (URL url : urlLoader.getURLs())
+ {
+ builder.append(url.getPath());
+ builder.append(File.pathSeparator);
+ }
+
+ if (cl.getParent() != null)
+ {
+ String parentPath = buildClasspathString(cl.getParent());
+ if (parentPath != null)
+ builder.append(parentPath);
+ }
+
+ cp = builder.toString();
+ }
+
+ return cp;
+ }
+}
Property changes on: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2009-02-02 14:28:41 UTC (rev 9197)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.cxf.tools.CXFProviderFactoryImpl
\ No newline at end of file
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-02-02 14:22:48 UTC (rev 9196)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-02-02 14:28:41 UTC (rev 9197)
@@ -48,11 +48,41 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar
rem stack specific libs
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-api.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-common-utilities.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-corba.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-xml.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-soap.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-core.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-databinding-jaxb.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-jaxws.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-simple.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-javascript.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-policy.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-rm.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-java2ws.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-common.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-collections.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
rem Execute the JVM
"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %*
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-02-02 14:22:48 UTC (rev 9196)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-02-02 14:28:41 UTC (rev 9197)
@@ -84,11 +84,41 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-ex.jar"
# stack specific dependencies
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-metro-client.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-cxf-client.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-api.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-common-utilities.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-corba.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-xml.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-soap.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-core.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-databinding-jaxb.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-frontend-jaxws.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-frontend-simple.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-javascript.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-management.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http-jetty.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-jms.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-addr.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-policy.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-rm.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-tools-java2ws.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-tools-common.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-collections.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-lang.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-beans.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-context.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-core.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wstx.jar"
###
# Execute the JVM
15 years, 5 months
JBossWS SVN: r9196 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-02 09:22:48 -0500 (Mon, 02 Feb 2009)
New Revision: 9196
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Log:
[JBWS-2506] Renaming CalculatorBean SEI without @XmlJavaTypeAdapter
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java 2009-02-02 14:22:35 UTC (rev 9195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java 2009-02-02 14:22:48 UTC (rev 9196)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.smoke.tools;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlList;
-
-@WebService(targetNamespace = "http://foo.bar.com/calculator", serviceName="CalculatorBeanService")
-public class CalculatorBeanMetro
-{
- @WebMethod
- public int add(int a, int b)
- {
- return a+b;
- }
-
- @WebMethod
- public int subtract(int a, int b)
- {
- return a-b;
- }
-
- @WebMethod
- public Set<Integer> getKeys(HashMap<Integer, String> map)
- {
- if (map != null)
- return map.keySet();
- else
- return null;
- }
-
- @WebMethod
- @XmlList
- public List<String> processList(@XmlList List<String> list)
- {
- return list;
- }
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java (from rev 9144, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java 2009-02-02 14:22:48 UTC (rev 9196)
@@ -0,0 +1,62 @@
+/*
+ * 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 java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlList;
+
+@WebService(targetNamespace = "http://foo.bar.com/calculator", serviceName="CalculatorBeanService")
+public class CalculatorBeanNoAdapter
+{
+ @WebMethod
+ public int add(int a, int b)
+ {
+ return a+b;
+ }
+
+ @WebMethod
+ public int subtract(int a, int b)
+ {
+ return a-b;
+ }
+
+ @WebMethod
+ public Set<Integer> getKeys(HashMap<Integer, String> map)
+ {
+ if (map != null)
+ return map.keySet();
+ else
+ return null;
+ }
+
+ @WebMethod
+ @XmlList
+ public List<String> processList(@XmlList List<String> list)
+ {
+ return list;
+ }
+}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2009-02-02 14:22:35 UTC (rev 9195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2009-02-02 14:22:48 UTC (rev 9196)
@@ -57,7 +57,7 @@
JBOSS_HOME = System.getProperty("jboss.home");
CLASSES_DIR = System.getProperty("test.classes.directory");
//JBWS-2479
- ENDPOINT_CLASS = isIntegrationMetro() ? "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBeanMetro" : "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean";
+ ENDPOINT_CLASS = isIntegrationNative() ? "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean" : "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBeanNoAdapter";
TEST_DIR = createResourceFile("..").getAbsolutePath();
origJavaHome = System.getProperty("java.home");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-02-02 14:22:35 UTC (rev 9195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-02-02 14:22:48 UTC (rev 9196)
@@ -285,6 +285,7 @@
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() ? CalculatorBeanMetro.class : CalculatorBean.class);
+ //JBWS-2506: different exception for CXF, same workaround
+ provider.provide(isIntegrationNative() ? CalculatorBean.class : CalculatorBeanNoAdapter.class);
}
}
15 years, 5 months
JBossWS SVN: r9195 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 09:22:35 -0500 (Mon, 02 Feb 2009)
New Revision: 9195
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
remove line
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 14:21:19 UTC (rev 9194)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 14:22:35 UTC (rev 9195)
@@ -12,7 +12,6 @@
# [JBWS-2433] Investigate why MessageDriven EJB3 tests are failing
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
-#org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
15 years, 5 months
JBossWS SVN: r9194 - in stack/native/trunk/modules/testsuite: native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 09:21:19 -0500 (Mon, 02 Feb 2009)
New Revision: 9194
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2433] fixing first test case
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml 2009-02-02 13:17:59 UTC (rev 9193)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml 2009-02-02 14:21:19 UTC (rev 9194)
@@ -7,8 +7,8 @@
<message-driven>
<ejb-name>OrganizationMDB</ejb-name>
<ejb-class>org.jboss.test.ws.jaxrpc.samples.jmstransport.OrganizationJMSEndpoint</ejb-class>
+ <transaction-type>Container</transaction-type>
<message-selector></message-selector>
- <transaction-type>Container</transaction-type>
<acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
<message-driven-destination>
<destination-type>javax.jms.Queue</destination-type>
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 13:17:59 UTC (rev 9193)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 14:21:19 UTC (rev 9194)
@@ -12,7 +12,7 @@
# [JBWS-2433] Investigate why MessageDriven EJB3 tests are failing
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+#org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
15 years, 5 months
JBossWS SVN: r9193 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 08:17:59 -0500 (Mon, 02 Feb 2009)
New Revision: 9193
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-1967] enabling tests
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-02 13:05:21 UTC (rev 9192)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-02 13:17:59 UTC (rev 9193)
@@ -13,8 +13,5 @@
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
-# [JBAS-5257] Cannot deploy through jax-ws endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 13:05:21 UTC (rev 9192)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-02 13:17:59 UTC (rev 9193)
@@ -14,8 +14,5 @@
org/jboss/test/ws/jaxws/samples/dar/**
org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-# [JBAS-5257] Cannot deploy through jax-ws endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
15 years, 5 months
JBossWS SVN: r9192 - in container/jboss50: branches/jboss50x and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 08:05:21 -0500 (Mon, 02 Feb 2009)
New Revision: 9192
Modified:
container/jboss50/branches/jboss501CR1/pom.xml
container/jboss50/branches/jboss50x/pom.xml
container/jboss50/trunk/pom.xml
Log:
sync
Modified: container/jboss50/branches/jboss501CR1/pom.xml
===================================================================
--- container/jboss50/branches/jboss501CR1/pom.xml 2009-02-02 12:58:14 UTC (rev 9191)
+++ container/jboss50/branches/jboss501CR1/pom.xml 2009-02-02 13:05:21 UTC (rev 9192)
@@ -32,10 +32,10 @@
http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma...
-->
<jboss.version>5.0.1-SNAPSHOT</jboss.version>
- <jboss.ejb3.version>1.0.0-Beta10</jboss.ejb3.version>
+ <jboss.ejb3.version>1.0.0</jboss.ejb3.version>
<jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
<jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
- <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.metadata.version>1.0.0.CR16</jboss.metadata.version>
<jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
<jboss.reflect.version>2.0.2.GA</jboss.reflect.version>
<jboss.security.version>2.0.2.SP3</jboss.security.version>
Modified: container/jboss50/branches/jboss50x/pom.xml
===================================================================
--- container/jboss50/branches/jboss50x/pom.xml 2009-02-02 12:58:14 UTC (rev 9191)
+++ container/jboss50/branches/jboss50x/pom.xml 2009-02-02 13:05:21 UTC (rev 9192)
@@ -31,10 +31,10 @@
http://repository.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-m...
-->
<jboss.version>5.0.0.GA</jboss.version>
- <jboss.ejb3.version>1.0.0-Beta10</jboss.ejb3.version>
+ <jboss.ejb3.version>1.0.0</jboss.ejb3.version>
<jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
<jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
- <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.metadata.version>1.0.0.CR16</jboss.metadata.version>
<jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
<jboss.reflect.version>2.0.2.GA</jboss.reflect.version>
<jboss.security.version>2.0.2.SP3</jboss.security.version>
Modified: container/jboss50/trunk/pom.xml
===================================================================
--- container/jboss50/trunk/pom.xml 2009-02-02 12:58:14 UTC (rev 9191)
+++ container/jboss50/trunk/pom.xml 2009-02-02 13:05:21 UTC (rev 9192)
@@ -32,10 +32,10 @@
http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma...
-->
<jboss.version>5.1.0-SNAPSHOT</jboss.version>
- <jboss.ejb3.version>1.0.0-Beta10</jboss.ejb3.version>
+ <jboss.ejb3.version>1.0.0</jboss.ejb3.version>
<jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
<jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
- <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.metadata.version>1.0.0.CR16</jboss.metadata.version>
<jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
<jboss.reflect.version>2.0.2.GA</jboss.reflect.version>
<jboss.security.version>2.0.2.SP3</jboss.security.version>
15 years, 5 months
JBossWS SVN: r9191 - container/jboss60/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 07:58:14 -0500 (Mon, 02 Feb 2009)
New Revision: 9191
Modified:
container/jboss60/trunk/pom.xml
Log:
sync with AS trunk
Modified: container/jboss60/trunk/pom.xml
===================================================================
--- container/jboss60/trunk/pom.xml 2009-02-02 12:53:10 UTC (rev 9190)
+++ container/jboss60/trunk/pom.xml 2009-02-02 12:58:14 UTC (rev 9191)
@@ -28,10 +28,10 @@
<jbossws.spi.version>1.1.0-SNAPSHOT</jbossws.spi.version>
<jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jboss.ejb3.version>1.0.0-Beta11</jboss.ejb3.version>
+ <jboss.ejb3.version>1.0.0</jboss.ejb3.version>
<jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
<jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
- <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.metadata.version>1.0.0.CR16</jboss.metadata.version>
<jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
<jboss.reflect.version>2.0.2.GA</jboss.reflect.version>
<jboss.security.version>2.0.2.SP3</jboss.security.version>
15 years, 5 months
JBossWS SVN: r9190 - container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 07:53:10 -0500 (Mon, 02 Feb 2009)
New Revision: 9190
Modified:
container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DeploymentAspectHttpServer.java
container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DynamicEndpointDeploymentAspect.java
Log:
[JBWS-1967][JBAS-6436] sync with AS codebase
Modified: container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DeploymentAspectHttpServer.java 2009-02-02 12:52:59 UTC (rev 9189)
+++ container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DeploymentAspectHttpServer.java 2009-02-02 12:53:10 UTC (rev 9190)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss60.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.Endpoint;
import javax.xml.ws.WebServiceException;
@@ -44,6 +47,8 @@
*/
public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
{
+ private Map<String,Deployment> deployments = new HashMap<String,Deployment>();
+
/** Start an instance of this HTTP server */
public void start()
{
@@ -61,6 +66,7 @@
/** Publish an JAXWS endpoint to the HTTP server */
public void publish(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
Class implClass = getImplementorClass(endpoint);
try
@@ -70,21 +76,20 @@
DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
// Create/Setup the deployment
- Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
- dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+ Deployment deployment = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ deployment.setRuntimeClassLoader(deployment.getInitialClassLoader());
// Create/Setup the service
- Service service = dep.getService();
- service.setContextRoot(context.getContextRoot());
+ Service service = deployment.getService();
+ service.setContextRoot(contextRoot);
// Create/Setup the endpoint
org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
service.addEndpoint(ep);
// Deploy using deployment aspects
- DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
- DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
- depManager.deploy(dep);
+ getDeploymentAspectManager().deploy(deployment);
+ deployments.put(contextRoot, deployment);
}
catch (RuntimeException rte)
{
@@ -99,8 +104,13 @@
/** Destroys an JAXWS endpoint on the HTTP server */
public void destroy(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
+
try
{
+ Deployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ getDeploymentAspectManager().undeploy(deployment);
}
catch (RuntimeException rte)
{
@@ -112,6 +122,14 @@
}
}
+ private DeploymentAspectManager getDeploymentAspectManager()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
+ DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
+ return depManager;
+ }
+
private Class getImplementorClass(Endpoint endpoint)
{
Object implementor = endpoint.getImplementor();
Modified: container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DynamicEndpointDeploymentAspect.java
===================================================================
--- container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 12:52:59 UTC (rev 9189)
+++ container/jboss60/trunk/src/main/java/org/jboss/wsf/container/jboss60/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 12:53:10 UTC (rev 9190)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss60.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.WebServiceException;
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
@@ -50,6 +53,8 @@
private DeploymentFactory factory = new DeploymentFactory();
private WebMetaDataModifier webMetaDataModifier;
private DeployerClient mainDeployer;
+
+ private Map<String,AbstractDeployment> deployments = new HashMap<String,AbstractDeployment>();
public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
{
@@ -67,16 +72,22 @@
if (jbwmd == null)
throw new WebServiceException("Cannot find web meta data");
+ ClassLoader epLoader = dep.getRuntimeClassLoader();
+
try
{
webMetaDataModifier.modifyMetaData(dep);
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = createSimpleDeployment("http://jaxws-endpoint-api" + contextRoot);
MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
mutableAttachments.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
- mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory());
+ mutableAttachments.addAttachment("org.jboss.web.explicitDocBase", "/", String.class);
+ mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory(epLoader));
mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
mainDeployer.deploy(deployment);
+
+ deployments.put(contextRoot, deployment);
}
catch (Exception ex)
{
@@ -88,8 +99,10 @@
{
try
{
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
- mainDeployer.undeploy(deployment);
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ mainDeployer.undeploy(deployment);
}
catch (Exception ex)
{
@@ -107,13 +120,21 @@
private static class ContextClassLoaderFactory implements ClassLoaderFactory
{
+ private ClassLoader classloader;
+
+ public ContextClassLoaderFactory(ClassLoader classloader)
+ {
+ this.classloader = classloader;
+ }
+
public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
{
- return Thread.currentThread().getContextClassLoader();
+ return classloader;
}
public void removeClassLoader(DeploymentUnit unit) throws Exception
{
+ classloader = null;
}
}
}
15 years, 5 months
JBossWS SVN: r9189 - in container/jboss50: branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-02 07:52:59 -0500 (Mon, 02 Feb 2009)
New Revision: 9189
Modified:
container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java
container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java
container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
Log:
[JBWS-1967][JBAS-6436] sync with AS codebase
Modified: container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java 2009-02-02 10:04:21 UTC (rev 9188)
+++ container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java 2009-02-02 12:52:59 UTC (rev 9189)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss50.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.Endpoint;
import javax.xml.ws.WebServiceException;
@@ -44,6 +47,8 @@
*/
public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
{
+ private Map<String,Deployment> deployments = new HashMap<String,Deployment>();
+
/** Start an instance of this HTTP server */
public void start()
{
@@ -61,6 +66,7 @@
/** Publish an JAXWS endpoint to the HTTP server */
public void publish(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
Class implClass = getImplementorClass(endpoint);
try
@@ -70,21 +76,20 @@
DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
// Create/Setup the deployment
- Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
- dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+ Deployment deployment = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ deployment.setRuntimeClassLoader(deployment.getInitialClassLoader());
// Create/Setup the service
- Service service = dep.getService();
- service.setContextRoot(context.getContextRoot());
+ Service service = deployment.getService();
+ service.setContextRoot(contextRoot);
// Create/Setup the endpoint
org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
service.addEndpoint(ep);
// Deploy using deployment aspects
- DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
- DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
- depManager.deploy(dep);
+ getDeploymentAspectManager().deploy(deployment);
+ deployments.put(contextRoot, deployment);
}
catch (RuntimeException rte)
{
@@ -99,8 +104,13 @@
/** Destroys an JAXWS endpoint on the HTTP server */
public void destroy(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
+
try
{
+ Deployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ getDeploymentAspectManager().undeploy(deployment);
}
catch (RuntimeException rte)
{
@@ -112,6 +122,14 @@
}
}
+ private DeploymentAspectManager getDeploymentAspectManager()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
+ DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
+ return depManager;
+ }
+
private Class getImplementorClass(Endpoint endpoint)
{
Object implementor = endpoint.getImplementor();
Modified: container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 10:04:21 UTC (rev 9188)
+++ container/jboss50/branches/jboss501CR1/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 12:52:59 UTC (rev 9189)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss50.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.WebServiceException;
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
@@ -50,6 +53,8 @@
private DeploymentFactory factory = new DeploymentFactory();
private WebMetaDataModifier webMetaDataModifier;
private DeployerClient mainDeployer;
+
+ private Map<String,AbstractDeployment> deployments = new HashMap<String,AbstractDeployment>();
public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
{
@@ -67,16 +72,22 @@
if (jbwmd == null)
throw new WebServiceException("Cannot find web meta data");
+ ClassLoader epLoader = dep.getRuntimeClassLoader();
+
try
{
webMetaDataModifier.modifyMetaData(dep);
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = createSimpleDeployment("http://jaxws-endpoint-api" + contextRoot);
MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
mutableAttachments.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
- mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory());
+ mutableAttachments.addAttachment("org.jboss.web.explicitDocBase", "/", String.class);
+ mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory(epLoader));
mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
mainDeployer.deploy(deployment);
+
+ deployments.put(contextRoot, deployment);
}
catch (Exception ex)
{
@@ -88,8 +99,10 @@
{
try
{
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
- mainDeployer.undeploy(deployment);
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ mainDeployer.undeploy(deployment);
}
catch (Exception ex)
{
@@ -107,13 +120,21 @@
private static class ContextClassLoaderFactory implements ClassLoaderFactory
{
+ private ClassLoader classloader;
+
+ public ContextClassLoaderFactory(ClassLoader classloader)
+ {
+ this.classloader = classloader;
+ }
+
public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
{
- return Thread.currentThread().getContextClassLoader();
+ return classloader;
}
public void removeClassLoader(DeploymentUnit unit) throws Exception
{
+ classloader = null;
}
}
}
Modified: container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java 2009-02-02 10:04:21 UTC (rev 9188)
+++ container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java 2009-02-02 12:52:59 UTC (rev 9189)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss50.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.Endpoint;
import javax.xml.ws.WebServiceException;
@@ -44,6 +47,8 @@
*/
public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
{
+ private Map<String,Deployment> deployments = new HashMap<String,Deployment>();
+
/** Start an instance of this HTTP server */
public void start()
{
@@ -61,6 +66,7 @@
/** Publish an JAXWS endpoint to the HTTP server */
public void publish(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
Class implClass = getImplementorClass(endpoint);
try
@@ -70,21 +76,20 @@
DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
// Create/Setup the deployment
- Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
- dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+ Deployment deployment = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ deployment.setRuntimeClassLoader(deployment.getInitialClassLoader());
// Create/Setup the service
- Service service = dep.getService();
- service.setContextRoot(context.getContextRoot());
+ Service service = deployment.getService();
+ service.setContextRoot(contextRoot);
// Create/Setup the endpoint
org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
service.addEndpoint(ep);
// Deploy using deployment aspects
- DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
- DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
- depManager.deploy(dep);
+ getDeploymentAspectManager().deploy(deployment);
+ deployments.put(contextRoot, deployment);
}
catch (RuntimeException rte)
{
@@ -99,8 +104,13 @@
/** Destroys an JAXWS endpoint on the HTTP server */
public void destroy(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
+
try
{
+ Deployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ getDeploymentAspectManager().undeploy(deployment);
}
catch (RuntimeException rte)
{
@@ -112,6 +122,14 @@
}
}
+ private DeploymentAspectManager getDeploymentAspectManager()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
+ DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
+ return depManager;
+ }
+
private Class getImplementorClass(Endpoint endpoint)
{
Object implementor = endpoint.getImplementor();
Modified: container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 10:04:21 UTC (rev 9188)
+++ container/jboss50/branches/jboss50x/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 12:52:59 UTC (rev 9189)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss50.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.WebServiceException;
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
@@ -50,6 +53,8 @@
private DeploymentFactory factory = new DeploymentFactory();
private WebMetaDataModifier webMetaDataModifier;
private DeployerClient mainDeployer;
+
+ private Map<String,AbstractDeployment> deployments = new HashMap<String,AbstractDeployment>();
public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
{
@@ -67,16 +72,22 @@
if (jbwmd == null)
throw new WebServiceException("Cannot find web meta data");
+ ClassLoader epLoader = dep.getRuntimeClassLoader();
+
try
{
webMetaDataModifier.modifyMetaData(dep);
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = createSimpleDeployment("http://jaxws-endpoint-api" + contextRoot);
MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
mutableAttachments.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
- mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory());
+ mutableAttachments.addAttachment("org.jboss.web.explicitDocBase", "/", String.class);
+ mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory(epLoader));
mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
mainDeployer.deploy(deployment);
+
+ deployments.put(contextRoot, deployment);
}
catch (Exception ex)
{
@@ -88,8 +99,10 @@
{
try
{
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
- mainDeployer.undeploy(deployment);
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ mainDeployer.undeploy(deployment);
}
catch (Exception ex)
{
@@ -107,13 +120,21 @@
private static class ContextClassLoaderFactory implements ClassLoaderFactory
{
+ private ClassLoader classloader;
+
+ public ContextClassLoaderFactory(ClassLoader classloader)
+ {
+ this.classloader = classloader;
+ }
+
public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
{
- return Thread.currentThread().getContextClassLoader();
+ return classloader;
}
public void removeClassLoader(DeploymentUnit unit) throws Exception
{
+ classloader = null;
}
}
}
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java 2009-02-02 10:04:21 UTC (rev 9188)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DeploymentAspectHttpServer.java 2009-02-02 12:52:59 UTC (rev 9189)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss50.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.Endpoint;
import javax.xml.ws.WebServiceException;
@@ -44,6 +47,8 @@
*/
public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
{
+ private Map<String,Deployment> deployments = new HashMap<String,Deployment>();
+
/** Start an instance of this HTTP server */
public void start()
{
@@ -61,6 +66,7 @@
/** Publish an JAXWS endpoint to the HTTP server */
public void publish(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
Class implClass = getImplementorClass(endpoint);
try
@@ -70,21 +76,20 @@
DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
// Create/Setup the deployment
- Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
- dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+ Deployment deployment = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ deployment.setRuntimeClassLoader(deployment.getInitialClassLoader());
// Create/Setup the service
- Service service = dep.getService();
- service.setContextRoot(context.getContextRoot());
+ Service service = deployment.getService();
+ service.setContextRoot(contextRoot);
// Create/Setup the endpoint
org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
service.addEndpoint(ep);
// Deploy using deployment aspects
- DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
- DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
- depManager.deploy(dep);
+ getDeploymentAspectManager().deploy(deployment);
+ deployments.put(contextRoot, deployment);
}
catch (RuntimeException rte)
{
@@ -99,8 +104,13 @@
/** Destroys an JAXWS endpoint on the HTTP server */
public void destroy(HttpContext context, Endpoint endpoint)
{
+ String contextRoot = context.getContextRoot();
+
try
{
+ Deployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ getDeploymentAspectManager().undeploy(deployment);
}
catch (RuntimeException rte)
{
@@ -112,6 +122,14 @@
}
}
+ private DeploymentAspectManager getDeploymentAspectManager()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
+ DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
+ return depManager;
+ }
+
private Class getImplementorClass(Endpoint endpoint)
{
Object implementor = endpoint.getImplementor();
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 10:04:21 UTC (rev 9188)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-02 12:52:59 UTC (rev 9189)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.container.jboss50.transport;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.ws.WebServiceException;
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
@@ -50,6 +53,8 @@
private DeploymentFactory factory = new DeploymentFactory();
private WebMetaDataModifier webMetaDataModifier;
private DeployerClient mainDeployer;
+
+ private Map<String,AbstractDeployment> deployments = new HashMap<String,AbstractDeployment>();
public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
{
@@ -67,16 +72,22 @@
if (jbwmd == null)
throw new WebServiceException("Cannot find web meta data");
+ ClassLoader epLoader = dep.getRuntimeClassLoader();
+
try
{
webMetaDataModifier.modifyMetaData(dep);
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = createSimpleDeployment("http://jaxws-endpoint-api" + contextRoot);
MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
mutableAttachments.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
- mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory());
+ mutableAttachments.addAttachment("org.jboss.web.explicitDocBase", "/", String.class);
+ mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory(epLoader));
mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
mainDeployer.deploy(deployment);
+
+ deployments.put(contextRoot, deployment);
}
catch (Exception ex)
{
@@ -88,8 +99,10 @@
{
try
{
- AbstractDeployment deployment = createSimpleDeployment(dep.getService().getContextRoot());
- mainDeployer.undeploy(deployment);
+ String contextRoot = dep.getService().getContextRoot();
+ AbstractDeployment deployment = deployments.remove(contextRoot);
+ if (deployment != null)
+ mainDeployer.undeploy(deployment);
}
catch (Exception ex)
{
@@ -107,13 +120,21 @@
private static class ContextClassLoaderFactory implements ClassLoaderFactory
{
+ private ClassLoader classloader;
+
+ public ContextClassLoaderFactory(ClassLoader classloader)
+ {
+ this.classloader = classloader;
+ }
+
public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
{
- return Thread.currentThread().getContextClassLoader();
+ return classloader;
}
public void removeClassLoader(DeploymentUnit unit) throws Exception
{
+ classloader = null;
}
}
}
15 years, 5 months