JBossWS SVN: r13128 - framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-15 04:39:05 -0400 (Fri, 15 Oct 2010)
New Revision: 13128
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
Log:
rollback - SPI have to be BC
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-15 08:36:48 UTC (rev 13127)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-15 08:39:05 UTC (rev 13128)
@@ -50,7 +50,7 @@
final UnifiedServiceRefMetaData serviceRefUMDM = (UnifiedServiceRefMetaData) serviceRefMD;
final Type bindingType = getServiceRefType(serviceRefUMDM, loader);
- this.getBinder(bindingType).setupServiceRef(encCtx, encName, serviceRefUMDM, loader);
+ this.getBinder(bindingType).setupServiceRef(encCtx, encName, null, serviceRefUMDM, loader);
}
private ServiceRefBinder getBinder(final Type binderType)
13 years, 6 months
JBossWS SVN: r13127 - spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-15 04:36:48 -0400 (Fri, 15 Oct 2010)
New Revision: 13127
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
Log:
rollback - SPI have to be BC
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-14 16:14:58 UTC (rev 13126)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-15 08:36:48 UTC (rev 13127)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.spi.serviceref;
+import java.lang.reflect.AnnotatedElement;
+
import javax.naming.Context;
import javax.naming.NamingException;
@@ -34,5 +36,5 @@
*/
public interface ServiceRefBinder
{
- void setupServiceRef(Context encCtx, String encName, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException;
+ void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException;
}
13 years, 6 months
JBossWS SVN: r13126 - framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-14 12:14:58 -0400 (Thu, 14 Oct 2010)
New Revision: 13126
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
Log:
all parameters are final
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-14 14:37:53 UTC (rev 13125)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-14 16:14:58 UTC (rev 13126)
@@ -45,7 +45,7 @@
public class DefaultServiceRefHandler implements ServiceRefHandler
{
public void bindServiceRef(final Context encCtx, final String encName, final UnifiedVirtualFile ignored,
- final ClassLoader loader, ServiceRefMetaData serviceRefMD) throws NamingException
+ final ClassLoader loader, final ServiceRefMetaData serviceRefMD) throws NamingException
{
final UnifiedServiceRefMetaData serviceRefUMDM = (UnifiedServiceRefMetaData) serviceRefMD;
final Type bindingType = getServiceRefType(serviceRefUMDM, loader);
13 years, 6 months
JBossWS SVN: r13125 - framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-14 10:37:53 -0400 (Thu, 14 Oct 2010)
New Revision: 13125
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
Log:
refactoring
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-14 14:28:59 UTC (rev 13124)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-14 14:37:53 UTC (rev 13125)
@@ -21,8 +21,6 @@
*/
package org.jboss.wsf.framework.serviceref;
-import java.lang.reflect.AnnotatedElement;
-
import javax.naming.Context;
import javax.naming.NamingException;
@@ -46,45 +44,40 @@
*/
public class DefaultServiceRefHandler implements ServiceRefHandler
{
- private static final ServiceRefBinderFactory serviceRefBindingFactory;
-
- static
+ public void bindServiceRef(final Context encCtx, final String encName, final UnifiedVirtualFile ignored,
+ final ClassLoader loader, ServiceRefMetaData serviceRefMD) throws NamingException
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- serviceRefBindingFactory = spiProvider.getSPI(ServiceRefBinderFactory.class);
+ final UnifiedServiceRefMetaData serviceRefUMDM = (UnifiedServiceRefMetaData) serviceRefMD;
+ final Type bindingType = getServiceRefType(serviceRefUMDM, loader);
+
+ this.getBinder(bindingType).setupServiceRef(encCtx, encName, serviceRefUMDM, loader);
}
private ServiceRefBinder getBinder(final Type binderType)
{
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final ServiceRefBinderFactory serviceRefBindingFactory = spiProvider.getSPI(ServiceRefBinderFactory.class);
+
return serviceRefBindingFactory.newServiceRefBinder(binderType);
}
- public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile ignored, ClassLoader loader, ServiceRefMetaData serviceRefMD) throws NamingException
+ private Type getServiceRefType(final UnifiedServiceRefMetaData serviceRef, final ClassLoader loader)
{
- final UnifiedServiceRefMetaData serviceRefUMDM = (UnifiedServiceRefMetaData)serviceRefMD;
- final Type bindingType = getServiceRefType(serviceRefUMDM, loader);
-
- this.getBinder(bindingType).setupServiceRef(encCtx, encName, serviceRefUMDM, loader);
- }
-
- private Type getServiceRefType(UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
- {
- // The service-ref-type is JAXWS specific
- String serviceRefType = serviceRef.getServiceRefType();
- if (serviceRefType != null || serviceRef.getAnnotatedElement() != null)
+ // Both service-ref-type and annotated element are JAXWS specific
+ if (serviceRef.getServiceRefType() != null || serviceRef.getAnnotatedElement() != null)
return Type.JAXWS;
// The mapping-file is JAXRPC specific
if (serviceRef.getMappingFile() != null)
return Type.JAXRPC;
- String serviceInterfaceName = serviceRef.getServiceInterface();
+ final String serviceInterfaceName = serviceRef.getServiceInterface();
if (serviceInterfaceName == null)
throw new IllegalStateException("<service-interface> cannot be null");
try
{
- Class<?> siClass = loader.loadClass(serviceInterfaceName);
+ final Class<?> siClass = loader.loadClass(serviceInterfaceName);
if (javax.xml.ws.Service.class.isAssignableFrom(siClass))
return Type.JAXWS;
else if (javax.xml.rpc.Service.class.isAssignableFrom(siClass))
13 years, 6 months
JBossWS SVN: r13124 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-14 10:28:59 -0400 (Thu, 14 Oct 2010)
New Revision: 13124
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java
Log:
refactoring
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java 2010-10-14 14:28:14 UTC (rev 13123)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java 2010-10-14 14:28:59 UTC (rev 13124)
@@ -35,7 +35,7 @@
*/
public class ServiceRefBinderJAXRPC implements ServiceRefBinder
{
- public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
+ public void setupServiceRef(Context encCtx, String encName, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
{
throw new IllegalArgumentException("Deployed stack does not support JAX-RPC service-ref deployments");
}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2010-10-14 14:28:14 UTC (rev 13123)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2010-10-14 14:28:59 UTC (rev 13124)
@@ -59,7 +59,7 @@
// logging support
private static Logger log = Logger.getLogger(ServiceRefBinderJAXWS.class);
- public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader)
+ public void setupServiceRef(Context encCtx, String encName, UnifiedServiceRefMetaData serviceRef, ClassLoader loader)
throws NamingException
{
WebServiceRef wsref = null;
@@ -73,6 +73,7 @@
MTOM mtomAnnotation = null;
RespectBinding respectBindingAnnotation = null;
+ AnnotatedElement anElement = (AnnotatedElement)serviceRef.getAnnotatedElement();
if (anElement != null)
{
for (Annotation an : anElement.getAnnotations())
13 years, 6 months
JBossWS SVN: r13123 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: jaxws/client and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-14 10:28:14 -0400 (Thu, 14 Oct 2010)
New Revision: 13123
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java
Log:
refactoring
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java 2010-10-14 14:25:27 UTC (rev 13122)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java 2010-10-14 14:28:14 UTC (rev 13123)
@@ -46,7 +46,7 @@
/**
* Binds a Service into the callers ENC for every service-ref element
*/
- public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader)
+ public void setupServiceRef(Context encCtx, String encName, UnifiedServiceRefMetaData serviceRef, ClassLoader loader)
throws NamingException
{
String externalName = encCtx.getNameInNamespace() + "/" + encName;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2010-10-14 14:25:27 UTC (rev 13122)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2010-10-14 14:28:14 UTC (rev 13123)
@@ -61,7 +61,7 @@
// logging support
private static Logger log = Logger.getLogger(NativeServiceRefBinderJAXWS.class);
- public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
+ public void setupServiceRef(Context encCtx, String encName, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
{
WebServiceRef wsref = null;
@@ -74,6 +74,7 @@
MTOM mtomAnnotation = null;
RespectBinding respectBindingAnnotation = null;
+ AnnotatedElement anElement = (AnnotatedElement)serviceRef.getAnnotatedElement();
if (anElement != null)
{
for (Annotation an : anElement.getAnnotations())
13 years, 6 months
JBossWS SVN: r13122 - framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-14 10:25:27 -0400 (Thu, 14 Oct 2010)
New Revision: 13122
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
Log:
refactoring
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-14 14:22:24 UTC (rev 13121)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-10-14 14:25:27 UTC (rev 13122)
@@ -59,19 +59,12 @@
return serviceRefBindingFactory.newServiceRefBinder(binderType);
}
- public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile deleteme, ClassLoader loader, ServiceRefMetaData sref) throws NamingException
+ public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile ignored, ClassLoader loader, ServiceRefMetaData serviceRefMD) throws NamingException
{
- final UnifiedServiceRefMetaData serviceRef = (UnifiedServiceRefMetaData)sref;
- final Type bindingType = getServiceRefType(serviceRef, loader);
- if (bindingType == Type.JAXRPC)
- {
- this.getBinder(bindingType).setupServiceRef(encCtx, encName, null, serviceRef, loader);
- }
- else
- {
- AnnotatedElement anElement = (AnnotatedElement)sref.getAnnotatedElement();
- this.getBinder(bindingType).setupServiceRef(encCtx, encName, anElement, serviceRef, loader);
- }
+ final UnifiedServiceRefMetaData serviceRefUMDM = (UnifiedServiceRefMetaData)serviceRefMD;
+ final Type bindingType = getServiceRefType(serviceRefUMDM, loader);
+
+ this.getBinder(bindingType).setupServiceRef(encCtx, encName, serviceRefUMDM, loader);
}
private Type getServiceRefType(UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
13 years, 6 months
JBossWS SVN: r13121 - spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-14 10:22:24 -0400 (Thu, 14 Oct 2010)
New Revision: 13121
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
Log:
refactoring
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-14 12:42:46 UTC (rev 13120)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-14 14:22:24 UTC (rev 13121)
@@ -21,8 +21,6 @@
*/
package org.jboss.wsf.spi.serviceref;
-import java.lang.reflect.AnnotatedElement;
-
import javax.naming.Context;
import javax.naming.NamingException;
@@ -36,5 +34,5 @@
*/
public interface ServiceRefBinder
{
- void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException;
+ void setupServiceRef(Context encCtx, String encName, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException;
}
13 years, 6 months
JBossWS SVN: r13120 - in spi/trunk/src/main/java/org/jboss/wsf/spi: serviceref and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-14 08:42:46 -0400 (Thu, 14 Oct 2010)
New Revision: 13120
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java
Log:
removing obsolete code
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2010-10-14 11:38:50 UTC (rev 13119)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2010-10-14 12:42:46 UTC (rev 13120)
@@ -69,21 +69,6 @@
this.serviceRefMetaData = serviceRefMetaData;
}
- public void merge(UnifiedPortComponentRefMetaData pcref)
- {
- portQName = pcref.portQName;
- configName = pcref.configName;
- configFile = pcref.configFile;
- callProperties = pcref.callProperties;
- stubProperties = pcref.stubProperties;
- addressingEnabled = pcref.addressingEnabled;
- addressingRequired = pcref.addressingRequired;
- addressingResponses = pcref.addressingResponses;
- mtomEnabled = pcref.mtomEnabled;
- mtomThreshold = pcref.mtomThreshold;
- respectBindingEnabled = pcref.respectBindingEnabled;
- }
-
public UnifiedServiceRefMetaData getServiceRefMetaData()
{
return serviceRefMetaData;
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-10-14 11:38:50 UTC (rev 13119)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-10-14 12:42:46 UTC (rev 13120)
@@ -34,7 +34,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import javax.xml.namespace.QName;
@@ -47,7 +46,7 @@
import org.jboss.wsf.spi.util.URLLoaderAdapter;
/**
- * The metdata data from service-ref element in web.xml, ejb-jar.xml, and
+ * The metadata from service-ref element in web.xml, ejb-jar.xml, and
* application-client.xml.
*
* @author Thomas.Diesler(a)jboss.org
@@ -55,7 +54,7 @@
*/
public class UnifiedServiceRefMetaData extends ServiceRefMetaData
{
- private static final long serialVersionUID = -926464174132493954L;
+ private static final long serialVersionUID = -926464174132493955L;
// provide logging
private static Logger log = Logger.getLogger(UnifiedServiceRefMetaData.class);
@@ -112,9 +111,6 @@
// A flag that should be set when this service-ref has been bound.
private transient boolean processed;
- // Maps 'injection-target-class' to 'injection-target-name'
- private List<String[]> injectionTargets = new LinkedList<String[]>();
-
public UnifiedServiceRefMetaData(UnifiedVirtualFile vfRoot)
{
this.vfsRoot = vfRoot;
@@ -177,46 +173,6 @@
return this.respectBindingEnabled;
}
- public void merge(ServiceRefMetaData sref)
- {
- UnifiedServiceRefMetaData sourceRef = (UnifiedServiceRefMetaData)sref;
- serviceImplClass = sourceRef.serviceImplClass;
- configName = sourceRef.configName;
- configFile = sourceRef.configFile;
- wsdlOverride = sourceRef.wsdlOverride;
- handlerChain = sourceRef.handlerChain;
- callProperties = sourceRef.callProperties;
- addressingEnabled = sourceRef.addressingEnabled;
- addressingRequired = sourceRef.addressingRequired;
- addressingResponses = sourceRef.addressingResponses;
- mtomEnabled = sourceRef.mtomEnabled;
- mtomThreshold = sourceRef.mtomThreshold;
- respectBindingEnabled = sourceRef.respectBindingEnabled;
-
- if (serviceQName == null && sourceRef.serviceQName != null)
- serviceQName = sourceRef.serviceQName;
-
- for (UnifiedPortComponentRefMetaData pcref : sourceRef.getPortComponentRefs())
- {
- String seiName = pcref.getServiceEndpointInterface();
- QName portQName = pcref.getPortQName();
- UnifiedPortComponentRefMetaData targetPCRef = getPortComponentRef(seiName, portQName);
-
- if (targetPCRef == null)
- {
- log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]");
- if (seiName != null)
- addPortComponentRef(pcref);
- else
- log.warn("Ingore port component ref without SEI declaration: " + pcref);
-
- targetPCRef = pcref;
- }
-
- targetPCRef.merge(pcref);
- }
- }
-
public UnifiedVirtualFile getVfsRoot()
{
return vfsRoot;
@@ -473,22 +429,6 @@
this.anElement = anElement;
}
- public void registerInjectionTarget(String classname)
- {
- this.injectionTargets.add( new String[]{classname, null} );
- }
-
- public void finalizeInjectionTarget(String propName)
- {
- int index = this.injectionTargets.isEmpty() ? 0 : this.injectionTargets.size() - 1;
- this.injectionTargets.get(index)[1] = propName;
- }
-
- public List<String[]> getInjectionTargets()
- {
- return this.injectionTargets;
- }
-
private void writeObject(ObjectOutputStream out) throws IOException
{
out.defaultWriteObject();
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-14 11:38:50 UTC (rev 13119)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-14 12:42:46 UTC (rev 13120)
@@ -36,9 +36,5 @@
*/
public interface ServiceRefBinder
{
- final static String BEAN_NAME_JAXRPC = "WSServiceRefBinderJAXRPC";
-
- final static String BEAN_NAME_JAXWS = "WSServiceRefBinderJAXWS";
-
void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException;
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2010-10-14 11:38:50 UTC (rev 13119)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2010-10-14 12:42:46 UTC (rev 13120)
@@ -21,16 +21,13 @@
*/
package org.jboss.wsf.spi.serviceref;
-import java.io.Serializable;
-import java.util.List;
-
/**
* An abstract service-ref meta data object.
*
* @author Thomas.Diesler(a)jboss.org
* @since 08-Mar-2007
*/
-public abstract class ServiceRefMetaData extends ServiceRefElement implements Serializable
+public abstract class ServiceRefMetaData extends ServiceRefElement
{
public abstract String getServiceRefName();
@@ -43,8 +40,4 @@
public abstract boolean isProcessed();
public abstract void setProcessed(boolean flag);
-
- public abstract List<String[]> getInjectionTargets();
-
- public abstract void merge(ServiceRefMetaData targetRef);
}
13 years, 6 months
JBossWS SVN: r13119 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis and 32 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-10-14 07:38:50 -0400 (Thu, 14 Oct 2010)
New Revision: 13119
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/resources/
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java
Log:
[JBWS-3144] Additional checks in jbossws-cxf testsuites for default bus not being set multiple times
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2010-10-14 11:38:50 UTC (rev 13119)
@@ -21,6 +21,11 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-specific-tests</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.picketbox</groupId>
<artifactId>picketbox-bare</artifactId>
<scope>test</scope>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -27,8 +27,8 @@
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
public class AegisAnnotationTestCase extends JBossWSTest
{
@@ -36,7 +36,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(AegisAnnotationTestCase.class, "jaxws-aegis-annotation.war");
+ return new JBossWSCXFTestSetup(AegisAnnotationTestCase.class, "jaxws-aegis-annotation.war");
}
public void testAccessAnnotation() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -28,8 +28,8 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* To test configure bean by name auto wire
@@ -43,7 +43,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(JBossWSCXFConfigurerTestCase.class, "jaxws-cxf-configuration.war");
+ return new JBossWSCXFTestSetup(JBossWSCXFConfigurerTestCase.class, "jaxws-cxf-configuration.war");
}
//JBWS-3033
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -28,8 +28,8 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Test a CXF endpoint with provided jbossws-cxf.xml
@@ -44,7 +44,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(DescriptorJSETestCase.class, "jaxws-cxf-descriptor.war");
+ return new JBossWSCXFTestSetup(DescriptorJSETestCase.class, "jaxws-cxf-descriptor.war");
}
public void testLegalAccess() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -34,8 +34,8 @@
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.logging.Logger;
import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Trust 1.0 - Asymmetric binding interop test case
@@ -54,7 +54,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(AsymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
+ return new JBossWSCXFTestSetup(AsymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
}
public void testScenario9() throws Exception
@@ -97,7 +97,7 @@
SpringBusFactory busFactory = new SpringBusFactory();
URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml");
bus = busFactory.createBus(cxfConfig);
- BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
}
@Override
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -34,8 +34,8 @@
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.logging.Logger;
import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Trust 1.0 - Symmetric binding interop test case
@@ -53,7 +53,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
+ return new JBossWSCXFTestSetup(SymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
}
public void testScenario2() throws Exception
@@ -113,7 +113,7 @@
SpringBusFactory busFactory = new SpringBusFactory();
URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml");
bus = busFactory.createBus(cxfConfig);
- BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
}
@Override
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -30,8 +30,8 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Test @javax.xml.ws.WebServiceref with a custom CXF jaxws:client
@@ -46,7 +46,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(WebServiceRefServletTestCase.class, "jaxws-cxf-webserviceref.war");
+ return new JBossWSCXFTestSetup(WebServiceRefServletTestCase.class, "jaxws-cxf-webserviceref.war");
}
public void testDynamicProxy() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -29,8 +29,8 @@
import junit.framework.Test;
import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
import org.w3c.dom.Element;
/**
@@ -46,7 +46,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war,jaxws-cxf-wsrm-basic-client.jar");
+ return new JBossWSCXFTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war,jaxws-cxf-wsrm-basic-client.jar");
}
public void testWSDLAccess() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -29,8 +29,8 @@
import junit.framework.Test;
import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
import org.w3c.dom.Element;
/**
@@ -46,7 +46,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war,jaxws-cxf-wsrm-basic-client.jar");
+ return new JBossWSCXFTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war,jaxws-cxf-wsrm-basic-client.jar");
}
public void testWSDLAccess() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -40,9 +40,9 @@
import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* The test for cxf jms transport packaged in a jar file and deployed with jbossws-cxf.xml
@@ -56,7 +56,7 @@
public static Test suite() throws Exception
{
if (isHornetQAvailable()) {
- return new JBossWSTestSetup(JMSEndpointsTestCase.class, "hornetq-jmsendpoints-as6.sar, jaxws-samples-jmsendpoints-as6.jar");
+ return new JBossWSCXFTestSetup(JMSEndpointsTestCase.class, "hornetq-jmsendpoints-as6.sar, jaxws-samples-jmsendpoints-as6.jar");
} else {
return new TestSuite();
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -48,9 +48,9 @@
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* The test for cxf jms transport
@@ -65,7 +65,7 @@
{
if (isHornetQAvailable())
{
- return new JBossWSTestSetup(JMSTransportTestCase.class,
+ return new JBossWSCXFTestSetup(JMSTransportTestCase.class,
"hornetq-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war");
}
else
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -22,13 +22,15 @@
package org.jboss.test.ws.jaxws.samples.wsrm.client;
import java.net.URL;
+
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import junit.framework.Test;
+
+import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
/**
* Client invoking web service using WS-RM
@@ -42,7 +44,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war,jaxws-samples-wsrm-client.jar");
+ return new JBossWSCXFTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war,jaxws-samples-wsrm-client.jar");
}
@Override
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -35,8 +35,8 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security username authorization test case
@@ -51,7 +51,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(UsernameAuthorizationCustomFileTestCase.class, "jaxws-samples-wsse-username-authorize-custom.war");
+ return new JBossWSCXFTestSetup(UsernameAuthorizationCustomFileTestCase.class, "jaxws-samples-wsse-username-authorize-custom.war");
}
public void testAuthorizedCustomConfig() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -35,8 +35,8 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security username authorization test case
@@ -52,7 +52,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war");
+ return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war");
}
public void testAuthorized() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -35,8 +35,8 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security username test case
@@ -50,7 +50,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(UsernameTestCase.class,"jaxws-samples-wsse-username.war");
+ return new JBossWSCXFTestSetup(UsernameTestCase.class,"jaxws-samples-wsse-username.war");
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -35,8 +35,8 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security username authorization test case
@@ -52,7 +52,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war");
+ return new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war");
}
public void testAuthorized() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -22,13 +22,11 @@
package org.jboss.test.ws.jaxws.samples.wsseEJB;
import java.net.URL;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
import junit.framework.Test;
@@ -37,9 +35,8 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
-
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Secure EJB endpoint test
@@ -52,7 +49,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar");
+ return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar");
}
private EjbEndpoint getPort() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -31,8 +31,8 @@
import junit.framework.Test;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security Policy sign & encrypt test case
@@ -46,7 +46,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wssePolicy-sign-encrypt-client.jar jaxws-samples-wssePolicy-sign-encrypt.war");
+ return new JBossWSCXFTestSetup(SignEncryptTestCase.class, "jaxws-samples-wssePolicy-sign-encrypt-client.jar jaxws-samples-wssePolicy-sign-encrypt.war");
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -30,8 +30,8 @@
import junit.framework.Test;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security Policy username test case
@@ -48,7 +48,7 @@
System.setProperty("javax.net.ssl.trustStore", "/dati/truststore_abc");
System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
System.setProperty("javax.net.ssl.trustStoreType", "jks");
- return new JBossWSTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war");
+ return new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war");
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2010-10-14 11:38:50 UTC (rev 13119)
@@ -25,6 +25,12 @@
<artifactId>picketbox-bare</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<!-- Profiles -->
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -0,0 +1,78 @@
+/*
+ * 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.test;
+
+import junit.framework.Test;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.log4j.Logger;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBossWSCXFTestSetup extends JBossWSTestSetup
+{
+ private Bus defaultBus;
+
+ public JBossWSCXFTestSetup(Class<?> testClass, String archiveList)
+ {
+ super(testClass, archiveList);
+ }
+
+ public JBossWSCXFTestSetup(Test test, String archiveList)
+ {
+ super(test, archiveList);
+ }
+
+ public JBossWSCXFTestSetup(Test test)
+ {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ defaultBus = BusFactory.getDefaultBus(false);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ try
+ {
+ Bus afterTestsDefaultBus = BusFactory.getDefaultBus(false);
+
+ if (defaultBus == null && afterTestsDefaultBus != null)
+ {
+ Logger.getLogger(this.getClass()).info("Default CXF bus has been set during test execution");
+ }
+ else if (defaultBus != afterTestsDefaultBus)
+ {
+ throw new Exception("CXF Default bus changed during test: \nBEFORE: " + defaultBus + "\nAFTER: "
+ + afterTestsDefaultBus);
+ }
+ }
+ finally
+ {
+ defaultBus = null; //remove reference, to help GC
+ super.tearDown();
+ }
+ }
+}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -25,8 +25,8 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* A test case that verifies Bus references do not leak into EJB3 clients
@@ -39,7 +39,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(EJB3ClientBusTestCase.class, "jaxws-cxf-bus.jar");
+ return new JBossWSCXFTestSetup(EJB3ClientBusTestCase.class, "jaxws-cxf-bus.jar");
}
public void testSingleDeploy() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -27,8 +27,8 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Test required endorsing when using the CXF stack
@@ -42,7 +42,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(EndorseTestCase.class, "jaxws-cxf-endorse.war");
+ return new JBossWSCXFTestSetup(EndorseTestCase.class, "jaxws-cxf-endorse.war");
}
public void testClientSide()
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -23,22 +23,17 @@
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusImpl;
import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
@@ -49,8 +44,8 @@
import org.apache.cxf.transport.http.gzip.GZIPInInterceptor;
import org.apache.cxf.transport.http.gzip.GZIPOutInterceptor;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
*
@@ -66,7 +61,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.jar");
+ return new JBossWSCXFTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.jar");
}
public void testGZIPUsingFeatureOnBus() throws Exception
@@ -74,7 +69,7 @@
Bus bus = BusFactory.newInstance().createBus();
try
{
- BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
GZIPFeature gzipFeature = new GZIPFeature();
gzipFeature.setThreshold(0);
@@ -142,7 +137,7 @@
bus.getOutInterceptors().add(outInterceptor);
//add interceptor for decoding gzip message
bus.getInInterceptors().add(new GZIPEnforcingInInterceptor());
- BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
HelloWorld port = getPort();
assertEquals("foo", port.echo("foo"));
}
@@ -161,7 +156,7 @@
GZIPOutInterceptor outInterceptor = new GZIPOutInterceptor();
outInterceptor.setThreshold(1024*1024); // 1MB -> no gzip on request
bus.getOutInterceptors().add(outInterceptor);
- BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
HelloWorld port = getPort();
try
{
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -37,8 +37,8 @@
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.binding.JAXBBindingCustomization;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
import org.w3c.dom.Element;
/**
@@ -58,7 +58,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(JAXBIntroTestCase.class, "jaxws-cxf-jaxbintros.jar");
+ return new JBossWSCXFTestSetup(JAXBIntroTestCase.class, "jaxws-cxf-jaxbintros.jar");
}
public void testWSDLAccess() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -35,8 +35,8 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
*
@@ -54,7 +54,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(JBWS3060TestCase.class, "jaxws-cxf-jbws3060.jar");
+ return new JBossWSCXFTestSetup(JBWS3060TestCase.class, "jaxws-cxf-jbws3060.jar");
}
public void testAccess() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -34,8 +34,8 @@
import org.apache.cxf.endpoint.ClientLifeCycleListener;
import org.apache.cxf.endpoint.ClientLifeCycleManager;
import org.apache.cxf.endpoint.ServerLifeCycleManager;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Verifies the Bus is properly configured with Client/Server LifeCycleManager instances
@@ -50,7 +50,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(ClientServerLifeCycleTestCase.class, "jaxws-cxf-jbws3098.jar");
+ return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, "jaxws-cxf-jbws3098.jar");
}
public void testClientLifeCycleManager()
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -34,8 +34,8 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Tests configuration of message exchange logging using API
@@ -52,7 +52,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(MessageLoggingTestCase.class, "jaxws-cxf-logging.jar");
+ return new JBossWSCXFTestSetup(MessageLoggingTestCase.class, "jaxws-cxf-logging.jar");
}
public void testLoggingFeature() throws Exception
@@ -91,7 +91,7 @@
OutputStream out = new ByteArrayOutputStream();
myLoggingInterceptor.setPrintWriter(new PrintWriter(out, true));
bus.getInInterceptors().add(myLoggingInterceptor);
- BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
Service service = Service.create(wsdlURL, serviceName);
QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureEndpointPort");
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -8,14 +8,14 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
public class CXFManagementTestCase extends JBossWSTest
{
public static Test suite()
{
- return new JBossWSTestSetup(CXFManagementTestCase.class, "jaxws-cxf-management.war");
+ return new JBossWSCXFTestSetup(CXFManagementTestCase.class, "jaxws-cxf-management.war");
}
public void testJMXBean() throws Exception {
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -29,10 +29,11 @@
import javax.xml.ws.Service;
import junit.framework.Test;
+
import org.apache.cxf.helpers.IOUtils;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
/**
@@ -46,7 +47,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(MtomTestCase.class, "jaxws-samples-mtom.war");
+ return new JBossWSCXFTestSetup(MtomTestCase.class, "jaxws-samples-mtom.war");
}
public void testMtomWithProxy() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -23,6 +23,7 @@
import java.net.SocketTimeoutException;
import java.net.URL;
+
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
@@ -32,12 +33,11 @@
import junit.framework.Test;
import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.endpoint.ClientImpl;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Client invoking web service using WS-Addressing
@@ -50,7 +50,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war");
+ return new JBossWSCXFTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war");
}
/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -28,9 +28,9 @@
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* Client invoking web service with WS-RM and using no xml descriptor
@@ -46,7 +46,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(WSReliableMessagingWithAPITestCase.class, "jaxws-samples-wsrm-api.war");
+ return new JBossWSCXFTestSetup(WSReliableMessagingWithAPITestCase.class, "jaxws-samples-wsrm-api.war");
}
@Override
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java 2010-10-14 10:40:06 UTC (rev 13118)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java 2010-10-14 11:38:50 UTC (rev 13119)
@@ -37,7 +37,7 @@
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
/**
*
@@ -48,7 +48,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(SOAPConnectionTestCase.class, "saaj-soap-connection.war");
+ return new JBossWSCXFTestSetup(SOAPConnectionTestCase.class, "saaj-soap-connection.war");
}
public void testSoapConnectionPostWithoutChunkedEncoding() throws Exception
13 years, 6 months