JBossWS SVN: r14175 - common-tools/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:57:11 -0400 (Wed, 20 Apr 2011)
New Revision: 14175
Added:
common-tools/tags/jbossws-common-tools-1.0.0.Alpha1/
Log:
tagging JBossWS Common Tools 1.0.0.Alpha1
11 years, 11 months
- 1
- 0
JBossWS SVN: r14174 - common-tools/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:55:59 -0400 (Wed, 20 Apr 2011)
New Revision: 14174
Modified:
common-tools/trunk/pom.xml
Log:
prepare for tagging
Modified: common-tools/trunk/pom.xml
===================================================================
--- common-tools/trunk/pom.xml 2011-04-20 11:49:57 UTC (rev 14173)
+++ common-tools/trunk/pom.xml 2011-04-20 11:55:59 UTC (rev 14174)
@@ -9,22 +9,22 @@
<packaging>jar</packaging>
<description>JBossWS Common Tools</description>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha1</version>
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.10.Alpha1</version>
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/tools/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/tools/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/tools/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common-tools/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common-tools/tags/jbossws-com...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/common-tools/tags/jbossws-common...</url>
</scm>
<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>
<junit.version>3.8.2</junit.version>
11 years, 11 months
- 1
- 0
JBossWS SVN: r14173 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:49:57 -0400 (Wed, 20 Apr 2011)
New Revision: 14173
Modified:
common/trunk/pom.xml
Log:
prepare for next dev. cycle
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2011-04-20 11:49:35 UTC (rev 14172)
+++ common/trunk/pom.xml 2011-04-20 11:49:57 UTC (rev 14173)
@@ -9,25 +9,25 @@
<packaging>jar</packaging>
<description>JBossWS Common</description>
- <version>2.0.0.Alpha8</version>
+ <version>2.0.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10.Alpha1</version>
+ <version>1.0.10-SNAPSHOT</version>
</parent>
<!-- Source Control Management -->
<scm>
- <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>
+ <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>
</scm>
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.0.0.Alpha3</jbossws.spi.version>
+ <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
<jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
<jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
11 years, 11 months
- 1
- 0
JBossWS SVN: r14172 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:49:35 -0400 (Wed, 20 Apr 2011)
New Revision: 14172
Added:
common/tags/jbossws-common-2.0.0.Alpha8/
Log:
tagging JBossWS common 2.0.0.Alpha8
11 years, 11 months
- 1
- 0
JBossWS SVN: r14171 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:43:48 -0400 (Wed, 20 Apr 2011)
New Revision: 14171
Modified:
common/trunk/pom.xml
Log:
prepare for release
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2011-04-20 11:29:31 UTC (rev 14170)
+++ common/trunk/pom.xml 2011-04-20 11:43:48 UTC (rev 14171)
@@ -9,25 +9,25 @@
<packaging>jar</packaging>
<description>JBossWS Common</description>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Alpha8</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>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
<jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
<jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
11 years, 11 months
- 1
- 0
JBossWS SVN: r14170 - common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:29:31 -0400 (Wed, 20 Apr 2011)
New Revision: 14170
Modified:
common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/SecurityActions.java
common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java
common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java
Log:
[JBWS-3273][JBWS-3222] final JBossWS tools cleanup - removing ugly AS7 modules hack
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/SecurityActions.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/SecurityActions.java 2011-04-20 11:28:28 UTC (rev 14169)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/SecurityActions.java 2011-04-20 11:29:31 UTC (rev 14170)
@@ -82,41 +82,6 @@
}
}
- static ClassLoader getModulesClassLoader()
- {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null)
- {
- return getModulesClassLoaderInternal();
- }
- else
- {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
- public ClassLoader run()
- {
- return getModulesClassLoaderInternal();
- }
- });
- }
- }
-
- private static ClassLoader getModulesClassLoaderInternal()
- {
- // TODO: use SPI class loader facade, not reflection!
- try {
- Class<?> moduleClass = Class.forName("org.jboss.modules.Module");
- Class<?> moduleIdentifierClass = Class.forName("org.jboss.modules.ModuleIdentifier");
- Class<?> moduleLoaderClass = Class.forName("org.jboss.modules.ModuleLoader");
- Object moduleLoader = moduleClass.getMethod("getBootModuleLoader").invoke(null);
- Object moduleIdentifier = moduleIdentifierClass.getMethod("create", String.class).invoke(null, "org.jboss.as.webservices.server.integration");
- Object module = moduleLoaderClass.getMethod("loadModule", moduleIdentifierClass).invoke(moduleLoader, moduleIdentifier);
- return (ClassLoader)moduleClass.getMethod("getClassLoader").invoke(module);
- } catch (Exception e) {
- //ignore, JBoss Modules might not be available at all
- return null;
- }
- }
-
/**
* Load a class using the provided classloader
*
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2011-04-20 11:28:28 UTC (rev 14169)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2011-04-20 11:29:31 UTC (rev 14170)
@@ -66,7 +66,6 @@
*/
public class WSConsume
{
- private static final ClassLoader MODULES_LOADER = SecurityActions.getModulesClassLoader();
private List<File> bindingFiles = new ArrayList<File>();
private File outputDir = new File("output");
private boolean generateSource;
@@ -86,23 +85,16 @@
public static void main(String[] args)
{
- if (MODULES_LOADER != null)
- {
- final ClassLoader origLoader = SecurityActions.getContextClassLoader();
- try
- {
- SecurityActions.setContextClassLoader(MODULES_LOADER);
- mainInternal(args);
- }
- finally
- {
- SecurityActions.setContextClassLoader(origLoader);
- }
- }
- else
- {
- mainInternal(args);
- }
+ final ClassLoader origLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(WSConsume.class.getClassLoader());
+ mainInternal(args);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(origLoader);
+ }
}
private static void mainInternal(final String[] args)
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java 2011-04-20 11:28:28 UTC (rev 14169)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java 2011-04-20 11:29:31 UTC (rev 14170)
@@ -59,11 +59,11 @@
* </pre>
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public class WSProvide
{
- private static final ClassLoader MODULES_LOADER = SecurityActions.getModulesClassLoader();
- private ClassLoader loader = MODULES_LOADER != null ? MODULES_LOADER : SecurityActions.getContextClassLoader();
+ private ClassLoader loader = WSProvide.class.getClassLoader();
private File outputDir = new File("output");
private boolean generateSource;
private boolean generateWsdl;
11 years, 11 months
- 1
- 0
JBossWS SVN: r14169 - in stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss: ws/tools/common/main and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:28:28 -0400 (Wed, 20 Apr 2011)
New Revision: 14169
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/ws/tools/common/main/module.xml
Log:
[JBWS-3273][JBWS-3222] final JBossWS tools AS7 modules cleanup
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-20 11:28:09 UTC (rev 14168)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-20 11:28:28 UTC (rev 14169)
@@ -28,12 +28,12 @@
</resources>
<dependencies>
- <module name="javax.api"/>
- <module name="javax.jws.api"/>
+ <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"/>
+ <module name="javax.xml.ws.api" export="true"/>
<module name="com.sun.xml.bind" services="export" export="true"/>
- <module name="com.sun.tools.javac"/>
+ <module name="com.sun.tools.javac" export="true"/>
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
<module name="org.jboss.ws.common" export="true"/>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml 2011-04-20 11:28:09 UTC (rev 14168)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml 2011-04-20 11:28:28 UTC (rev 14169)
@@ -31,8 +31,13 @@
<dependencies>
<module name="gnu.getopt"/>
<module name="org.apache.log4j"/>
- <module name="org.jboss.modules"/>
- <module name="org.jboss.ws.api"/>
+ <module name="org.jboss.as.webservices.server.integration" services="import">
+ <imports>
+ <include path="META-INF"/>
+ <include path="dtd"/>
+ <include path="schema"/>
+ </imports>
+ </module>
</dependencies>
</module>
11 years, 11 months
- 1
- 0
JBossWS SVN: r14168 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:28:09 -0400 (Wed, 20 Apr 2011)
New Revision: 14168
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml
Log:
[JBWS-3273][JBWS-3222] final JBossWS tools AS7 modules cleanup
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml 2011-04-19 18:37:07 UTC (rev 14167)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml 2011-04-20 11:28:09 UTC (rev 14168)
@@ -31,8 +31,12 @@
<dependencies>
<module name="gnu.getopt"/>
<module name="org.apache.log4j"/>
- <module name="org.jboss.modules"/>
- <module name="org.jboss.ws.api"/>
+ <module name="org.jboss.as.webservices.server.integration" services="import">
+ <imports>
+ <include path="META-INF"/>
+ <include path="META-INF/cxf"/>
+ </imports>
+ </module>
</dependencies>
</module>
11 years, 11 months
- 1
- 0
JBossWS SVN: r14167 - in stack/cxf/branches/cxf24: modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-19 14:37:07 -0400 (Tue, 19 Apr 2011)
New Revision: 14167
Removed:
stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
Modified:
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java
stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/aegis.xsd
stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml
stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/tools-plugin.xml
stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java
stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java
stack/cxf/branches/cxf24/pom.xml
Log:
Initial changes - WIP
Modified: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -30,6 +30,7 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.http_jaxws_spi.HttpHandlerImpl;
import org.apache.cxf.transport.http_jaxws_spi.JAXWSHttpSpiDestination;
import org.jboss.ws.httpserver_httpspi.HttpExchangeDelegate;
@@ -58,9 +59,9 @@
private HttpServerEngine engine;
private URL url;
- public HttpServerDestination(Bus b, HttpServerTransportFactory factory, EndpointInfo ei) throws IOException
+ public HttpServerDestination(Bus b, DestinationRegistry registry, HttpServerTransportFactory factory, EndpointInfo ei) throws IOException
{
- super(b, ei);
+ super(b, registry, ei);
this.factory = factory;
this.serverEngineFactory = factory.getServerEngineFactory();
getAddressValue(ei, true); //generate address if not specified
@@ -73,12 +74,19 @@
return LOG;
}
- public void finalizeConfig() throws IOException
+ public void finalizeConfig()
{
engine = serverEngineFactory.retrieveHttpServerEngine(url.getPort());
if (engine == null)
{
- engine = serverEngineFactory.createHttpServerEngine(url.getHost(), url.getPort(), url.getProtocol());
+ try
+ {
+ engine = serverEngineFactory.createHttpServerEngine(url.getHost(), url.getPort(), url.getProtocol());
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
if (!url.getProtocol().equals(engine.getProtocol()))
{
Modified: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -32,7 +32,7 @@
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.http.AbstractHTTPTransportFactory;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
/**
* A Destination/Transport factory for the JDK6 httpserver
@@ -41,7 +41,7 @@
* @since 19-Aug-2010
*
*/
-public class HttpServerTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory
+public class HttpServerTransportFactory extends HTTPTransportFactory implements DestinationFactory
{
private Map<String, HttpServerDestination> destinations = new ConcurrentHashMap<String, HttpServerDestination>();
@@ -99,7 +99,7 @@
HttpServerDestination destination = addr == null ? null : destinations.get(addr);
if (destination == null)
{
- destination = new HttpServerDestination(getBus(), this, endpointInfo);
+ destination = new HttpServerDestination(getBus(), this.registry, this, endpointInfo);
destinations.put(endpointInfo.getAddress(), destination);
configure(destination);
destination.finalizeConfig();
Modified: stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -21,40 +21,40 @@
*/
package org.jboss.wsf.stack.cxf.client.configuration;
-import java.lang.ref.WeakReference;
-import java.util.Collection;
+//import java.lang.ref.WeakReference;
+//import java.util.Collection;
import java.util.HashMap;
-import java.util.LinkedList;
+//import java.util.LinkedList;
import java.util.Map;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
+//import javax.xml.bind.JAXBException;
+//import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.ws.addressing.Names;
-import org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder;
-import org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider;
-import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
-import org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl;
-import org.apache.cxf.ws.policy.PolicyBuilder;
-import org.apache.cxf.ws.policy.PolicyBuilderImpl;
-import org.apache.cxf.ws.policy.PolicyEngine;
-import org.apache.cxf.ws.policy.PolicyEngineImpl;
-import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry;
-import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl;
-import org.apache.cxf.ws.policy.PolicyProvider;
-import org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider;
-import org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry;
-import org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider;
-import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
-import org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder;
-import org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider;
-import org.apache.cxf.ws.rm.RMManager;
-import org.apache.cxf.ws.rm.policy.RMAssertionBuilder;
-import org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider;
+//import org.apache.cxf.ws.addressing.Names;
+//import org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder;
+//import org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider;
+//import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
+//import org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl;
+//import org.apache.cxf.ws.policy.PolicyBuilder;
+//import org.apache.cxf.ws.policy.PolicyBuilderImpl;
+//import org.apache.cxf.ws.policy.PolicyEngine;
+//import org.apache.cxf.ws.policy.PolicyEngineImpl;
+//import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry;
+//import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl;
+//import org.apache.cxf.ws.policy.PolicyProvider;
+//import org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider;
+//import org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry;
+//import org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider;
+//import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
+//import org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder;
+//import org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider;
+//import org.apache.cxf.ws.rm.RMManager;
+//import org.apache.cxf.ws.rm.policy.RMAssertionBuilder;
+//import org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider;
import org.jboss.wsf.stack.cxf.client.ProviderImpl;
/**
@@ -77,81 +77,86 @@
extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new BeanCustomizer()));
}
- preparePolicyEngine(extensions);
+// preparePolicyEngine(extensions);
//Explicitly ask for the ProviderImpl.class.getClassLoader() to be used for getting
//cxf bus extensions (as that classloader is the jaxws-client module one which 'sees' all
//extensions, unless different dependencies are explicitly set)
- Bus bus = new ExtensionManagerBus(extensions, properties, ProviderImpl.class.getClassLoader());
-
- initPolicyEngine((PolicyEngineImpl)extensions.get(PolicyEngine.class), bus);
+ ExtensionManagerBus bus = new ExtensionManagerBus(extensions, properties, ProviderImpl.class.getClassLoader());
possiblySetDefaultBus(bus);
initializeBus(bus);
+ bus.initialize();
return bus;
+
+// initPolicyEngine((PolicyEngineImpl)extensions.get(PolicyEngine.class), bus);
+//
+// possiblySetDefaultBus(bus);
+// initializeBus(bus);
+// return bus;
}
- @SuppressWarnings("rawtypes")
- private static void preparePolicyEngine(Map<Class, Object> extensions)
- {
- PolicyEngineImpl engine = new PolicyEngineImpl(true);
- extensions.put(PolicyEngine.class, engine);
- DomainExpressionBuilderRegistry domainExpBuilderRegistry = new DomainExpressionBuilderRegistry();
- extensions.put(DomainExpressionBuilderRegistry.class, domainExpBuilderRegistry);
- }
-
- private static void initPolicyEngine(PolicyEngineImpl engine, Bus bus)
- {
- engine.setBus(bus);
- AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(bus);
- PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(bus);
- PolicyBuilderImpl policyBuilder = new PolicyBuilderImpl();
- policyBuilder.setBus(bus);
- policyBuilder.setAssertionBuilderRegistry(assertionBuilderRegistry);
- bus.setExtension(policyBuilder, PolicyBuilder.class);
- Collection<PolicyProvider> policyProviders = engine.getPolicyProviders();
- Wsdl11AttachmentPolicyProvider wsdl11PolicyAttachmentProvider = new Wsdl11AttachmentPolicyProvider(bus);
- wsdl11PolicyAttachmentProvider.setBuilder(policyBuilder);
- wsdl11PolicyAttachmentProvider.setRegistry(engine.getRegistry());
- policyProviders.add(wsdl11PolicyAttachmentProvider);
- ServiceModelPolicyProvider serviceModelPolicyProvider = new ServiceModelPolicyProvider(bus);
- serviceModelPolicyProvider.setBuilder(policyBuilder);
- serviceModelPolicyProvider.setRegistry(engine.getRegistry());
- policyProviders.add(serviceModelPolicyProvider);
-
- //MTOM Policy
- assertionBuilderRegistry.register(new MTOMAssertionBuilder());
- policyInterceptorProviderRegistry.register(new MTOMPolicyInterceptorProvider());
-
- //RM
- RMManager rmManager = new RMManager();
- rmManager.init(bus);
-
- //RM Policy
- policyInterceptorProviderRegistry.register(new RMPolicyInterceptorProvider(bus));
- try
- {
- assertionBuilderRegistry.register(new RMAssertionBuilder());
- }
- catch (JAXBException e)
- {
- throw new RuntimeException(e);
- }
-
- //Addressing Policy
- policyInterceptorProviderRegistry.register(new AddressingPolicyInterceptorProvider());
- assertionBuilderRegistry.register(new AddressingAssertionBuilder(bus));
- Collection<QName> addressingKnownEls = new LinkedList<QName>();
- addressingKnownEls.add(new QName("http://schemas.xmlsoap.org/ws/2004/08/addressing/policy", Names.WSAW_USING_ADDRESSING_NAME));
- addressingKnownEls.add(new QName(Names.WSA_NAMESPACE_WSDL_NAME_OLD, Names.WSAW_USING_ADDRESSING_NAME));
- addressingKnownEls.add(Names.WSAW_USING_ADDRESSING_QNAME);
- PrimitiveAssertionBuilder primitiveAssertionBuilder = new PrimitiveAssertionBuilder(addressingKnownEls);
- primitiveAssertionBuilder.setBus(bus);
- assertionBuilderRegistry.register(primitiveAssertionBuilder);
- }
-
- @Override
- protected void initializeBus(Bus bus) {
- super.initializeBus(bus);
- }
+// @SuppressWarnings("rawtypes")
+// private static void preparePolicyEngine(Map<Class, Object> extensions)
+// {
+// PolicyEngineImpl engine = new PolicyEngineImpl(true);
+// extensions.put(PolicyEngine.class, engine);
+// DomainExpressionBuilderRegistry domainExpBuilderRegistry = new DomainExpressionBuilderRegistry();
+// extensions.put(DomainExpressionBuilderRegistry.class, domainExpBuilderRegistry);
+// }
+//
+// private static void initPolicyEngine(PolicyEngineImpl engine, Bus bus)
+// {
+// engine.setBus(bus);
+// AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(bus);
+// PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(bus);
+// PolicyBuilderImpl policyBuilder = new PolicyBuilderImpl();
+// policyBuilder.setBus(bus);
+// policyBuilder.setAssertionBuilderRegistry(assertionBuilderRegistry);
+// bus.setExtension(policyBuilder, PolicyBuilder.class);
+// Collection<PolicyProvider> policyProviders = engine.getPolicyProviders();
+// Wsdl11AttachmentPolicyProvider wsdl11PolicyAttachmentProvider = new Wsdl11AttachmentPolicyProvider(bus);
+// wsdl11PolicyAttachmentProvider.setBuilder(policyBuilder);
+// wsdl11PolicyAttachmentProvider.setRegistry(engine.getRegistry());
+// policyProviders.add(wsdl11PolicyAttachmentProvider);
+// ServiceModelPolicyProvider serviceModelPolicyProvider = new ServiceModelPolicyProvider(bus);
+// serviceModelPolicyProvider.setBuilder(policyBuilder);
+// serviceModelPolicyProvider.setRegistry(engine.getRegistry());
+// policyProviders.add(serviceModelPolicyProvider);
+//
+// //MTOM Policy
+// assertionBuilderRegistry.register(new MTOMAssertionBuilder());
+// policyInterceptorProviderRegistry.register(new MTOMPolicyInterceptorProvider());
+//
+// //RM
+// RMManager rmManager = new RMManager();
+// rmManager.init(bus);
+//
+// //RM Policy
+// policyInterceptorProviderRegistry.register(new RMPolicyInterceptorProvider(bus));
+// try
+// {
+// assertionBuilderRegistry.register(new RMAssertionBuilder());
+// }
+// catch (JAXBException e)
+// {
+// throw new RuntimeException(e);
+// }
+//
+// //Addressing Policy
+// policyInterceptorProviderRegistry.register(new AddressingPolicyInterceptorProvider());
+// assertionBuilderRegistry.register(new AddressingAssertionBuilder(bus));
+// Collection<QName> addressingKnownEls = new LinkedList<QName>();
+// addressingKnownEls.add(new QName("http://schemas.xmlsoap.org/ws/2004/08/addressing/policy", Names.WSAW_USING_ADDRESSING_NAME));
+// addressingKnownEls.add(new QName(Names.WSA_NAMESPACE_WSDL_NAME_OLD, Names.WSAW_USING_ADDRESSING_NAME));
+// addressingKnownEls.add(Names.WSAW_USING_ADDRESSING_QNAME);
+// PrimitiveAssertionBuilder primitiveAssertionBuilder = new PrimitiveAssertionBuilder(addressingKnownEls);
+// primitiveAssertionBuilder.setBus(bus);
+// assertionBuilderRegistry.register(primitiveAssertionBuilder);
+// }
+//
+// @Override
+// protected void initializeBus(Bus bus) {
+// super.initializeBus(bus);
+// }
}
Modified: stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -22,16 +22,16 @@
package org.jboss.wsf.stack.cxf.client.configuration;
import java.net.URL;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
-import org.apache.cxf.common.logging.LogUtils;
-import org.springframework.beans.BeansException;
+//import org.apache.cxf.common.logging.LogUtils;
+//import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
/**
@@ -44,7 +44,7 @@
*/
public class JBossWSSpringBusFactory extends SpringBusFactory
{
- private static final Logger LOG = LogUtils.getL7dLogger(JBossWSSpringBusFactory.class);
+// private static final Logger LOG = LogUtils.getL7dLogger(JBossWSSpringBusFactory.class);
public JBossWSSpringBusFactory()
{
@@ -59,75 +59,88 @@
@Override
public Bus createBus(String cfgFiles[], boolean includeDefaults)
{
- try
- {
- return finishCreatingBus(createApplicationContext(cfgFiles, includeDefaults));
- }
- catch (BeansException ex)
- {
- LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
- throw new RuntimeException(ex);
- }
+// try
+// {
+// return finishCreatingBus(createApplicationContext(cfgFiles, includeDefaults));
+// }
+// catch (BeansException ex)
+// {
+// LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
+// throw new RuntimeException(ex);
+// }
+ Bus bus = super.createBus(cfgFiles, includeDefaults);
+ finalizeBusCreation(bus);
+ return bus;
}
@Override
public Bus createBus(URL[] urls, boolean includeDefaults)
{
- try
- {
- return finishCreatingBus(new JBossWSBusApplicationContext(urls, includeDefaults, getApplicationContext()));
- }
- catch (BeansException ex)
- {
- LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
- throw new RuntimeException(ex);
- }
+// try
+// {
+// return finishCreatingBus(new JBossWSBusApplicationContext(urls, includeDefaults, getApplicationContext()));
+// }
+// catch (BeansException ex)
+// {
+// LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
+// throw new RuntimeException(ex);
+// }
+ Bus bus = super.createBus(urls, includeDefaults);
+ finalizeBusCreation(bus);
+ return bus;
}
-
- private Bus finishCreatingBus(BusApplicationContext bac)
+
+ private static void finalizeBusCreation(Bus bus)
{
- final Bus bus = (Bus) bac.getBean(Bus.DEFAULT_BUS_ID);
-
- bus.setExtension(bac, BusApplicationContext.class);
-
- possiblySetDefaultBus(bus);
-
- initializeBus(bus);
-
+ //TODO!! also set our custom configurer
+ BusApplicationContext bac = bus.getExtension(BusApplicationContext.class);
registerAppContextLifeCycleListener(bus, bac);
- return bus;
}
- private BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults)
- {
- try
- {
- return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext());
- }
- catch (BeansException ex)
- {
- LogUtils.log(LOG, Level.WARNING, "INITIAL_APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
- ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
- if (contextLoader != BusApplicationContext.class.getClassLoader())
- {
- Thread.currentThread().setContextClassLoader(BusApplicationContext.class.getClassLoader());
- try
- {
- return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext());
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(contextLoader);
- }
- }
- else
- {
- throw ex;
- }
- }
- }
+// private Bus finishCreatingBus(BusApplicationContext bac)
+// {
+// final Bus bus = (Bus) bac.getBean(Bus.DEFAULT_BUS_ID);
+//
+// bus.setExtension(bac, BusApplicationContext.class);
+//
+// possiblySetDefaultBus(bus);
+//
+// initializeBus(bus);
+//
+// registerAppContextLifeCycleListener(bus, bac);
+// return bus;
+// }
+//
+// private BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults)
+// {
+// try
+// {
+// return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext());
+// }
+// catch (BeansException ex)
+// {
+// LogUtils.log(LOG, Level.WARNING, "INITIAL_APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
+// ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+// if (contextLoader != BusApplicationContext.class.getClassLoader())
+// {
+// Thread.currentThread().setContextClassLoader(BusApplicationContext.class.getClassLoader());
+// try
+// {
+// return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext());
+// }
+// finally
+// {
+// Thread.currentThread().setContextClassLoader(contextLoader);
+// }
+// }
+// else
+// {
+// throw ex;
+// }
+// }
+// }
- void registerAppContextLifeCycleListener(final Bus bus, final BusApplicationContext bac)
+ static void registerAppContextLifeCycleListener(final Bus bus, final BusApplicationContext bac)
{
BusLifeCycleManager lm = bus.getExtension(BusLifeCycleManager.class);
if (null != lm)
Modified: stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/aegis.xsd
===================================================================
--- stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2011-04-19 18:37:07 UTC (rev 14167)
@@ -49,6 +49,7 @@
<xsd:element name="parameter" type="parameterType" />
</xsd:choice>
<xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="ignore" type="xsd:boolean" />
</xsd:complexType>
<xsd:complexType name="return-typeType">
@@ -72,7 +73,7 @@
<xsd:attribute name="typeName" type="xsd:string" />
<xsd:attribute name="mappedName" type="xsd:string" />
<xsd:attribute name="nillable" type="xsd:boolean" />
- <xsd:attribute name="flag" type="xsd:boolean" />
+ <xsd:attribute name="flat" type="xsd:boolean" />
<xsd:attribute name="ignore" type="xsd:boolean" />
<xsd:attribute name="componentType" type="xsd:string" />
<xsd:attribute name="keyType" type="xsd:string" />
Modified: stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml 2011-04-19 18:37:07 UTC (rev 14167)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,17 +16,13 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-<bean id='JaxwsServiceBuilderBean' class='org.apache.cxf.jaxws.JaxwsServiceBuilder' scope="prototype" />
-<bean id='SimpleServiceBuilderBean' class='org.apache.cxf.simple.SimpleServiceBuilder' scope="prototype" />
-
-<bean id='JaxbDatabindingBean' class="org.apache.cxf.jaxb.JAXBDataBinding" scope="prototype"/>
-<bean id='AegisDatabindingBean' class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype" />
-
-
-</beans>
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean id="JaxbDatabindingBean" class="org.apache.cxf.jaxb.JAXBDataBinding" scope="prototype" />
+ <bean id="XmlbeansDatabindingBean" class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" scope="prototype" />
+ <bean id="SdoDatabindingBean" class="org.apache.cxf.sdo.SDODataBinding" scope="prototype" />
+ <bean id="JaxwsServiceBuilderBean" class="org.apache.cxf.jaxws.JaxwsServiceBuilder" scope="prototype" />
+ <bean id="SimpleServiceBuilderBean" class="org.apache.cxf.simple.SimpleServiceBuilder" scope="prototype" />
+ <bean id="AegisDatabindingBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype" />
+</beans>
+
Deleted: stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2011-04-19 18:37:07 UTC (rev 14167)
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <!-- For Testing using the Swing commons processor, uncomment one of:
- <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
- <context:annotation-config/>
- -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
- <bean id="org.apache.cxf.bus.spring.BusApplicationListener" class="org.apache.cxf.bus.spring.BusApplicationListener"/>
- <bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor" class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/>
- <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
- <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
-
- <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
- <property name="resolvers">
- <list>
- <bean class="org.apache.cxf.resource.ClasspathResolver"/>
- <bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
- <!-- The following can be commented on AS 6 when not using Spring 3.0.3 or greater; see JBWS-3039 -->
- <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
- </list>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.configuration.Configurer" class="org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer">
- <property name="customizer">
- <bean class="org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer"/>
- </property>
- </bean>
-
- <bean id="org.apache.cxf.binding.BindingFactoryManager"
- class="org.apache.cxf.binding.BindingFactoryManagerImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.transport.DestinationFactoryManager"
- class="org.apache.cxf.transport.DestinationFactoryManagerImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.transport.ConduitInitiatorManager"
- class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.wsdl.WSDLManager"
- class="org.apache.cxf.wsdl11.WSDLManagerImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.phase.PhaseManager"
- class="org.apache.cxf.phase.PhaseManagerImpl"
- lazy-init="true"/>
-
- <bean id="org.apache.cxf.workqueue.WorkQueueManager"
- class="org.apache.cxf.workqueue.WorkQueueManagerImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager"
- class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.ServerRegistry"
- class="org.apache.cxf.endpoint.ServerRegistryImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager"
- class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"
- lazy-init="true"/>
- <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager"
- class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"
- lazy-init="true"/>
-
-
- <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry"
- class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry"
- class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
- <bean id="org.apache.cxf.headers.HeaderManager"
- class="org.apache.cxf.headers.HeaderManagerImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
- <bean id="org.apache.cxf.catalog.OASISCatalogManager"
- class="org.apache.cxf.catalog.OASISCatalogManager"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
- <bean id="org.apache.cxf.service.factory.FactoryBeanListenerManager"
- class="org.apache.cxf.service.factory.FactoryBeanListenerManager"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry"
- class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl"
- lazy-init="true">
- <constructor-arg ref="cxf"/>
- </bean>
-</beans>
Modified: stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/tools-plugin.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/tools-plugin.xml 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/client/src/main/resources/META-INF/tools-plugin.xml 2011-04-19 18:37:07 UTC (rev 14167)
@@ -32,7 +32,25 @@
<generator name="ServiceGenerator" />
</generators>
</frontend>
+ <frontend name="jaxws21" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
+ <container name="JAXWS21Container" toolspec="jaxws-toolspec.xml" />
+ <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor" />
+ <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11" />
+ <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
+ <generator name="AntGenerator" />
+ <generator name="ClientGenerator" />
+ <generator name="FaultGenerator" />
+ <generator name="ImplGenerator" />
+ <generator name="SEIGenerator" />
+ <generator name="ServerGenerator" />
+ <generator name="JAXWS21ServiceGenerator" />
+ </generators>
+ </frontend>
<databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding" />
<databinding name="xmlbeans" package="org.apache.cxf.xmlbeans.tools" profile="XMLBeansToolingDataBinding" />
+ <databinding name="jibx" package="org.apache.cxf.jibx.tools" profile="JibxToolingDataBinding" />
+ <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
+ <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
+ <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
</plugin>
Modified: stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-19 18:37:07 UTC (rev 14167)
@@ -61,7 +61,8 @@
<include>org.jboss.ws:jbossws-spi:jar</include>
<include>org.apache.neethi:neethi:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
- <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
+ <!-- <include>org.apache.ws.commons.schema:XmlSchema:jar</include> -->
+ <include>org.apache.ws.xmlschema:xmlschema-core:jar</include>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
<include>org.apache.santuario:xmlsec:jar</include>
Modified: stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-19 18:37:07 UTC (rev 14167)
@@ -49,7 +49,7 @@
<include name="**/wsdl4j.jar"/>
<include name="**/wss4j.jar"/>
<include name="**/wstx.jar"/>
- <include name="**/XmlSchema.jar"/>
+ <include name="**/xmlschema-core.jar"/>
<include name="**/FastInfoset.jar"/>
<include name="**/wstx.jar"/>
</patternset>
@@ -81,7 +81,7 @@
<include name="**/jbossws-spi.jar"/>
<include name="**/jdom.jar"/>
<include name="**/neethi.jar"/>
- <include name="**/XmlSchema.jar"/>
+ <include name="**/xmlschema-core.jar"/>
<include name="**/xmlsec.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/wss4j.jar"/>
@@ -384,7 +384,7 @@
</copy>
<copy todir="@{targetdir}/org/apache/ws/commons/xmlschema/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
- <include name="**/XmlSchema.jar"/>
+ <include name="**/xmlschema-core.jar"/>
</fileset>
</copy>
<copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -29,12 +29,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.resource.ResourceManager;
-import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
+import org.apache.cxf.transport.servlet.AbstractHTTPServlet;
+//import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
-import org.apache.cxf.transport.servlet.ServletController;
-import org.apache.cxf.transport.servlet.ServletTransportFactory;
+//import org.apache.cxf.transport.servlet.ServletController;
+//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
@@ -47,19 +49,24 @@
* @since 16-Jun-2010
*
*/
-public class CXFNonSpringServletExt extends CXFNonSpringServlet implements ServletDelegate
+public class CXFNonSpringServletExt extends AbstractHTTPServlet implements ServletDelegate
{
protected Endpoint endpoint;
+ protected Bus bus;
+// private ServletController createServletController(ServletConfig servletConfig)
+// {
+// ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
+// return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
+// }
+
@Override
- public ServletController createServletController(ServletConfig servletConfig)
- {
- ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
- return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
+ public void init(ServletConfig sc) throws ServletException {
+ super.init(sc);
+ loadBus(sc);
}
- @Override
- public void loadBus(ServletConfig servletConfig) throws ServletException
+ protected void loadBus(ServletConfig servletConfig) throws ServletException
{
//Init the Endpoint
endpoint = ServletHelper.initEndpoint(servletConfig, getServletName());
@@ -69,7 +76,6 @@
//register the InstrumentManagementImpl
ServletHelper.registerInstrumentManger(bus, getServletContext());
-
}
private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
@@ -81,17 +87,17 @@
//update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet
ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext()));
- replaceDestinationFactory();
- //set up the ServletController as the CXF servlet would have done
- controller = createServletController(servletConfig);
- //set the controller in the servlet context now that the bus has been configured in the servlet
- servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController());
+ //TODO!!! replaceDestinationFactory();
+// //set up the ServletController as the CXF servlet would have done
+// controller = createServletController(servletConfig);
+// //set the controller in the servlet context now that the bus has been configured in the servlet
+// servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController());
}
@Override
protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
{
- ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint);
+ ServletHelper.callRequestHandler(req, res, getServletContext(), bus, endpoint);
}
@Override
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -21,24 +21,24 @@
*/
package org.jboss.wsf.stack.cxf;
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.resource.ResourceManager;
-import org.apache.cxf.transport.servlet.CXFServlet;
-import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
-import org.apache.cxf.transport.servlet.ServletController;
-import org.apache.cxf.transport.servlet.ServletTransportFactory;
-import org.jboss.wsf.spi.deployment.Endpoint;
+//import java.io.IOException;
+//
+//import javax.servlet.ServletConfig;
+//import javax.servlet.ServletContext;
+//import javax.servlet.ServletException;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//import org.apache.cxf.BusFactory;
+//import org.apache.cxf.resource.ResourceManager;
+//import org.apache.cxf.transport.servlet.CXFServlet;
+//import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
+//import org.apache.cxf.transport.servlet.ServletController;
+//import org.apache.cxf.transport.servlet.ServletTransportFactory;
+//import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
-import org.jboss.wsf.stack.cxf.configuration.BusHolder;
-import org.jboss.wsf.stack.cxf.transport.ServletHelper;
+//import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+//import org.jboss.wsf.stack.cxf.transport.ServletHelper;
/**
* An extension to the CXF servlet
@@ -48,97 +48,97 @@
*
* @since 21-Apr-2007
*/
-public class CXFServletExt extends CXFServlet implements ServletDelegate
+//public class CXFServletExt extends CXFServlet implements ServletDelegate
+public class CXFServletExt extends CXFNonSpringServletExt implements ServletDelegate
{
- protected Endpoint endpoint;
-
- @Override
- public ServletController createServletController(ServletConfig servletConfig)
- {
- ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
- return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
- }
-
- @Override
- public void loadBus(ServletConfig servletConfig) throws ServletException
- {
- //Init the Endpoint
- endpoint = ServletHelper.initEndpoint(servletConfig, getServletName());
-
- //keep the bus created during deployment and update it with the information coming from the servlet config
- updateAvailableBusWithServletInfo(servletConfig);
-
- //register the InstrumentManagementImpl
- ServletHelper.registerInstrumentManger(bus, getServletContext());
- }
-
- private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
- {
- BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class);
- //set the bus from deployment into the CXF servlet and assign it to the current thread (do not touch the default bus!)
- bus = holder.getBus();
- BusFactory.setThreadDefaultBus(bus);
- //update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet
- ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
- resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext()));
- replaceDestinationFactory();
- //set up the ServletController as the CXF servlet would have done
- controller = createServletController(servletConfig);
- //set the controller in the servlet context now that the bus has been configured in the servlet
- servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController());
- }
-
- @Override
- protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
- {
- ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint);
- }
-
- @Override
- public void destroy()
- {
- ServletHelper.callPreDestroy(endpoint);
- }
-
- @Override
- public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doHead(request, response);
- }
-
- @Override
- public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doGet(request, response);
- }
-
- @Override
- public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doPost(request, response);
- }
-
- @Override
- public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doPut(request, response);
- }
-
- @Override
- public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doDelete(request, response);
- }
-
- @Override
- public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.service(request, response);
- }
+// protected Endpoint endpoint;
+//
+// private ServletController createServletController(ServletConfig servletConfig)
+// {
+// ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
+// return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
+// }
+//
+// @Override
+// public void loadBus(ServletConfig servletConfig) throws ServletException
+// {
+// //Init the Endpoint
+// endpoint = ServletHelper.initEndpoint(servletConfig, getServletName());
+//
+// //keep the bus created during deployment and update it with the information coming from the servlet config
+// updateAvailableBusWithServletInfo(servletConfig);
+//
+// //register the InstrumentManagementImpl
+// ServletHelper.registerInstrumentManger(bus, getServletContext());
+// }
+//
+// private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
+// {
+// BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class);
+// //set the bus from deployment into the CXF servlet and assign it to the current thread (do not touch the default bus!)
+// bus = holder.getBus();
+// BusFactory.setThreadDefaultBus(bus);
+// //update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet
+// ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
+// resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext()));
+// replaceDestinationFactory();
+// //set up the ServletController as the CXF servlet would have done
+// controller = createServletController(servletConfig);
+// //set the controller in the servlet context now that the bus has been configured in the servlet
+// servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController());
+// }
+//
+// @Override
+// protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
+// {
+// ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint);
+// }
+//
+// @Override
+// public void destroy()
+// {
+// ServletHelper.callPreDestroy(endpoint);
+// }
+//
+// @Override
+// public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+// throws ServletException, IOException
+// {
+// this.doHead(request, response);
+// }
+//
+// @Override
+// public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+// throws ServletException, IOException
+// {
+// this.doGet(request, response);
+// }
+//
+// @Override
+// public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+// throws ServletException, IOException
+// {
+// this.doPost(request, response);
+// }
+//
+// @Override
+// public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+// throws ServletException, IOException
+// {
+// this.doPut(request, response);
+// }
+//
+// @Override
+// public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+// throws ServletException, IOException
+// {
+// this.doDelete(request, response);
+// }
+//
+// @Override
+// public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+// throws ServletException, IOException
+// {
+// this.service(request, response);
+// }
}
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -24,17 +24,41 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.cxf.transport.servlet.ServletController;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusException;
+//import org.apache.cxf.BusFactory;
+import org.apache.cxf.service.model.EndpointInfo;
+//import org.apache.cxf.transport.Destination;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.apache.cxf.transport.http.DestinationRegistry;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
+//import org.apache.cxf.transport.http.HttpDestinationFactory;
+//import org.apache.cxf.transport.servlet.ServletController;
+//import org.apache.cxf.transport.servlet.ServletDestination;
+import org.apache.cxf.transports.http.QueryHandler;
+import org.apache.cxf.transports.http.QueryHandlerRegistry;
import org.jboss.util.NotImplementedException;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.stack.cxf.configuration.BusHolder;
/**
* A request handler
@@ -44,17 +68,48 @@
*/
public class RequestHandlerImpl implements RequestHandler
{
+ private ServerConfig serverConfig;
+
RequestHandlerImpl()
{
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
}
public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
{
- ServletControllerExt controller = (ServletControllerExt)context.getAttribute(ServletController.class.getName());
- if (controller == null)
- throw new IllegalStateException("Cannot obtain servlet controller");
-
- controller.invoke(req, res, ep);
+// ServletControllerExt controller = (ServletControllerExt)context.getAttribute(ServletController.class.getName());
+// if (controller == null)
+// throw new IllegalStateException("Cannot obtain servlet controller");
+//
+// controller.invoke(req, res, ep);
+
+ Bus bus = ep.getService().getDeployment().getAttachment(BusHolder.class).getBus();
+ AbstractHTTPDestination dest = findDestination(req, bus);
+
+ boolean requestHandled = handleQuery(req, res, dest, bus);
+ if (false == requestHandled)
+ {
+ Long beginTime = initRequestMetrics(ep);
+ HttpServletResponseExt response = new HttpServletResponseExt(res);
+ try
+ {
+ ServletConfig cfg = (ServletConfig)context.getAttribute(ServletConfig.class.getName());
+ dest.invoke(cfg, context, req, response);
+ }
+ catch (IOException e)
+ {
+ throw new ServletException(e);
+ }
+ if (response.getStatus() < 500)
+ {
+ processResponseMetrics(ep, beginTime);
+ }
+ else
+ {
+ processFaultMetrics(ep, beginTime);
+ }
+ }
}
public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
@@ -66,4 +121,142 @@
{
throw new NotImplementedException();
}
+
+ /**
+ * Finds destination based on request URI
+ * @param requestURI to be recognized
+ * @return destination associated with the request URI
+ * @throws ServletException when destination wasn't found
+ */
+ private AbstractHTTPDestination findDestination(HttpServletRequest req, Bus bus) throws ServletException
+ {
+ // Find destination based on request URI
+ String requestURI = req.getRequestURI();
+ DestinationRegistry destRegistry = getDestinationRegistryFromBus(bus);
+ if (destRegistry == null)
+ {
+ throw new ServletException("Cannot obtain DestinationRegistry!");
+ }
+ Collection<AbstractHTTPDestination> destinations = destRegistry.getDestinations();
+ AbstractHTTPDestination returnValue = null;
+ for (AbstractHTTPDestination destination : destinations)
+ {
+ EndpointInfo endpointInfo = destination.getEndpointInfo();
+ String address = endpointInfo.getAddress();
+
+ String path = address;
+ try
+ {
+ path = new URL(address).getPath();
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+
+ if (path != null)
+ {
+ if (requestURI.equals(path))
+ {
+ return destination; // exact match
+ }
+ else if (requestURI.startsWith(path))
+ {
+ returnValue = destination; // fallback
+ }
+ }
+ }
+
+ if (returnValue == null)
+ throw new ServletException("Cannot obtain destination for: " + requestURI);
+
+ return returnValue;
+ }
+
+ private static DestinationRegistry getDestinationRegistryFromBus(Bus bus) throws ServletException {
+ DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
+ try {
+ DestinationFactory df = dfm
+ .getDestinationFactory("http://cxf.apache.org/transports/http/configuration");
+ if (df instanceof HTTPTransportFactory) {
+ HTTPTransportFactory transportFactory = (HTTPTransportFactory)df;
+ return transportFactory.getRegistry();
+ }
+ } catch (BusException e) {
+ throw new ServletException("Cannot get DestinationFactory for http transport!");
+ }
+ return null;
+ }
+
+ /**
+ * When request includes query it tries to lookup the query handler and tries to handle the request message
+ * @param req request
+ * @param res response
+ * @param dest destination
+ * @return true if there was a query handler that successfully handled the request, false otherwise
+ * @throws ServletException if some problem occurs
+ */
+ private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, AbstractHTTPDestination dest, Bus bus)
+ throws ServletException
+ {
+ boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0);
+ boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null;
+
+ if (hasQuery && queryHandlerRegistryExists)
+ {
+ String ctxUri = req.getRequestURI();
+ String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString();
+ EndpointInfo endpointInfo = dest.getEndpointInfo();
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()))
+ {
+ endpointInfo.setProperty("autoRewriteSoapAddress", true);
+ }
+
+ for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers())
+ {
+ if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo))
+ {
+ res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri));
+ try
+ {
+ OutputStream out = res.getOutputStream();
+ queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out);
+ out.flush();
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw new ServletException(e);
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ private long initRequestMetrics(Endpoint endpoint)
+ {
+ long beginTime = 0;
+
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ if (metrics != null)
+ beginTime = metrics.processRequestMessage();
+
+ return beginTime;
+ }
+
+ private void processResponseMetrics(Endpoint endpoint, long beginTime)
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ if (metrics != null)
+ metrics.processResponseMessage(beginTime);
+ }
+
+ private void processFaultMetrics(Endpoint endpoint, long beginTime)
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ if (metrics != null)
+ metrics.processFaultMessage(beginTime);
+ }
}
Deleted: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -1,211 +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.wsf.stack.cxf;
-
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.servlet.ServletController;
-import org.apache.cxf.transport.servlet.ServletDestination;
-import org.apache.cxf.transport.servlet.ServletTransportFactory;
-import org.apache.cxf.transports.http.QueryHandler;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
-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.Endpoint;
-import org.jboss.wsf.spi.management.EndpointMetrics;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
-
-/**
- * An extension to the CXF servlet controller
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 21-Apr-2007
- */
-public class ServletControllerExt extends ServletController
-{
- private ServletTransportFactory cxfTransport;
- private Bus bus;
- private ServerConfig serverConfig;
-
- public ServletControllerExt(ServletTransportFactory cxfTransport, ServletConfig config, ServletContext servletCtx, Bus bus)
- {
- super(cxfTransport, config, servletCtx, bus);
- this.cxfTransport = cxfTransport;
- this.bus = bus;
- ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- serverConfig = spiProvider.getSPI(ServerConfigFactory.class, cl).getServerConfig();
- }
-
- /**
- * Finds destination based on request URI
- * @param requestURI to be recognized
- * @return destination associated with the request URI
- * @throws ServletException when destination wasn't found
- */
- private ServletDestination findDestination(HttpServletRequest req) throws ServletException
- {
- // Find destination based on request URI
- String requestURI = req.getRequestURI();
- Collection<ServletDestination> destinations = cxfTransport.getDestinations();
- ServletDestination returnValue = null;
- for (ServletDestination destination : destinations)
- {
- EndpointInfo endpointInfo = destination.getEndpointInfo();
- String address = endpointInfo.getAddress();
-
- String path = address;
- try
- {
- path = new URL(address).getPath();
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
- if (path != null)
- {
- if (requestURI.equals(path))
- {
- return destination; // exact match
- }
- else if (requestURI.startsWith(path))
- {
- returnValue = destination; // fallback
- }
- }
- }
-
- if (returnValue == null)
- throw new ServletException("Cannot obtain destination for: " + requestURI);
-
- return returnValue;
- }
-
- /**
- * When request includes query it tries to lookup the query handler and tries to handle the request message
- * @param req request
- * @param res response
- * @param dest destination
- * @return true if there was a query handler that successfully handled the request, false otherwise
- * @throws ServletException if some problem occurs
- */
- private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, ServletDestination dest)
- throws ServletException
- {
- boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0);
- boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null;
-
- if (hasQuery && queryHandlerRegistryExists)
- {
- String ctxUri = req.getRequestURI();
- String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString();
- EndpointInfo endpointInfo = dest.getEndpointInfo();
- if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()))
- {
- endpointInfo.setProperty("autoRewriteSoapAddress", true);
- }
-
- for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers())
- {
- if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo))
- {
- res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri));
- try
- {
- OutputStream out = res.getOutputStream();
- queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out);
- out.flush();
- return true;
- }
- catch (Exception e)
- {
- throw new ServletException(e);
- }
- }
- }
- }
-
- return false;
- }
-
- public void invoke(HttpServletRequest req, HttpServletResponse res, Endpoint ep) throws ServletException
- {
- ServletDestination dest = findDestination(req);
- boolean requestHandled = handleQuery(req, res, dest);
-
- if (false == requestHandled)
- {
- Long beginTime = initRequestMetrics(ep);
- HttpServletResponseExt response = new HttpServletResponseExt(res);
- invokeDestination(req, response, dest);
- if (response.getStatus() < 500)
- {
- processResponseMetrics(ep, beginTime);
- }
- else
- {
- processFaultMetrics(ep, beginTime);
- }
- }
- }
-
- private long initRequestMetrics(Endpoint endpoint)
- {
- long beginTime = 0;
-
- EndpointMetrics metrics = endpoint.getEndpointMetrics();
- if (metrics != null)
- beginTime = metrics.processRequestMessage();
-
- return beginTime;
- }
-
- private void processResponseMetrics(Endpoint endpoint, long beginTime)
- {
- EndpointMetrics metrics = endpoint.getEndpointMetrics();
- if (metrics != null)
- metrics.processResponseMessage(beginTime);
- }
-
- private void processFaultMetrics(Endpoint endpoint, long beginTime)
- {
- EndpointMetrics metrics = endpoint.getEndpointMetrics();
- if (metrics != null)
- metrics.processFaultMessage(beginTime);
- }
-
-}
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -34,7 +34,10 @@
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.servlet.ServletTransportFactory;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
+import org.apache.cxf.transport.http.HttpDestinationFactory;
+import org.apache.cxf.transport.servlet.ServletDestinationFactory;
+//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.cxf.ws.rm.RMManager;
import org.jboss.wsf.spi.binding.BindingCustomization;
@@ -67,13 +70,16 @@
this.metadata = metadata;
bus = new JBossWSNonSpringBusFactory().createBus();
//Force servlet transport to prevent CXF from using Jetty or other transports
- ExtensionManager em = bus.getExtension(ExtensionManager.class);
- em.activateAllByType(ConduitInitiator.class); //need to activate/register all the beans implementing ConduitInitiator so that does not happen later
- DestinationFactory factory = new ServletTransportFactory(bus);
- for (String s : factory.getTransportIds())
- {
- registerTransport(factory, s);
- }
+ new HTTPTransportFactory(bus);
+ bus.setExtension(new ServletDestinationFactory(), HttpDestinationFactory.class);
+// //Force servlet transport to prevent CXF from using Jetty or other transports
+// ExtensionManager em = bus.getExtension(ExtensionManager.class);
+// em.activateAllByType(ConduitInitiator.class); //need to activate/register all the beans implementing ConduitInitiator so that does not happen later
+// DestinationFactory factory = new ServletTransportFactory(bus);
+// for (String s : factory.getTransportIds())
+// {
+// registerTransport(factory, s);
+// }
}
/**
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -33,7 +33,10 @@
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.servlet.ServletTransportFactory;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
+import org.apache.cxf.transport.http.HttpDestinationFactory;
+import org.apache.cxf.transport.servlet.ServletDestinationFactory;
+//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.apache.ws.security.WSSConfig;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.binding.BindingCustomization;
@@ -97,11 +100,14 @@
}
}
//Force servlet transport to prevent CXF from using Jetty or other transports
- DestinationFactory factory = new ServletTransportFactory(bus);
- for (String s : factory.getTransportIds())
- {
- registerTransport(factory, s);
- }
+ new HTTPTransportFactory(bus);
+ bus.setExtension(new ServletDestinationFactory(), HttpDestinationFactory.class);
+// //Force servlet transport to prevent CXF from using Jetty or other transports
+// DestinationFactory factory = new ServletTransportFactory(bus);
+// for (String s : factory.getTransportIds())
+// {
+// registerTransport(factory, s);
+// }
}
/**
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -73,6 +73,7 @@
ServletContext context = servletConfig.getServletContext();
String contextPath = context.getContextPath();
+ context.setAttribute(ServletConfig.class.getName(), servletConfig);
return initServiceEndpoint(epRegistry, contextPath, servletName);
}
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -28,7 +28,7 @@
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.http.gzip.GZIPInInterceptor;
+import org.apache.cxf.transport.common.gzip.GZIPInInterceptor;
public class GZIPEnforcingInInterceptor extends GZIPInInterceptor
{
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2011-04-19 18:37:07 UTC (rev 14167)
@@ -31,9 +31,9 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.transport.common.gzip.GZIPFeature;
+import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transport.http.gzip.GZIPFeature;
-import org.apache.cxf.transport.http.gzip.GZIPOutInterceptor;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.jboss.wsf.test.ClientHelper;
Modified: stack/cxf/branches/cxf24/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/pom.xml 2011-04-19 17:25:14 UTC (rev 14166)
+++ stack/cxf/branches/cxf24/pom.xml 2011-04-19 18:37:07 UTC (rev 14167)
@@ -57,10 +57,10 @@
-->
<!-- END -->
<jboss700.version>7.0.0.Beta3-SNAPSHOT</jboss700.version>
- <cxf.version>2.3.4</cxf.version>
+ <cxf.version>2.4.0</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
- <fastinfoset.api.version>1.2.7</fastinfoset.api.version>
+ <fastinfoset.api.version>1.2.9</fastinfoset.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jboss.logging.version>3.0.0.Beta3</jboss.logging.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
@@ -86,7 +86,7 @@
<jms.api.version>1.0.0.Final</jms.api.version>
<velocity.version>1.5</velocity.version>
<xerces.version>2.9.1</xerces.version>
- <xmlsec.version>1.4.3</xmlsec.version>
+ <xmlsec.version>1.4.4</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
<spring.version>3.0.5.RELEASE</spring.version>
</properties>
11 years, 11 months
- 1
- 0
JBossWS SVN: r14166 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365: modules/core/src/main/java/org/jboss/ws/core/soap and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2011-04-19 13:25:14 -0400 (Tue, 19 Apr 2011)
New Revision: 14166
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
Log:
[JBAPP-6365] Merging schema validation import changes into isolated branch
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/trunk:14157,14160
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2011-04-19 16:15:06 UTC (rev 14165)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2011-04-19 17:25:14 UTC (rev 14166)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.core.soap;
+import java.io.InputStream;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -102,6 +103,7 @@
EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
feature = epMetaData.getFeature(SchemaValidationFeature.class);
URL xsdURL = feature.getSchemaLocation() != null ? new URL(feature.getSchemaLocation()) : null;
+ InputStream[] xsdStreams = null;
if (xsdURL == null)
{
URL wsdlURL = epMetaData.getServiceMetaData().getWsdlFileOrLocation();
@@ -111,7 +113,7 @@
}
else
{
- xsdURL = schemaExtractor.getSchemaUrl(wsdlURL);
+ xsdStreams = schemaExtractor.getSchemas(wsdlURL);
}
}
if (xsdURL != null)
@@ -120,6 +122,12 @@
Element xmlDOM = DOMUtils.sourceToElement(source);
new SchemaValidationHelper(xsdURL).setErrorHandler(errorHandler).validateDocument(xmlDOM);
}
+ else //xsdStreams != null
+ {
+ ErrorHandler errorHandler = feature.getErrorHandler();
+ Element xmlDOM = DOMUtils.sourceToElement(source);
+ new SchemaValidationHelper(xsdStreams).setErrorHandler(errorHandler).validateDocument(xmlDOM);
+ }
}
catch (RuntimeException rte)
{
@@ -129,10 +137,6 @@
{
WSException.rethrow(ex);
}
- finally
- {
- schemaExtractor.close();
- }
}
private boolean isValidationEnabled()
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2011-04-19 16:15:06 UTC (rev 14165)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2011-04-19 17:25:14 UTC (rev 14166)
@@ -25,8 +25,15 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.FileInputStream;
import java.net.URL;
import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
import javax.xml.namespace.QName;
@@ -48,9 +55,15 @@
private static Logger log = Logger.getLogger(SchemaExtractor.class);
private File xsdFile;
+ private String path;
- public URL getSchemaUrl(URL wsdlURL) throws IOException
+ public InputStream[] getSchemas(URL wsdlURL) throws IOException
{
+ //Get the path to the WSDL
+ Pattern p = Pattern.compile("[a-zA-Z]+\\.[a-zA-Z]+$");
+ Matcher m = p.matcher(wsdlURL.getFile());
+ path = m.replaceFirst("");
+
// parse the wsdl
Element root = DOMUtils.parse(wsdlURL.openStream());
@@ -77,25 +90,64 @@
}
Element schemaElement = schemaElements.get(0);
- File tmpdir = IOUtils.createTempDirectory();
- xsdFile = File.createTempFile("jbossws_schema", ".xsd", tmpdir);
- xsdFile.deleteOnExit();
+ List<InputStream> streams = new ArrayList<InputStream>();
- OutputStreamWriter outwr = new OutputStreamWriter(new FileOutputStream(xsdFile));
+ pullImportedSchemas(schemaElement, streams);
+
+ //Add the WSDL schema to the schema array
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ OutputStreamWriter outwr = new OutputStreamWriter( outStream );
DOMWriter domWriter = new DOMWriter(outwr);
domWriter.setPrettyprint(true);
domWriter.print(schemaElement);
- outwr.close();
- return xsdFile.toURL();
+ streams.add(new ByteArrayInputStream(outStream.toByteArray()));
+
+ return streams.toArray(new InputStream[streams.size()]);
}
-
- public void close()
+
+ private void pullImportedSchemas(Element schemaElement, List<InputStream> streams)
{
- if (xsdFile != null)
+ QName importQName = new QName( "http://www.w3.org/2001/XMLSchema", "import" );
+ List<Element> importElements = DOMUtils.getChildElementsAsList( schemaElement, importQName );
+
+ ArrayList<String> schemaLocations = new ArrayList<String>();
+ for( Element importElement : importElements )
{
- xsdFile.delete();
- xsdFile = null;
+ String schemaLocation = importElement.getAttribute( "schemaLocation" );
+ schemaLocations.add( schemaLocation );
}
+
+ ByteArrayOutputStream outStream = null;
+
+ for( int i=0; i < schemaLocations.size(); i++ )
+ {
+ String schemaLocation = schemaLocations.get( i );
+
+ try
+ {
+ FileInputStream in = new FileInputStream( path + schemaLocation );
+ outStream = new ByteArrayOutputStream();
+
+ int bt = 0;
+ while(( bt = in.read() ) != -1 )
+ {
+ outStream.write( (byte)bt );
+ }
+
+ InputStream inputStream = new ByteArrayInputStream(outStream.toByteArray());
+ inputStream.mark(0);
+
+ Element root = DOMUtils.parse(inputStream);
+ pullImportedSchemas(root, streams);
+
+ inputStream.reset();
+ streams.add(inputStream);
+ }
+ catch(IOException ioe)
+ {
+ log.warn("Error obtaining schema: " + path + schemaLocation);
+ }
+ }
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2011-04-19 16:15:06 UTC (rev 14165)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2011-04-19 17:25:14 UTC (rev 14166)
@@ -30,6 +30,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.jboss.logging.Logger;
import org.jboss.wsf.common.DOMWriter;
import org.w3c.dom.Element;
import org.xml.sax.ErrorHandler;
@@ -44,13 +45,21 @@
public class SchemaValidationHelper
{
private URL xsdURL;
+ private InputStream[] xsdStreams;
private ErrorHandler errorHandler = new StrictlyValidErrorHandler();
+
+ private static Logger log = Logger.getLogger(SchemaValidationHelper.class);
public SchemaValidationHelper(URL xsdURL)
{
this.xsdURL = xsdURL;
}
+ public SchemaValidationHelper(InputStream[] xsdStreams)
+ {
+ this.xsdStreams = xsdStreams;
+ }
+
public SchemaValidationHelper setErrorHandler(ErrorHandler errorHandler)
{
this.errorHandler = errorHandler;
@@ -79,14 +88,23 @@
DocumentBuilder builder = getDocumentBuilder();
builder.parse(inxml);
}
-
+
private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException
{
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setValidating(true);
factory.setNamespaceAware(true);
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
- factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", xsdURL.toExternalForm());
+
+ if(xsdStreams != null)
+ {
+ factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", xsdStreams);
+ }
+ else //use xsdURL
+ {
+ factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", xsdURL.toExternalForm());
+ }
+
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setErrorHandler(errorHandler);
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2011-04-19 16:15:06 UTC (rev 14165)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2011-04-19 17:25:14 UTC (rev 14166)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.jbws1172;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
@@ -60,19 +61,19 @@
public void testSchemaValidationPositive() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ InputStream[] xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
String inxml = "<performTest xmlns='http://www.my-company.it/ws/my-test'><Code>1000</Code></performTest>";
- new SchemaValidationHelper(xsdURL).validateDocument(inxml);
+ new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
public void testSchemaValidationNegative() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ InputStream[] xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
String inxml = "<performTest xmlns='http://www.my-company.it/ws/my-test'><Code>2000</Code></performTest>";
try
{
- new SchemaValidationHelper(xsdURL).validateDocument(inxml);
+ new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
catch (SAXException ex)
{
@@ -84,18 +85,19 @@
public void testEndpointWsdlValidation() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1172/noval?wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ InputStream[] xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
String inxml = "<performTest xmlns='http://www.my-company.it/ws/my-test'><Code>1000</Code></performTest>";
- new SchemaValidationHelper(xsdURL).validateDocument(inxml);
+ new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
public void testValidatingClientWithExplicitSchema() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ //URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
Service service = Service.create(wsdlURL, SERVICE_NAME);
- SchemaValidationFeature feature = new SchemaValidationFeature(xsdURL.toString());
+ //SchemaValidationFeature feature = new SchemaValidationFeature(xsdURL.toString());
+ SchemaValidationFeature feature = new SchemaValidationFeature();
MyTest port = service.getPort(MyTest.class, feature);
try
{
@@ -113,10 +115,11 @@
public void testValidatingClientWithErrorHandler() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ //URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
Service service = Service.create(wsdlURL, SERVICE_NAME);
- SchemaValidationFeature feature = new SchemaValidationFeature(xsdURL.toString());
+ //SchemaValidationFeature feature = new SchemaValidationFeature(xsdURL.toString());
+ SchemaValidationFeature feature = new SchemaValidationFeature();
TestErrorHandler errorHandler = new TestErrorHandler();
feature.setErrorHandler(errorHandler);
11 years, 11 months
- 1
- 0