JBossWS SVN: r12472 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-11 16:44:33 -0400 (Fri, 11 Jun 2010)
New Revision: 12472
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
Log:
[JBWS-3060] No need anymore for the EndpointAssociation thread local to be inheritable
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2010-06-11 14:23:03 UTC (rev 12471)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2010-06-11 20:44:33 UTC (rev 12472)
@@ -31,7 +31,7 @@
*/
public final class EndpointAssociation
{
- private static final ThreadLocal<Endpoint> endpoint = new InheritableThreadLocal<Endpoint>();
+ private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>();
public static void setEndpoint(Endpoint ep)
{
15 years, 10 months
JBossWS SVN: r12471 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-06-11 10:23:03 -0400 (Fri, 11 Jun 2010)
New Revision: 12471
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3067] temporarily excluding tests
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-11 13:58:27 UTC (rev 12470)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-11 14:23:03 UTC (rev 12471)
@@ -3,3 +3,13 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-3067] issue with new scanning in AS trunk
+org/jboss/test/ws/jaxws/samples/wssecurity/MissingSecurityTestCase.*
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.*
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.*
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.*
+org/jboss/test/ws/jaxws/samples/wssecurity/MissingSecurityTestCase.*
+org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.*
+org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.*
+
15 years, 10 months
JBossWS SVN: r12470 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-06-11 09:58:27 -0400 (Fri, 11 Jun 2010)
New Revision: 12470
Modified:
stack/native/trunk/pom.xml
Log:
use up2date version of javassist
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-06-11 09:28:02 UTC (rev 12469)
+++ stack/native/trunk/pom.xml 2010-06-11 13:58:27 UTC (rev 12470)
@@ -60,7 +60,7 @@
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <javassist.version>3.6.0.GA</javassist.version>
+ <javassist.version>3.12.1.GA</javassist.version>
<jaxws.api.version>1.0.0.Beta1</jaxws.api.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<saaj.api.version>1.0.0.Beta1</saaj.api.version>
15 years, 10 months
JBossWS SVN: r12469 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: deployment/aspect and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-11 05:28:02 -0400 (Fri, 11 Jun 2010)
New Revision: 12469
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
Log:
- No need to associate the bus to every endpoint of the deployment
- No need to keep a reference to the registry in the CXFServlet once the endpoint has been looked-up
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-06-11 08:18:26 UTC (rev 12468)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-06-11 09:28:02 UTC (rev 12469)
@@ -63,7 +63,6 @@
public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management";
protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
@Override
public ServletController createServletController(ServletConfig servletConfig)
@@ -91,7 +90,7 @@
private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
{
- BusHolder holder = endpoint.getAttachment(BusHolder.class);
+ BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class);
//set the bus from deployment into the CXF servlet and assign it to the current thread
bus = holder.getBus();
BusFactory.possiblySetDefaultBus(bus);
@@ -108,11 +107,11 @@
private void initEndpoint(ServletConfig servletConfig)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
ServletContext context = servletConfig.getServletContext();
String contextPath = context.getContextPath();
- endpoint = initServiceEndpoint(contextPath);
+ endpoint = initServiceEndpoint(epRegistry, contextPath);
}
@Override
@@ -121,6 +120,11 @@
try
{
BusFactory.setThreadDefaultBus(getBus());
+ //set the current endpoint into the threadlocal association that is later
+ //used by the EndpointAssociationInterceptor for linking the message exchange
+ //related to this invocation to the proper endpoint serving it (the bus, and
+ //hence the interceptor, can span multiple invocation related to multiple
+ //endpoints)
EndpointAssociation.setEndpoint(endpoint);
RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
@@ -138,7 +142,7 @@
/** Initialize the service endpoint
*/
- private Endpoint initServiceEndpoint(String contextPath)
+ private Endpoint initServiceEndpoint(EndpointRegistry epRegistry, String contextPath)
{
if (contextPath.startsWith("/"))
contextPath = contextPath.substring(1);
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-06-11 08:18:26 UTC (rev 12468)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-06-11 09:28:02 UTC (rev 12469)
@@ -32,7 +32,6 @@
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
@@ -93,24 +92,12 @@
SecurityActions.setContextClassLoader(origClassLoader);
}
- for (Endpoint endpoint : dep.getService().getEndpoints())
- {
- endpoint.addAttachment(BusHolder.class, holder);
- }
dep.addAttachment(BusHolder.class, holder);
}
@Override
public void stop(Deployment dep)
{
- for (Endpoint endpoint : dep.getService().getEndpoints())
- {
- BusHolder holder = endpoint.removeAttachment(BusHolder.class);
- if (holder != null)
- {
- holder.close();
- }
- }
BusHolder holder = dep.removeAttachment(BusHolder.class);
if (holder != null)
{
15 years, 10 months
JBossWS SVN: r12468 - in stack/cxf/trunk/modules/client/src/main/resources/META-INF: services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-11 04:18:26 -0400 (Fri, 11 Jun 2010)
New Revision: 12468
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
Log:
[JBWS-3064] Removing cxf jaxrs impl references
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-06-10 22:37:48 UTC (rev 12467)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-06-11 08:18:26 UTC (rev 12468)
@@ -81,8 +81,5 @@
<extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
<namespace>http://apache.org/cxf/binding/http</namespace>
</extension>
- <extension class="org.apache.cxf.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
- </extension>
</extensions>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate 2010-06-10 22:37:48 UTC (rev 12467)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate 2010-06-11 08:18:26 UTC (rev 12468)
@@ -1 +0,0 @@
-org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl
\ No newline at end of file
15 years, 10 months
JBossWS SVN: r12467 - in stack/cxf/trunk/modules: server and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-06-10 18:37:48 -0400 (Thu, 10 Jun 2010)
New Revision: 12467
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
Log:
Removing cxf jaxrs dependency from server and client modules
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-06-10 21:56:04 UTC (rev 12466)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-06-10 22:37:48 UTC (rev 12467)
@@ -64,10 +64,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-06-10 21:56:04 UTC (rev 12466)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-06-10 22:37:48 UTC (rev 12467)
@@ -67,10 +67,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<dependency>
15 years, 10 months
JBossWS SVN: r12466 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-06-10 17:56:04 -0400 (Thu, 10 Jun 2010)
New Revision: 12466
Modified:
stack/cxf/trunk/pom.xml
Log:
Removing cxf jaxrs dependency as it is not used
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-06-10 20:39:35 UTC (rev 12465)
+++ stack/cxf/trunk/pom.xml 2010-06-10 21:56:04 UTC (rev 12466)
@@ -301,11 +301,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
15 years, 10 months
JBossWS SVN: r12465 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: configuration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-10 16:39:35 -0400 (Thu, 10 Jun 2010)
New Revision: 12465
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
[JBWS-3060] Linking spi endpoint to the message exchange using a custom interceptor
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-10 17:22:10 UTC (rev 12464)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-10 20:39:35 UTC (rev 12465)
@@ -72,7 +72,6 @@
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -83,6 +82,7 @@
*
* @author Thomas.Diesler(a)jboss.org
* @author richard.opalka(a)jboss.com
+ * @author alessio.soldano(a)jboss.com
*
* @see org.apache.cxf.jaxws.AbstractJAXWSMethodInvoker
*/
@@ -145,7 +145,7 @@
}
}
- Endpoint ep = EndpointAssociation.getEndpoint();
+ Endpoint ep = exchange.get(Endpoint.class);
InvocationHandler invHandler = ep.getInvocationHandler();
Invocation inv = invHandler.createInvocation();
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2010-06-10 17:22:10 UTC (rev 12464)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2010-06-10 20:39:35 UTC (rev 12465)
@@ -55,7 +55,6 @@
public class ServletControllerExt extends ServletController
{
private ServletTransportFactory cxfTransport;
- private ServletContext servletCtx;
private Bus bus;
private ServerConfig serverConfig;
@@ -63,7 +62,6 @@
{
super(cxfTransport, config, servletCtx, bus);
this.cxfTransport = cxfTransport;
- this.servletCtx = servletCtx;
this.bus = bus;
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
@@ -80,7 +78,6 @@
// Find destination based on request URI
String requestURI = req.getRequestURI();
Collection<ServletDestination> destinations = cxfTransport.getDestinations();
- String exactMatch = null;
ServletDestination returnValue = null;
for (ServletDestination destination : destinations)
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-06-10 17:22:10 UTC (rev 12464)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-06-10 20:39:35 UTC (rev 12465)
@@ -42,6 +42,7 @@
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
+import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
@@ -120,6 +121,7 @@
{
bus.setExtension(configurer, Configurer.class);
}
+ setInterceptors(bus);
setSoapTransportFactory(bus, soapTransportFactory);
setResourceResolver(bus, resolver);
if (jbossCxfXml != null)
@@ -190,6 +192,13 @@
}
}
+ protected static void setInterceptors(Bus bus)
+ {
+ //Install the EndpointAssociationInterceptor for linking every message exchange
+ //with the proper spi Endpoint retrieved in CXFServletExt
+ bus.getInInterceptors().add(new EndpointAssociationInterceptor());
+ }
+
protected static void setResourceResolver(Bus bus, ResourceResolver resourceResolver)
{
if (resourceResolver != null)
Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java 2010-06-10 20:39:35 UTC (rev 12465)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.interceptor;
+
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+
+/**
+ * A RECEIVE phase interceptor that sets the @see{org.jboss.wsf.spi.deployment.Endpoint}
+ * associated to the current message exchange. This is performed early in the chain,
+ * before any thread pool comes into the game, preventing the EndpointAssociation
+ * threadlocal to retrieve the correct Endpoint instance.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 10-Jun-2010
+ *
+ */
+public class EndpointAssociationInterceptor extends AbstractPhaseInterceptor<Message>
+{
+
+ public EndpointAssociationInterceptor()
+ {
+ super(Phase.RECEIVE);
+ }
+
+ @Override
+ public void handleMessage(Message message) throws Fault
+ {
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ Exchange exchange = message.getExchange();
+ exchange.put(Endpoint.class, endpoint);
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months
JBossWS SVN: r12464 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-10 13:22:10 -0400 (Thu, 10 Jun 2010)
New Revision: 12464
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3006] Use AS6 depchain for building client classpath
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2010-06-10 16:47:08 UTC (rev 12463)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2010-06-10 17:22:10 UTC (rev 12464)
@@ -494,104 +494,61 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
+ <artifactId>jboss-as-depchain</artifactId>
+ <scope>import</scope>
+ <type>pom</type>
<version>${jboss.version}</version>
<exclusions>
+ <!-- Exclusion for not depending on the container integration -->
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-Native (AS 6.0.0.M3) -->
<exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-factories</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
</exclusion>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-saaj</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
<exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-management</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-resources</artifactId>
</exclusion>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
</exclusion>
+ <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
<exclusion>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logmanager</artifactId>
</exclusion>
<exclusion>
- <groupId>sun-jaxws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>${jboss.javaee.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -609,10 +566,8 @@
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
<!-- Libs below required just for jaxrpc tests; listed here to prevent Metro stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -632,93 +587,62 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
+ <artifactId>jboss-as-depchain</artifactId>
+ <scope>import</scope>
+ <type>pom</type>
<version>${jboss.version}</version>
<exclusions>
+ <!-- Exclusion for not depending on the container integration -->
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF (AS 6.0.0) -->
<exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-management</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
</exclusion>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-resources</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-factories</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
</exclusion>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
</exclusion>
+ <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
<exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logmanager</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>${jboss.javaee.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -739,10 +663,8 @@
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
<!-- Libs below required just for jaxrpc tests; listed here to prevent Metro stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
15 years, 10 months
JBossWS SVN: r12463 - in stack/metro/trunk/modules: testsuite and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-10 12:47:08 -0400 (Thu, 10 Jun 2010)
New Revision: 12463
Modified:
stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
stack/metro/trunk/modules/testsuite/metro-tests/pom.xml
stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml
stack/metro/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3063] Use wsconsume/wsprovide in forked mode to add log4j conf to the system env before invocation; fix bat/sh scripts
Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-06-10 16:47:08 UTC (rev 12463)
@@ -49,4 +49,4 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar
rem Execute the command
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %*
+"%JAVA%" %JAVA_OPTS% -Dlog4j.configuration=log4j.xml -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %*
Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-06-10 16:47:08 UTC (rev 12463)
@@ -88,6 +88,7 @@
# Execute the command
"$JAVA" $JAVA_OPTS \
+ -Dlog4j.configuration=log4j.xml \
-Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-classpath "$WSCONSUME_CLASSPATH" \
org.jboss.wsf.spi.tools.cmd.WSConsume "$@"
Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-06-10 16:47:08 UTC (rev 12463)
@@ -51,4 +51,4 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
rem Execute the command
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %*
+"%JAVA%" %JAVA_OPTS% -Dlog4j.configuration=log4j.xml -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %*
Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-06-10 16:47:08 UTC (rev 12463)
@@ -90,6 +90,7 @@
# Execute the command
"$JAVA" $JAVA_OPTS \
+ -Dlog4j.configuration=log4j.xml \
-Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-classpath "$WSPROVIDE_CLASSPATH" \
org.jboss.wsf.spi.tools.cmd.WSProvide "$@"
Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2010-06-10 16:47:08 UTC (rev 12463)
@@ -97,6 +97,8 @@
<property name="maven.test.classpath" refid="maven.test.classpath"/>
<property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
<property name="tests.output.dir" value="${project.build.directory}"/>
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="project.version" value="${project.version}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/>
</tasks>
Modified: stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:47:08 UTC (rev 12463)
@@ -21,8 +21,14 @@
</classpath>
</taskdef>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false">
+ <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/>
+ <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/>
+ </wsconsume>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false">
+ <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/>
+ <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/>
+ </wsconsume>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2010-06-10 16:47:08 UTC (rev 12463)
@@ -58,6 +58,8 @@
<property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
<property name="tests.output.dir" value="${project.build.directory}"/>
<property name="project.version" value="${project.version}"/>
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/>
</tasks>
</configuration>
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2010-06-10 16:47:08 UTC (rev 12463)
@@ -21,8 +21,14 @@
</classpath>
</taskdef>
- <wsconsume wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl" binding="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false">
+ <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/>
+ <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/>
+ </wsconsume>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl" binding="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false">
+ <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/>
+ <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/>
+ </wsconsume>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2010-06-10 16:43:58 UTC (rev 12462)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2010-06-10 16:47:08 UTC (rev 12463)
@@ -26,6 +26,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
+ <log4j.output.dir>${project.build.directory}</log4j.output.dir>
</properties>
<!-- Modules -->
15 years, 10 months