JBossWS SVN: r3347 - in trunk: integration/native/src/main/resources/jbossws-native50.sar/META-INF and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 15:40:02 -0400 (Thu, 31 May 2007)
New Revision: 3347
Modified:
trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
Log:
Fix test regression
Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-31 19:40:02 UTC (rev 3347)
@@ -29,7 +29,9 @@
<bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.jbws.ManagedEndpointRegistry"/>
<!-- A subscription manager for WS-Eventing -->
- <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>
+ <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+ </bean>
<!-- Bind Service objects in client environment context -->
<!-- The bean name is compiled into the server. Changeit with the next release. -->
Modified: trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-05-31 19:40:02 UTC (rev 3347)
@@ -29,7 +29,9 @@
<bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.jbws.ManagedEndpointRegistry"/>
<!-- A subscription manager for WS-Eventing -->
- <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>
+ <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+ </bean>
<!-- Bind Service objects in client environment context -->
<!-- The bean name is compiled into the server. Changeit with the next release. -->
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -316,6 +316,8 @@
SerializerSupport ser = serFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, faultObject, serContext, null);
XMLFragment xmlFragment = new XMLFragment(result);
+ String xmlStr = xmlFragment.toXMLString();
+ log.debug("Fault detail: " + xmlStr);
Element domElement = xmlFragment.toElement();
SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -1,12 +1,10 @@
package org.jboss.ws.extensions.eventing.mgmt;
import java.net.URI;
-import java.util.Properties;
import javax.management.MBeanServerConnection;
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
-import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.Reference;
@@ -62,11 +60,8 @@
try
{
ObjectName objectName = SubscriptionManager.OBJECT_NAME;
- subscriptionManager = (SubscriptionManagerMBean)
- MBeanServerInvocationHandler.newProxyInstance(
- getServer(), objectName,
- SubscriptionManagerMBean.class, false
- );
+ subscriptionManager = (SubscriptionManagerMBean)MBeanServerInvocationHandler.newProxyInstance(getServer(), objectName, SubscriptionManagerMBean.class,
+ false);
}
catch (Exception e)
{
@@ -80,20 +75,11 @@
private MBeanServerConnection getServer() throws NamingException
{
// todo: bypass rmi adapter when used locally
- InitialContext iniCtx = getInitialContext();
+ InitialContext iniCtx = new InitialContext();
MBeanServerConnection server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
return server;
}
- private InitialContext getInitialContext() throws NamingException
- {
- Properties env = new Properties();
- env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.setProperty(Context.PROVIDER_URL, "jnp://"+hostname+":1099");
- return new InitialContext(env);
- }
-
void setHostname(String hostname)
{
if (null == hostname)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherFactory.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherFactory.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.extensions.eventing.mgmt;
import java.util.Hashtable;
@@ -36,9 +36,10 @@
* @author Heiko Braun, <heiko(a)openj.net>
* @since 11-Jan-2006
*/
-public class DispatcherFactory implements ObjectFactory {
- public Object getObjectInstance(Object object, Name name, Context context, Hashtable<?, ?> hashtable) throws Exception {
-
+public class DispatcherFactory implements ObjectFactory
+{
+ public Object getObjectInstance(Object object, Name name, Context context, Hashtable<?, ?> hashtable) throws Exception
+ {
Reference ref = (Reference)object;
String hostname = (String)ref.get(DispatcherDelegate.MANAGER_HOSTNAME).getContent();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -11,24 +11,28 @@
* @author Heiko Braun, <heiko(a)openj.net>
* @since 24-Jan-2006
*/
-public class EventingBuilder {
+public class EventingBuilder
+{
- private EventingBuilder() {
+ private EventingBuilder()
+ {
}
- public static EventingBuilder createEventingBuilder() {
+ public static EventingBuilder createEventingBuilder()
+ {
return new EventingBuilder();
}
- public EventSource newEventSource(EventingEndpointDeployment desc) {
+ public EventSource newEventSource(EventingEndpointDeployment desc)
+ {
URI eventSourceNS = newEventSourceURI(desc.getName());
EventSource eventSource = new EventSource(desc.getName(), eventSourceNS, desc.getSchema(), desc.getNotificationRootElementNS());
eventSource.getSupportedFilterDialects().add(EventingConstants.getDefaultFilterDialect());
return eventSource;
}
-
- public URI newEventSourceURI(String name) {
+ public URI newEventSourceURI(String name)
+ {
try
{
return new URI(name);
@@ -39,5 +43,4 @@
}
}
-
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -26,8 +26,10 @@
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
+import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -41,7 +43,6 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.xml.bind.JAXBElement;
@@ -61,7 +62,6 @@
import org.jboss.ws.extensions.eventing.jaxws.ReferenceParametersType;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
-import org.jboss.wsf.spi.utils.ObjectNameFactory;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -94,56 +94,60 @@
*/
public class SubscriptionManager implements SubscriptionManagerMBean, EventDispatcher
{
-
private static final Logger log = Logger.getLogger(SubscriptionManager.class);
- /**
- * Maps event source namespaces to event source instances.
- */
+ // Maps event source namespaces to event source instances.
private ConcurrentMap<URI, EventSource> eventSourceMapping = new ConcurrentHashMap<URI, EventSource>();
-
- /**
- * Maps subscriptions to event sources
- */
+ // Maps subscriptions to event sources
private ConcurrentMap<URI, List<Subscription>> subscriptionMapping = new ConcurrentHashMap<URI, List<Subscription>>();
-
- /**
- * Buffers notifications. FIFO ordering.
- */
+ // Buffers notifications. FIFO ordering.
private BlockingQueue<Runnable> eventQueue = new LinkedBlockingQueue<Runnable>();
-
- /**
- * Event dispatcher thread pool.
- */
+ // Event dispatcher thread pool.
private ThreadPoolExecutor threadPool;
-
+ // True force validation of every notification message against its schema
+ private boolean validateNotifications = false;
+ // subscription watchdog that maintains expirations
+ private WatchDog watchDog;
+ // True if dispatcher is bound to JNDI
private boolean isDispatcherBound = false;
+ // List containing all errors occured during notification since service startup
+ // TODO: save this list and made possible to resend failed notification using jms instead of list
+ private List<NotificationFailure> notificationFailures = new ArrayList<NotificationFailure>();
+ // The host that the dispatcher is bound to
+ private String bindAddress;
- /**
- * subscription watchdog that maintains expirations
- */
- private WatchDog watchDog;
-
private static EventingBuilder builder = EventingBuilder.createEventingBuilder();
+ public String getBindAddress()
+ {
+ if (bindAddress == null)
+ {
+ try
+ {
+ InetAddress localHost = InetAddress.getLocalHost();
+ log.debug("BindAddress not set, using host: " + localHost.getHostName());
+ bindAddress = localHost.getHostName();
+ }
+ catch (UnknownHostException e)
+ {
+ log.debug("BindAddress not set, using: 'localhost'");
+ bindAddress = "localhost";
+ }
+ }
+ return bindAddress;
+ }
- /**
- * List containing all errors occured during notification since service startup
- * todo: save this list and made possible to resend failed notification using jms instead of list
- */
- private List<NotificationFailure> notificationFailures = new ArrayList<NotificationFailure>();
+ public void setBindAddress(String bindAddress)
+ {
+ this.bindAddress = bindAddress;
+ }
- /**
- * True force validation of every notification message against its schema
- */
- private boolean validateNotifications = false;
-
public void create() throws Exception
{
MBeanServer server = getJMXServer();
if (server != null)
{
- if(log.isDebugEnabled()) log.debug("Create subscription manager");
+ log.debug("Create subscription manager");
server.registerMBean(this, OBJECT_NAME);
}
}
@@ -153,19 +157,19 @@
MBeanServer server = getJMXServer();
if (server != null)
{
- if(log.isDebugEnabled()) log.debug("Destroy subscription manager");
+ log.debug("Destroy subscription manager");
server.unregisterMBean(OBJECT_NAME);
}
}
public void start() throws Exception
{
- if(log.isDebugEnabled()) log.debug("Start subscription manager");
+ log.debug("Start subscription manager");
// setup thread pool
threadPool = new ThreadPoolExecutor(5, 15, // core/max num threads
- 5000, TimeUnit.MILLISECONDS, // 5 seconds keepalive
- eventQueue);
+ 5000, TimeUnit.MILLISECONDS, // 5 seconds keepalive
+ eventQueue);
// start the subscription watchdog
watchDog = new WatchDog(subscriptionMapping);
@@ -174,7 +178,7 @@
public void stop()
{
- if(log.isDebugEnabled()) log.debug("Stop subscription manager");
+ log.debug("Stop subscription manager");
try
{
// remove event dispatcher
@@ -224,7 +228,7 @@
updateManagerAddress(deploymentInfo, eventSource);
eventSource.setState(EventSource.State.CREATED);
- if(log.isDebugEnabled()) log.debug("Created: " + eventSource);
+ log.debug("Created: " + eventSource);
}
else
{
@@ -233,18 +237,18 @@
subscriptionMapping.put(eventSource.getNameSpace(), new CopyOnWriteArrayList<Subscription>());
eventSource.setState(EventSource.State.STARTED);
- if(log.isDebugEnabled()) log.debug("Started: " + eventSource);
+ log.debug("Started: " + eventSource);
}
}
private void lazyBindEventDispatcher()
{
- if(!isDispatcherBound)
+ if (!isDispatcherBound)
{
try
{
// bind dispatcher to JNDI
- Util.rebind(new InitialContext(), EventingConstants.DISPATCHER_JNDI_NAME, new DispatcherDelegate("localhost"));
+ Util.rebind(new InitialContext(), EventingConstants.DISPATCHER_JNDI_NAME, new DispatcherDelegate(getBindAddress()));
log.info("Bound event dispatcher to java:/" + EventingConstants.DISPATCHER_JNDI_NAME);
isDispatcherBound = true;
}
@@ -264,10 +268,10 @@
private static void updateManagerAddress(EventingEndpointDeployment deploymentInfo, EventSource eventSource)
{
String addr = null;
- if(deploymentInfo.getPortName().getLocalPart().equals("SubscriptionManagerPort"))
+ if (deploymentInfo.getPortName().getLocalPart().equals("SubscriptionManagerPort"))
addr = deploymentInfo.getEndpointAddress();
- if(addr!=null)
+ if (addr != null)
eventSource.setManagerAddress(addr);
}
@@ -283,18 +287,18 @@
subscriptions.clear();
eventSourceMapping.remove(eventSourceNS);
- if(log.isDebugEnabled()) log.debug("Event source " + eventSourceNS + " removed");
+ log.debug("Event source " + eventSourceNS + " removed");
}
}
/**
* Subscribe to an event source.
*/
- public SubscriptionTicket subscribe(URI eventSourceNS, EndpointReferenceType notifyTo, EndpointReferenceType endTo, Date expires, Filter filter) throws SubscriptionError
+ public SubscriptionTicket subscribe(URI eventSourceNS, EndpointReferenceType notifyTo, EndpointReferenceType endTo, Date expires, Filter filter)
+ throws SubscriptionError
{
+ log.debug("Subscription request for " + eventSourceNS);
- if(log.isDebugEnabled()) log.debug("Subscription request for " + eventSourceNS);
-
EventSource eventSource = eventSourceMapping.get(eventSourceNS);
if (null == eventSource)
throw new SubscriptionError(EventingConstants.CODE_UNABLE_TO_PROCESS, "EventSource '" + eventSourceNS + "' not registered");
@@ -337,18 +341,16 @@
attrURI.setValue(eventSource.getManagerAddress().toString());
epr.setAddress(attrURI);
ReferenceParametersType refParam = new ReferenceParametersType();
- JAXBElement idqn = new JAXBElement(
- new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "Identifier"),
- String.class, generateSubscriptionID().toString()
- );
+ JAXBElement idqn = new JAXBElement(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "Identifier"), String.class, generateSubscriptionID().toString());
refParam.getAny().add(idqn);
epr.setReferenceParameters(refParam);
Subscription subscription = new Subscription(eventSource.getNameSpace(), epr, notifyTo, endTo, expires, filter);
subscriptionMapping.get(eventSourceNS).add(subscription);
- if(log.isDebugEnabled()) log.debug("Registered subscription " + subscription.getIdentifier());
+ log.debug("Registered subscription " + subscription.getIdentifier());
+
return new SubscriptionTicket(epr, subscription.getExpires());
}
@@ -412,7 +414,7 @@
if (identifier.equals(s.getIdentifier()))
{
subscriptions.remove(s);
- if(log.isDebugEnabled()) log.debug("Removed subscription " + s);
+ log.debug("Removed subscription " + s);
break;
}
}
@@ -484,7 +486,8 @@
public void dispatch(URI eventSourceNS, Element payload)
{
DispatchJob dispatchJob = new DispatchJob(eventSourceNS, payload, subscriptionMapping);
- if (validateNotifications && !this.validateMessage(DOMWriter.printNode(payload,false),eventSourceNS)) {
+ if (validateNotifications && !this.validateMessage(DOMWriter.printNode(payload, false), eventSourceNS))
+ {
throw new DispatchException("Notification message validation failed!");
}
threadPool.execute(dispatchJob);
@@ -500,18 +503,20 @@
return notificationFailures;
}
- private boolean validateMessage(String msg, URI eventSourceNS) {
+ private boolean validateMessage(String msg, URI eventSourceNS)
+ {
try
{
EventSource es = eventSourceMapping.get(eventSourceNS);
- log.info(new StringBuffer("Validating message: \n\n").append(msg)
- .append("\n\nagainst the following schema(s): \n").toString());
- for (int i=0;i<es.getNotificationSchema().length;i++) {
+ log.info(new StringBuffer("Validating message: \n\n").append(msg).append("\n\nagainst the following schema(s): \n").toString());
+ for (int i = 0; i < es.getNotificationSchema().length; i++)
+ {
log.info(es.getNotificationSchema()[i]);
}
Element rootElement = DOMUtils.parse(msg);
- if (!es.getNotificationRootElementNS().equalsIgnoreCase(rootElement.getNamespaceURI())) {
- log.error("Root element expected namespace: "+es.getNotificationRootElementNS());
+ if (!es.getNotificationRootElementNS().equalsIgnoreCase(rootElement.getNamespaceURI()))
+ {
+ log.error("Root element expected namespace: " + es.getNotificationRootElementNS());
return false;
}
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -521,8 +526,9 @@
String[] notificationSchemas = es.getNotificationSchema();
InputSource[] is = new InputSource[notificationSchemas.length];
- for (int i=0; i<notificationSchemas.length; i++) {
- is[i] = new InputSource(new StringReader(notificationSchemas[notificationSchemas.length-1-i]));
+ for (int i = 0; i < notificationSchemas.length; i++)
+ {
+ is[i] = new InputSource(new StringReader(notificationSchemas[notificationSchemas.length - 1 - i]));
//is[i] = new InputSource(new StringReader(notificationSchemas[i]));
}
@@ -534,7 +540,8 @@
log.info("Document validated!");
return true;
}
- catch (Exception e) {
+ catch (Exception e)
+ {
log.error(e);
log.info("Cannot validate and/or parse the document!");
return false;
@@ -585,11 +592,13 @@
threadPool.setKeepAliveTime(millies, TimeUnit.MILLISECONDS);
}
- public boolean isValidateNotifications() {
+ public boolean isValidateNotifications()
+ {
return this.validateNotifications;
}
- public void setValidateNotifications(boolean validateNotifications) {
+ public void setValidateNotifications(boolean validateNotifications)
+ {
this.validateNotifications = validateNotifications;
}
@@ -660,14 +669,21 @@
}
- private class Validator extends DefaultErrorHandler {
- public void error(SAXParseException exception) throws SAXException {
+ private class Validator extends DefaultErrorHandler
+ {
+ public void error(SAXParseException exception) throws SAXException
+ {
throw new SAXException(exception);
}
- public void fatalError(SAXParseException exception) throws SAXException {
+
+ public void fatalError(SAXParseException exception) throws SAXException
+ {
throw new SAXException(exception);
}
- public void warning(SAXParseException exception) throws SAXException { }
+
+ public void warning(SAXParseException exception) throws SAXException
+ {
+ }
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -44,38 +44,32 @@
static final String BEAN_NAME = "WSSubscriptionManager";
+ String getBindAddress();
+
+ void setBindAddress(String bindAddress);
+
/**
* Returns the core number of threads.
- *
- * @return long
*/
int getCorePoolSize();
/**
* Returns the maximum allowed number of threads.
- *
- * @return int
*/
int getMaximumPoolSize();
/**
* Returns the largest number of threads that have ever simultaneously been in the pool.
- *
- * @return int
*/
int getLargestPoolSize();
/**
* Returns the approximate number of threads that are actively executing tasks.
- *
- * @return int
*/
int getActiveCount();
/**
* Returns the approximate total number of tasks that have completed execution.
- *
- * @return long
*/
long getCompletedTaskCount();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -66,6 +66,8 @@
import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
+import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult;
+import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner;
import org.jboss.ws.metadata.acessor.JAXBAccessor;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -94,9 +96,6 @@
import com.sun.xml.bind.api.JAXBRIContext;
import com.sun.xml.bind.api.TypeReference;
-import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult;
-import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner;
-
/**
* Abstract class that represents a JAX-WS metadata builder.
*
@@ -264,53 +263,48 @@
return handlerChainsMetaData;
}
- private void addFault(OperationMetaData omd, Class<?> exception)
+ private void addFault(OperationMetaData opMetaData, Class<?> exception)
{
- if (omd.isOneWay())
+ if (opMetaData.isOneWay())
throw new IllegalStateException("JSR-181 4.3.1 - A JSR-181 processor is REQUIRED to report an error if an operation marked "
+ "@Oneway has a return value, declares any checked exceptions or has any INOUT or OUT parameters.");
- WebFault annotation = exception.getAnnotation(WebFault.class);
+ WebFault anWebFault = exception.getAnnotation(WebFault.class);
- String name;
- String namespace;
- String faultBeanName = null;
-
// Only the element name is effected by @WebFault, the type uses the same convention
- QName xmlType = new QName(omd.getQName().getNamespaceURI(), exception.getSimpleName());
+ QName xmlType = new QName(opMetaData.getQName().getNamespaceURI(), exception.getSimpleName());
+ String name = xmlType.getLocalPart();
+ String namespace = xmlType.getNamespaceURI();
+
+ String faultBean = null;
+ Class faultBeanClass = getFaultInfo(exception);
+ if (faultBeanClass != null)
+ faultBean = faultBeanClass.getName();
+
/*
* If @WebFault is present, and the exception contains getFaultInfo, the
* return value should be used. Otherwise we need to generate the bean.
*/
- boolean generate = true;
- if (annotation != null)
+ if (anWebFault != null)
{
- name = annotation.name();
- namespace = annotation.targetNamespace();
- if (namespace.length() == 0)
- namespace = omd.getQName().getNamespaceURI();
+ if (anWebFault.name().length() > 0)
+ name = anWebFault.name();
- Class<?> faultBean = getFaultInfo(exception);
- if (faultBean != null)
- {
- generate = false;
- faultBeanName = faultBean.getName();
- }
+ if (anWebFault.targetNamespace().length() > 0)
+ namespace = anWebFault.targetNamespace();
+
+ if (anWebFault.faultBean().length() > 0)
+ faultBean = anWebFault.faultBean();
}
- else
- {
- name = xmlType.getLocalPart();
- namespace = xmlType.getNamespaceURI();
- }
- if (faultBeanName == null)
- faultBeanName = JavaUtils.getPackageName(omd.getEndpointMetaData().getServiceEndpointInterface()) + ".jaxws." + exception.getSimpleName() + "Bean";
+ if (faultBean == null)
+ faultBean = JavaUtils.getPackageName(opMetaData.getEndpointMetaData().getServiceEndpointInterface()) + ".jaxws." + exception.getSimpleName() + "Bean";
QName xmlName = new QName(namespace, name);
- FaultMetaData fmd = new FaultMetaData(omd, xmlName, xmlType, exception.getName());
- fmd.setFaultBeanName(faultBeanName);
+ FaultMetaData fmd = new FaultMetaData(opMetaData, xmlName, xmlType, exception.getName());
+ fmd.setFaultBeanName(faultBean);
if (fmd.loadFaultBean() == null)
wrapperGenerator.generate(fmd);
@@ -318,7 +312,7 @@
javaTypes.add(fmd.getFaultBean());
typeRefs.add(new TypeReference(fmd.getXmlName(), fmd.getFaultBean()));
- omd.addFault(fmd);
+ opMetaData.addFault(fmd);
}
private String convertToVariable(String localName)
@@ -407,12 +401,12 @@
return retMetaData;
}
- private Class<?> getFaultInfo(Class<?> exception)
+ private Class getFaultInfo(Class exception)
{
try
{
Method method = exception.getMethod("getFaultInfo");
- Class<?> returnType = method.getReturnType();
+ Class returnType = method.getReturnType();
if (returnType == void.class)
return null;
@@ -590,7 +584,7 @@
// Build parameter meta data
// Attachment annotations on SEI parameters
List<AttachmentScanResult> scanResult = ReflectiveAttachmentRefScanner.scanMethod(method);
-
+
Class[] parameterTypes = method.getParameterTypes();
Type[] genericTypes = method.getGenericParameterTypes();
Annotation[][] parameterAnnotations = method.getParameterAnnotations();
@@ -715,8 +709,8 @@
// insert at the beginning just for prettiness
wrappedOutputParameters.add(0, wrapped);
-
- processAttachmentAnnotationsWrapped(scanResult, -1, wrapped);
+
+ processAttachmentAnnotationsWrapped(scanResult, -1, wrapped);
}
else
{
@@ -796,12 +790,11 @@
private void processAttachmentAnnotationsWrapped(List<AttachmentScanResult> scanResult, int i, WrappedParameter wrappedParameter)
{
AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i);
- if(asr!=null)
+ if (asr != null)
{
- if(AttachmentScanResult.Type.SWA_REF == asr.getType())
+ if (AttachmentScanResult.Type.SWA_REF == asr.getType())
wrappedParameter.setSwaRef(true);
- else
- wrappedParameter.setXOP(true);
+ else wrappedParameter.setXOP(true);
}
}
@@ -814,12 +807,11 @@
private void processAttachmentAnnotations(List<AttachmentScanResult> scanResult, int i, ParameterMetaData parameter)
{
AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i);
- if(asr!=null)
+ if (asr != null)
{
- if(AttachmentScanResult.Type.SWA_REF == asr.getType())
+ if (AttachmentScanResult.Type.SWA_REF == asr.getType())
parameter.setSwaRef(true);
- else
- parameter.setXOP(true);
+ else parameter.setXOP(true);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -66,7 +66,7 @@
private Hello getPort() throws Exception
{
- URL wsdlURL = new File("WSProvideTask/resources/jaxws/samples/wssecurityAnnotatedpolicy/HelloService.wsdl").toURL();
+ URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy/HelloService.wsdl").toURL();
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurityAnnotatedpolicy", "HelloService");
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 17:11:33 UTC (rev 3346)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 19:40:02 UTC (rev 3347)
@@ -88,7 +88,7 @@
catch (SOAPFaultException e)
{
String faultString = e.getFault().getFaultString();
- assertTrue(faultString.indexOf("oh no, a runtime exception occured.") > 0);
+ assertTrue(faultString.indexOf("oh no, a runtime exception occured.") >= 0);
}
}
17 years, 6 months
- 1
- 0
JBossWS SVN: r3346 - trunk/integration/native/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 13:11:33 -0400 (Thu, 31 May 2007)
New Revision: 3346
Modified:
trunk/integration/native/ant-import/build-distro.xml
Log:
Fix distro thirdparty
Modified: trunk/integration/native/ant-import/build-distro.xml
===================================================================
--- trunk/integration/native/ant-import/build-distro.xml 2007-05-31 17:07:16 UTC (rev 3345)
+++ trunk/integration/native/ant-import/build-distro.xml 2007-05-31 17:11:33 UTC (rev 3346)
@@ -92,8 +92,14 @@
</copy>
<copy todir="${bindist.lib.dir}/thirdparty" overwrite="true">
<fileset dir="${core.dir}/thirdparty">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
<include name="juddi-service.sar"/>
<include name="policy.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</copy>
17 years, 6 months
- 1
- 0
JBossWS SVN: r3345 - in trunk: integration/spi/etc and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-31 13:07:16 -0400 (Thu, 31 May 2007)
New Revision: 3345
Added:
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java
trunk/jbossws-core/src/main/etc/log4j.properties
Modified:
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/spi/etc/wsprovide.sh
trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/etc/wsprovide.sh
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/BytecodeWrapperGenerator.java
Log:
SunRIProviderImpl first cut
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 17:00:16 UTC (rev 3344)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 17:07:16 UTC (rev 3345)
@@ -45,6 +45,7 @@
<include name="wsdl4j.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="policy.jar"/>
</fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
@@ -92,6 +93,7 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
+ <include name="policy.jar"/>
<include name="jbossws-integration-tools.jar"/>
<include name="jbossws-wsconsume-impl.jar"/>
@@ -152,6 +154,7 @@
<include name="wsdl4j.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="policy.jar"/>
</fileset>
</copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
@@ -185,6 +188,7 @@
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
+ <include name="policy.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-integration-tools.jar"/>
<include name="jbossws-wsconsume-impl.jar"/>
Modified: trunk/integration/spi/etc/wsprovide.sh
===================================================================
--- trunk/integration/spi/etc/wsprovide.sh 2007-05-31 17:00:16 UTC (rev 3344)
+++ trunk/integration/spi/etc/wsprovide.sh 2007-05-31 17:07:16 UTC (rev 3345)
@@ -38,7 +38,7 @@
fi
#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
# Setup JBoss sepecific properties
JAVA_OPTS="$JAVA_OPTS"
@@ -58,9 +58,13 @@
#
# shared libs
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
+
+# TODO: verify jbossall-client.jar dependency. It might be just logging
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar"
@@ -68,6 +72,8 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar"
# stack specific dependencies
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
@@ -81,7 +87,9 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
fi
# For Cygwin, switch paths to Windows format before running java
Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java (rev 0)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java 2007-05-31 17:07:16 UTC (rev 3345)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.sunri.tools;
+
+import org.jboss.wsf.spi.tools.WSContractProviderFactory;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class SunRIProviderFactoryImpl implements WSContractProviderFactory
+{
+ public WSContractProvider createProvider(ClassLoader loader)
+ {
+ WSContractProvider sunRIProvider = new SunRIProviderImpl();
+ sunRIProvider.setClassLoader(loader);
+ return sunRIProvider;
+ }
+}
Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java (rev 0)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java 2007-05-31 17:07:16 UTC (rev 3345)
@@ -0,0 +1,194 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.sunri.tools;
+
+import org.jboss.wsf.spi.tools.WSContractProvider;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.net.URLClassLoader;
+import java.net.URL;
+
+import com.sun.tools.ws.wscompile.WsgenTool;
+import com.sun.tools.ws.wscompile.WsgenOptions;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class SunRIProviderImpl extends WSContractProvider
+{
+
+ private ClassLoader loader;
+ private boolean generateWsdl = false;
+ private boolean generateSource = false;
+ private File outputDir = new File("output");
+ private File resourceDir = null;
+ private File sourceDir = null;
+ private PrintStream messageStream = new NullPrintStream();
+
+ public SunRIProviderImpl()
+ {
+ }
+
+ public void setGenerateWsdl(boolean generateWsdl)
+ {
+ this.generateWsdl = generateWsdl;
+ }
+
+ public void setGenerateSource(boolean generateSource)
+ {
+ this.generateSource = generateSource;
+ }
+
+ public void setOutputDirectory(File directory)
+ {
+ this.outputDir = directory;
+ }
+
+ public void setResourceDirectory(File directory)
+ {
+ this.resourceDir = directory;
+ }
+
+ public void setSourceDirectory(File directory)
+ {
+ this.sourceDir = directory;
+ }
+
+ public void setClassLoader(ClassLoader loader)
+ {
+ this.loader = loader;
+ }
+
+ public void setMessageStream(PrintStream messageStream)
+ {
+ this.messageStream = messageStream;
+ }
+
+ public void provide(String endpointClass)
+ {
+ try
+ {
+ provide(loader.loadClass(endpointClass));
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new IllegalArgumentException("Class not found: " + endpointClass);
+ }
+ }
+
+ public void provide(Class<?> endpointClass)
+ {
+ // Swap the context classloader
+ // The '--classpath' switch might provide an URLClassLoader
+ ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+
+ if(loader!=null)
+ Thread.currentThread().setContextClassLoader(loader);
+
+ try
+ {
+ List<String> args = new ArrayList<String>();
+
+ // Use the output directory as the default
+ File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir;
+ File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir;
+
+ if (generateSource) {
+ args.add("-keep");
+ if (sourceDir != null) {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+
+ args.add("-s");
+ args.add(sourceDir.getAbsolutePath());
+ }
+ }
+
+ // -d <directory>
+ if (!outputDir.exists() && !outputDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + outputDir.getName());
+
+ args.add("-d");
+ args.add(outputDir.getAbsolutePath());
+
+ // -r <directory>
+ if (resourceDir != null) {
+ if (!resourceDir.exists() && !resourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + resourceDir.getName());
+ args.add("-r");
+ args.add(resourceDir.getAbsolutePath());
+ }
+
+ // -s <directory>
+ if (sourceDir != null) {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+ args.add("-s");
+ args.add(sourceDir.getAbsolutePath());
+ }
+
+ // -verbose
+ PrintStream stream = messageStream;
+ if (stream != null) {
+ args.add("-verbose");
+ } else {
+ stream = new NullPrintStream();
+ }
+
+ // -wsdl[:protocol]
+ if (generateWsdl) {
+ args.add("-wsdl");
+ }
+
+ // --classpath
+ if(loader instanceof URLClassLoader)
+ {
+ StringBuilder builder = new StringBuilder();
+ URLClassLoader urlLoader = (URLClassLoader)loader;
+ for(URL url : urlLoader.getURLs())
+ {
+ builder.append(url.toExternalForm());
+ builder.append(File.pathSeparator);
+ }
+
+ args.add("-classpath");
+ args.add(builder.toString());
+ }
+
+ // the SEI
+ args.add(endpointClass.getCanonicalName());
+
+ WsgenTool tool = new WsgenTool(messageStream);
+ tool.run(args.toArray(new String[0]));
+
+ }
+ finally{
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
+ }
+
+
+}
Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl 2007-05-31 17:00:16 UTC (rev 3344)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl 2007-05-31 17:07:16 UTC (rev 3345)
@@ -1 +1 @@
-FIXME: JBWS-1667 (Implement WSContractProvider for Sun-RI integration)
\ No newline at end of file
+org.jboss.wsf.stack.sunri.tools.SunRIProviderFactoryImpl
\ No newline at end of file
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-05-31 17:00:16 UTC (rev 3344)
+++ trunk/jbossws-core/build.xml 2007-05-31 17:07:16 UTC (rev 3345)
@@ -12,234 +12,237 @@
<!-- $Id$ -->
<project default="main" basedir="..">
-
- <import file="${basedir}/build/ant-import/build-setup.xml"/>
- <import file="${core.dir}/ant-import/build-deploy.xml"/>
- <import file="${core.dir}/ant-import/build-release.xml"/>
- <import file="${core.dir}/ant-import/build-thirdparty.xml"/>
- <import file="${core.dir}/ant-import-tests/build-testsuite.xml"/>
-
- <property name="core.src.dir" value="${core.dir}/src/main"/>
- <property name="core.etc.dir" value="${core.src.dir}/etc"/>
- <property name="core.java.dir" value="${core.src.dir}/java"/>
- <property name="core.resources.dir" value="${core.src.dir}/resources"/>
- <property name="core.samples.dir" value="${core.resources.dir}/samples"/>
- <property name="core.output.dir" value="${core.dir}/output"/>
- <property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/>
- <property name="core.output.etc.dir" value="${core.output.dir}/etc"/>
- <property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
- <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
- <property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <target name="init" depends="prepare,thirdparty-get">
- <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc"
- description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="init">
-
- <!-- Compile interfaces with jdk1.4 -->
- <mkdir dir="${core.output.classes14.dir}"/>
- <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
- <include name="javax/xml/rpc/**"/>
- <include name="javax/xml/soap/**"/>
- <classpath refid="thirdparty.classpath"/>
- </javac>
-
- <!-- Compile core classes with jdk1.5 -->
- <mkdir dir="${core.output.classes.dir}"/>
- <javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
- <include name="javax/annotation/**"/>
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
- <include name="org/jboss/annotation/**"/>
- <include name="org/jboss/ws/**"/>
- <classpath path="${core.output.classes14.dir}"/>
- <classpath refid="thirdparty.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${core.output.etc.dir}"/>
- <copy todir="${core.output.etc.dir}" filtering="yes">
- <fileset dir="${core.etc.dir}"/>
- <fileset dir="${build.dir}/etc">
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${build.dir}/version.properties"/>
- <filtersfile file="${core.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars">
-
- <!-- Build jboss-jaxrpc.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes14.dir}">
- <include name="javax/xml/rpc/**"/>
- </fileset>
- </jar>
-
- <!-- Build jboss-saaj.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes14.dir}">
- <include name="javax/xml/soap/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
- </jar>
-
- <!-- Build jboss-jaxws.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="javax/annotation/**"/>
- <include name="javax/jws/**"/>
- <include name="javax/xml/ws/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-core.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="org/jboss/annotation/**"/>
- <include name="org/jboss/ws/**"/>
- </fileset>
- <fileset dir="${core.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jbossws-core.jar"/>
- </jar>
-
- <!-- Build jbossws-client.jar -->
- <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="org/jboss/wsf/**"/>
- <include name="org/jboss/ws/**"/>
- </fileset>
- <fileset dir="${core.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/standard-config">
- <include name="standard-jaxrpc-client-config.xml"/>
- <include name="standard-jaxws-client-config.xml"/>
- </metainf>
- </jar>
+ <import file="${basedir}/build/ant-import/build-setup.xml"/>
- <!-- Build jbossws-resources.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-resources.zip" >
- <fileset dir="${core.resources.dir}/standard-config">
- <include name="standard-*-config.xml"/>
- </fileset>
- <fileset dir="${core.output.etc.dir}">
- <include name="wsprovide.bat"/>
- <include name="wsconsume.bat"/>
- <include name="wsrunclient.bat"/>
- <include name="wstools.bat"/>
- </fileset>
- <zipfileset dir="${core.output.etc.dir}" filemode="755">
- <include name="wsprovide.sh"/>
- <include name="wsconsume.sh"/>
- <include name="wsrunclient.sh"/>
- <include name="wstools.sh"/>
- </zipfileset>
- </zip>
-
- <!-- Build jbossws-src.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" >
- <fileset dir="${core.java.dir}"/>
- </zip>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Documentation -->
- <!-- ================================================================== -->
+ <import file="${core.dir}/ant-import/build-deploy.xml"/>
+ <import file="${core.dir}/ant-import/build-release.xml"/>
+ <import file="${core.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${core.dir}/ant-import-tests/build-testsuite.xml"/>
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc">
+ <property name="core.src.dir" value="${core.dir}/src/main"/>
+ <property name="core.etc.dir" value="${core.src.dir}/etc"/>
+ <property name="core.java.dir" value="${core.src.dir}/java"/>
+ <property name="core.resources.dir" value="${core.src.dir}/resources"/>
+ <property name="core.samples.dir" value="${core.resources.dir}/samples"/>
+ <property name="core.output.dir" value="${core.dir}/output"/>
+ <property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/>
+ <property name="core.output.etc.dir" value="${core.output.dir}/etc"/>
+ <property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
+ <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
+ <property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
- <mkdir dir="${core.output.apidocs.dir}"/>
- <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath refid="core.classpath"/>
- <packageset dir="${core.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/ws/**"/>
- </packageset>
- <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <group title="Core" packages="org.jboss.ws.core*"/>
- <group title="Metadata" packages="org.jboss.ws.metadata*"/>
- <group title="Integration" packages="org.jboss.ws.integration*"/>
- <group title="Extensions" packages="org.jboss.ws.extensions*"/>
- <group title="Tools" packages="org.jboss.ws.tools*"/>
- </javadoc>
- </target>
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${core.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${core.dir}/output-tests"/>
- <delete dir="${core.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars,tests-jars"/>
-
- <target name="all" description="Create a distribution zip file" depends="most">
- </target>
-
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <target name="init" depends="prepare,thirdparty-get">
+ <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="init,compile-classes,compile-etc"
+ description="Compile all source files."/>
+
+ <!-- Compile java sources -->
+ <target name="compile-classes" depends="init">
+
+ <!-- Compile interfaces with jdk1.4 -->
+ <mkdir dir="${core.output.classes14.dir}"/>
+ <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
+ <include name="javax/xml/rpc/**"/>
+ <include name="javax/xml/soap/**"/>
+ <classpath refid="thirdparty.classpath"/>
+ </javac>
+
+ <!-- Compile core classes with jdk1.5 -->
+ <mkdir dir="${core.output.classes.dir}"/>
+ <javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
+ <include name="javax/annotation/**"/>
+ <include name="javax/xml/ws/**"/>
+ <include name="javax/jws/**"/>
+ <include name="org/jboss/annotation/**"/>
+ <include name="org/jboss/ws/**"/>
+ <classpath path="${core.output.classes14.dir}"/>
+ <classpath refid="thirdparty.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${core.output.etc.dir}"/>
+ <copy todir="${core.output.etc.dir}" filtering="yes">
+ <fileset dir="${core.etc.dir}"/>
+ <fileset dir="${build.dir}/etc">
+ <include name="default.mf"/>
+ </fileset>
+ <filterset>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="implementation.version" value="jbossws-${version.id}"/>
+ <filtersfile file="${build.dir}/version.properties"/>
+ <filtersfile file="${core.dir}/version.properties"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+
+ <!-- Build jboss-jaxrpc.jar -->
+ <mkdir dir="${core.output.lib.dir}"/>
+ <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes14.dir}">
+ <include name="javax/xml/rpc/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-saaj.jar -->
+ <mkdir dir="${core.output.lib.dir}"/>
+ <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes14.dir}">
+ <include name="javax/xml/soap/**"/>
+ </fileset>
+ <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jboss-jaxws.jar -->
+ <mkdir dir="${core.output.lib.dir}"/>
+ <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes.dir}">
+ <include name="javax/annotation/**"/>
+ <include name="javax/jws/**"/>
+ <include name="javax/xml/ws/**"/>
+ </fileset>
+ <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws-core.jar -->
+ <mkdir dir="${core.output.lib.dir}"/>
+ <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes.dir}">
+ <include name="org/jboss/annotation/**"/>
+ <include name="org/jboss/ws/**"/>
+ </fileset>
+ <fileset dir="${core.resources.dir}">
+ <include name="schema/**"/>
+ <include name="dtd/**"/>
+ </fileset>
+ <metainf dir="${core.resources.dir}/jbossws-core.jar"/>
+ </jar>
+
+ <!-- Build jbossws-client.jar -->
+ <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes.dir}">
+ <include name="org/jboss/wsf/**"/>
+ <include name="org/jboss/ws/**"/>
+ </fileset>
+ <fileset dir="${core.resources.dir}">
+ <include name="schema/**"/>
+ <include name="dtd/**"/>
+ </fileset>
+ <fileset dir="${core.etc.dir}">
+ <include name="log4j.properties"/>
+ </fileset>
+ <metainf dir="${core.resources.dir}/standard-config">
+ <include name="standard-jaxrpc-client-config.xml"/>
+ <include name="standard-jaxws-client-config.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- Build jbossws-resources.zip -->
+ <zip zipfile="${core.output.lib.dir}/jbossws-resources.zip" >
+ <fileset dir="${core.resources.dir}/standard-config">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ <fileset dir="${core.output.etc.dir}">
+ <include name="wsprovide.bat"/>
+ <include name="wsconsume.bat"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wstools.bat"/>
+ </fileset>
+ <zipfileset dir="${core.output.etc.dir}" filemode="755">
+ <include name="wsprovide.sh"/>
+ <include name="wsconsume.sh"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.sh"/>
+ </zipfileset>
+ </zip>
+
+ <!-- Build jbossws-src.zip -->
+ <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" >
+ <fileset dir="${core.java.dir}"/>
+ </zip>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Documentation -->
+ <!-- ================================================================== -->
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+ <mkdir dir="${core.output.apidocs.dir}"/>
+ <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath refid="core.classpath"/>
+ <packageset dir="${core.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/ws/**"/>
+ </packageset>
+ <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+ <group title="Core" packages="org.jboss.ws.core*"/>
+ <group title="Metadata" packages="org.jboss.ws.metadata*"/>
+ <group title="Integration" packages="org.jboss.ws.integration*"/>
+ <group title="Extensions" packages="org.jboss.ws.extensions*"/>
+ <group title="Tools" packages="org.jboss.ws.tools*"/>
+ </javadoc>
+ </target>
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${core.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ <delete dir="${core.dir}/output-tests"/>
+ <delete dir="${core.dir}/thirdparty"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jars,tests-jars"/>
+
+ <target name="all" description="Create a distribution zip file" depends="most">
+ </target>
+
</project>
Added: trunk/jbossws-core/src/main/etc/log4j.properties
===================================================================
--- trunk/jbossws-core/src/main/etc/log4j.properties (rev 0)
+++ trunk/jbossws-core/src/main/etc/log4j.properties 2007-05-31 17:07:16 UTC (rev 3345)
@@ -0,0 +1,15 @@
+
+#
+# The default JAX-WS tools logging config
+# Should be shipped with jbossws-client.jar
+#
+# @author Heiko.Braun(a)jboss.com
+#
+
+log4j.rootLogger=debug, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
Property changes on: trunk/jbossws-core/src/main/etc/log4j.properties
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/main/etc/wsprovide.sh
===================================================================
--- trunk/jbossws-core/src/main/etc/wsprovide.sh 2007-05-31 17:00:16 UTC (rev 3344)
+++ trunk/jbossws-core/src/main/etc/wsprovide.sh 2007-05-31 17:07:16 UTC (rev 3345)
@@ -38,7 +38,7 @@
fi
#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
# Setup JBoss sepecific properties
JAVA_OPTS="$JAVA_OPTS"
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/BytecodeWrapperGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/BytecodeWrapperGenerator.java 2007-05-31 17:00:16 UTC (rev 3344)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/BytecodeWrapperGenerator.java 2007-05-31 17:07:16 UTC (rev 3345)
@@ -71,7 +71,14 @@
public void write(File directory) throws IOException
{
- stream.println("Writing Classes:");
+
+ if(typeNames.isEmpty())
+ {
+ System.out.println("No Classes to generate...");
+ return;
+ }
+
+ stream.println("Writing Classes:");
for (String name : typeNames)
{
try
17 years, 6 months
- 1
- 0
JBossWS SVN: r3344 - in trunk: integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 13:00:16 -0400 (Thu, 31 May 2007)
New Revision: 3344
Modified:
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoint.java
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java
Log:
SunRI samples/httpbinding
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java 2007-05-31 16:56:18 UTC (rev 3343)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java 2007-05-31 17:00:16 UTC (rev 3344)
@@ -23,6 +23,8 @@
//$Id$
+import javax.xml.ws.BindingType;
+
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -48,6 +50,12 @@
String urlPattern = ep.getURLPattern();
DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern);
+
+ Class beanClass = ep.getTargetBeanClass();
+ BindingType anBindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
+ if (anBindingType != null && anBindingType.value().length() > 0)
+ ddep.setBinding(anBindingType.value());
+
log.info("Add " + ddep);
dd.addEndpoint(ddep);
}
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoint.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-31 16:56:18 UTC (rev 3343)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-31 17:00:16 UTC (rev 3344)
@@ -23,8 +23,11 @@
import java.io.IOException;
import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.namespace.QName;
+import javax.xml.ws.http.HTTPBinding;
import javax.xml.ws.soap.SOAPBinding;
//$Id$
@@ -55,6 +58,15 @@
private boolean enableMTOM;
// Optional handler chain
private DDHandlerChain handlerChain;
+
+ // The list of valid bindings
+ static final List<String> validBindings = new ArrayList<String>();
+ static
+ {
+ validBindings.add(SOAPBinding.SOAP11HTTP_BINDING);
+ validBindings.add(SOAPBinding.SOAP12HTTP_BINDING);
+ validBindings.add(HTTPBinding.HTTP_BINDING);
+ }
public DDEndpoint(String name, String impl, String urlPattern)
{
@@ -68,7 +80,6 @@
this.name = name;
this.implementation = impl;
this.urlPattern = urlPattern;
- this.binding = SOAPBinding.SOAP11HTTP_BINDING;
}
public String getName()
@@ -93,7 +104,7 @@
public void setBinding(String binding)
{
- if (!SOAPBinding.SOAP11HTTP_BINDING.equals(binding) && !SOAPBinding.SOAP12HTTP_BINDING.equals(binding))
+ if (validBindings.contains(binding) == false)
throw new IllegalArgumentException("Invalid binding: " + binding);
this.binding = binding;
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-31 16:56:18 UTC (rev 3343)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-31 17:00:16 UTC (rev 3344)
@@ -5,7 +5,7 @@
# [JBWS-1699] - Fix WebServiceContext.getMessageContext()
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-org/jboss/test/ws/jaxws/samples/httpbinding/**
+#org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/jaxr/**
org/jboss/test/ws/jaxws/samples/logicalhandler/**
org/jboss/test/ws/jaxws/samples/oneway/**
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-05-31 16:56:18 UTC (rev 3343)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-05-31 17:00:16 UTC (rev 3344)
@@ -77,7 +77,7 @@
Element root = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray()));
String oldValue = DOMUtils.getTextContent(root);
- String newValue = oldValue + ":" + direction + getHandlerName();
+ String newValue = oldValue + ":" + direction + "LogicalHandler";
root.setTextContent(newValue);
log.debug("oldValue: " + oldValue);
17 years, 6 months
- 1
- 0
JBossWS SVN: r3343 - trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 12:56:18 -0400 (Thu, 31 May 2007)
New Revision: 3343
Modified:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
Log:
Restore "jaxws" suffix
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-31 16:37:49 UTC (rev 3342)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-31 16:56:18 UTC (rev 3343)
@@ -60,8 +60,8 @@
private void checkWrapperSource(File outputDir, boolean shouldExist)
{
- File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/SubmitPO.java");
- File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/SubmitPOResponse.java");
+ File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPO.java");
+ File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPOResponse.java");
assertEquals(shouldExist, file1.exists());
assertEquals(shouldExist, file2.exists());
}
@@ -72,12 +72,12 @@
URLClassLoader classLoader = new URLClassLoader(new URL[]{outputDir.toURL()}, Thread.currentThread().getContextClassLoader());
// Check request wrapper
- Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.SubmitPO", classLoader);
+ Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.SubmitPO", classLoader);
wrapper.getMethod("setPurchaseOrder", PurchaseOrder.class);
assertEquals(PurchaseOrder.class.getName(), wrapper.getMethod("getPurchaseOrder").getReturnType().getName());
// Check response wrapper
- wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.SubmitPOResponse", classLoader);
+ wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.SubmitPOResponse", classLoader);
wrapper.getMethod("setPurchaseOrderAck", PurchaseOrderAck.class);
assertEquals(PurchaseOrderAck.class.getName(), wrapper.getMethod("getPurchaseOrderAck").getReturnType().getName());
}
17 years, 6 months
- 1
- 0
JBossWS SVN: r3342 - in trunk: testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 12:37:49 -0400 (Thu, 31 May 2007)
New Revision: 3342
Modified:
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointWithHandlerChain.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java
Log:
SunRI samples/handlerchain
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-31 16:06:53 UTC (rev 3341)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-31 16:37:49 UTC (rev 3342)
@@ -5,7 +5,6 @@
# [JBWS-1699] - Fix WebServiceContext.getMessageContext()
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-org/jboss/test/ws/jaxws/samples/handlerchain/**
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/jaxr/**
org/jboss/test/ws/jaxws/samples/logicalhandler/**
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2007-05-31 16:06:53 UTC (rev 3341)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2007-05-31 16:37:49 UTC (rev 3342)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.handlerchain;
+import java.util.Arrays;
+
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.handler.MessageContext;
@@ -59,7 +61,7 @@
MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
String[] cookies = mimeHeaders.getHeader("Set-Cookie");
if (cookies == null || cookies.length != 1 || !cookies[0].equals("server-cookie=true"))
- throw new IllegalStateException("Unexpected cookie list: " + mimeHeaders);
+ throw new IllegalStateException("Unexpected cookie list: " + (cookies != null ? Arrays.asList(cookies) : null));
return true;
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.java 2007-05-31 16:06:53 UTC (rev 3341)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.java 2007-05-31 16:37:49 UTC (rev 3342)
@@ -24,7 +24,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-@WebService
+@WebService(name="Endpoint")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public interface Endpoint
{
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.java 2007-05-31 16:06:53 UTC (rev 3341)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.java 2007-05-31 16:37:49 UTC (rev 3342)
@@ -34,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 08-Oct-2005
*/
-@WebService
+@WebService(name="Endpoint")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@HandlerChain(file = "jaxws-handlers-server.xml") // relative path from the class file
public class EndpointImpl
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointWithHandlerChain.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointWithHandlerChain.java 2007-05-31 16:06:53 UTC (rev 3341)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/EndpointWithHandlerChain.java 2007-05-31 16:37:49 UTC (rev 3342)
@@ -25,7 +25,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-@WebService
+@WebService(name="Endpoint")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@HandlerChain(file = "jaxws-handlers-client.xml") // relative path from the class file
public interface EndpointWithHandlerChain
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-05-31 16:37:49 UTC (rev 3342)
@@ -63,7 +63,14 @@
handlerChain.add(new LogHandler());
handlerChain.add(new AuthorizationHandler());
handlerChain.add(new RoutingHandler());
- handlerChain.add(new ClientMimeHandler());
+ if (isIntegrationNative())
+ {
+ handlerChain.add(new ClientMimeHandler());
+ }
+ else
+ {
+ System.out.println("FIXME: [JBWS-1671] SunRI client handler cannot set mime header");
+ }
bindingProvider.getBinding().setHandlerChain(handlerChain);
String resStr = port.echo("Kermit");
@@ -78,6 +85,12 @@
Service service = Service.create(wsdlURL, serviceName);
EndpointWithHandlerChain port = (EndpointWithHandlerChain)service.getPort(EndpointWithHandlerChain.class);
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
+ return;
+ }
+
String resStr = port.echo("Kermit");
assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java 2007-05-31 16:06:53 UTC (rev 3341)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java 2007-05-31 16:37:49 UTC (rev 3342)
@@ -55,7 +55,7 @@
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- SOAPHeader soapHeader = soapMessage.getSOAPHeader();
+ SOAPHeader soapHeader = getFailsafeSOAPHeader(soapMessage);
SOAPBody soapBody = soapMessage.getSOAPBody();
SOAPFactory soapFactory = SOAPFactory.newInstance();
@@ -83,9 +83,9 @@
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- SOAPHeader soapHeader = soapMessage.getSOAPHeader();
+ SOAPHeader soapHeader = getFailsafeSOAPHeader(soapMessage);
SOAPBody soapBody = soapMessage.getSOAPBody();
-
+
SOAPFactory soapFactory = SOAPFactory.newInstance();
Name headerName = soapFactory.createName("LogHandlerOutbound", "ns1", "http://somens");
SOAPHeaderElement she = soapHeader.addHeaderElement(headerName);
@@ -103,4 +103,14 @@
return true;
}
+
+ private SOAPHeader getFailsafeSOAPHeader(SOAPMessage soapMessage) throws SOAPException
+ {
+ SOAPHeader soapHeader = soapMessage.getSOAPHeader();
+ if (soapHeader == null)
+ {
+ soapHeader = soapMessage.getSOAPPart().getEnvelope().addHeader();
+ }
+ return soapHeader;
+ }
}
17 years, 6 months
- 1
- 0
JBossWS SVN: r3341 - in trunk: integration/spi/src/main/java/org/jboss/wsf/spi/test and 204 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 12:06:53 -0400 (Thu, 31 May 2007)
New Revision: 3341
Added:
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java
Removed:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java
trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java
trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java
trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java
trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java
trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java
trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java
Modified:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
Move test helpers to spi
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -0,0 +1,289 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.spi.test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import javax.management.MBeanServerConnection;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import junit.framework.TestCase;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.utils.DOMWriter;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Base class for JBossWS test cases
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public abstract class JBossWSTest extends TestCase
+{
+ // provide logging
+ protected Logger log = Logger.getLogger(getClass().getName());
+
+ private JBossWSTestHelper delegate = new JBossWSTestHelper();
+
+ public JBossWSTest()
+ {
+ }
+
+ public JBossWSTest(String name)
+ {
+ super(name);
+ }
+
+ /** Get the MBeanServerConnection from JNDI */
+ public MBeanServerConnection getServer() throws NamingException
+ {
+ return delegate.getServer();
+ }
+
+ public boolean isTargetJBoss50()
+ {
+ return delegate.isTargetJBoss50();
+ }
+
+ public boolean isTargetJBoss42()
+ {
+ return delegate.isTargetJBoss42();
+ }
+
+ public boolean isIntegrationNative()
+ {
+ return delegate.isIntegrationNative();
+
+ }
+
+ public boolean isIntegrationSunRI()
+ {
+ return delegate.isIntegrationSunRI();
+ }
+
+ public boolean isIntegrationXFire()
+ {
+ return delegate.isIntegrationXFire();
+ }
+
+ /** Deploy the given archive
+ */
+ public void deploy(String archive) throws Exception
+ {
+ delegate.deploy(archive);
+ }
+
+ /** Undeploy the given archive
+ */
+ public void undeploy(String archive) throws Exception
+ {
+ delegate.undeploy(archive);
+ }
+
+ public String getServerHost()
+ {
+ return delegate.getServerHost();
+ }
+
+ /** Get the client's env context for a given name.
+ */
+ protected InitialContext getInitialContext(String clientName) throws NamingException
+ {
+ InitialContext iniCtx = new InitialContext();
+ Hashtable env = iniCtx.getEnvironment();
+ env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
+ env.put("j2ee.clientName", clientName);
+ return new InitialContext(env);
+ }
+
+ /** Get the client's env context
+ */
+ protected InitialContext getInitialContext() throws NamingException
+ {
+ return getInitialContext("jbossws-client");
+ }
+
+ public boolean hasJDK15()
+ {
+ try
+ {
+ Class.forName("java.lang.Enum");
+ return true;
+ }
+ catch (ClassNotFoundException ex)
+ {
+ return false;
+ }
+ }
+
+ public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace)
+ {
+ normalizeWhitspace(expElement, ignoreWhitespace);
+ normalizeWhitspace(wasElement, ignoreWhitespace);
+ String expStr = DOMWriter.printNode(expElement, false);
+ String wasStr = DOMWriter.printNode(wasElement, false);
+ if (expStr.equals(wasStr) == false)
+ {
+ System.out.println("\nExp: " + expStr + "\nWas: " + wasStr);
+ Logger.getLogger(JBossWSTest.class).error("\nExp: " + expStr + "\nWas: " + wasStr);
+ }
+ assertEquals(expStr, wasStr);
+ }
+
+ public static void assertEquals(Element expElement, Element wasElement)
+ {
+ assertEquals(expElement, wasElement, false);
+ }
+
+ public static void assertEquals(Object exp, Object was)
+ {
+ if (exp instanceof Object[] && was instanceof Object[])
+ assertEqualsArray((Object[])exp, (Object[])was);
+ else if (exp instanceof byte[] && was instanceof byte[])
+ assertEqualsArray((byte[])exp, (byte[])was);
+ else if (exp instanceof boolean[] && was instanceof boolean[])
+ assertEqualsArray((boolean[])exp, (boolean[])was);
+ else if (exp instanceof short[] && was instanceof short[])
+ assertEqualsArray((short[])exp, (short[])was);
+ else if (exp instanceof int[] && was instanceof int[])
+ assertEqualsArray((int[])exp, (int[])was);
+ else if (exp instanceof long[] && was instanceof long[])
+ assertEqualsArray((long[])exp, (long[])was);
+ else if (exp instanceof float[] && was instanceof float[])
+ assertEqualsArray((float[])exp, (float[])was);
+ else if (exp instanceof double[] && was instanceof double[])
+ assertEqualsArray((double[])exp, (double[])was);
+ else TestCase.assertEquals(exp, was);
+ }
+
+ private static void assertEqualsArray(Object[] exp, Object[] was)
+ {
+ if (exp == null && was == null)
+ return;
+
+ if (exp != null && was != null)
+ {
+ if (exp.length != was.length)
+ {
+ fail("Expected <" + exp.length + "> array items, but was <" + was.length + ">");
+ }
+ else
+ {
+ for (int i = 0; i < exp.length; i++)
+ {
+
+ Object compExp = exp[i];
+ Object compWas = was[i];
+ assertEquals(compExp, compWas);
+ }
+ }
+ }
+ else if (exp == null)
+ {
+ fail("Expected a null array, but was: " + Arrays.asList(was));
+ }
+ else if (was == null)
+ {
+ fail("Expected " + Arrays.asList(exp) + ", but was: null");
+ }
+ }
+
+ private static void assertEqualsArray(byte[] exp, byte[] was)
+ {
+ assertTrue("Arrays don't match", Arrays.equals(exp, was));
+ }
+
+ private static void assertEqualsArray(boolean[] exp, boolean[] was)
+ {
+ assertTrue("Arrays don't match", Arrays.equals(exp, was));
+ }
+
+ private static void assertEqualsArray(short[] exp, short[] was)
+ {
+ assertTrue("Arrays don't match", Arrays.equals(exp, was));
+ }
+
+ private static void assertEqualsArray(int[] exp, int[] was)
+ {
+ assertTrue("Arrays don't match", Arrays.equals(exp, was));
+ }
+
+ private static void assertEqualsArray(long[] exp, long[] was)
+ {
+ assertTrue("Arrays don't match", Arrays.equals(exp, was));
+ }
+
+ private static void assertEqualsArray(float[] exp, float[] was)
+ {
+ assertTrue("Arrays don't match", Arrays.equals(exp, was));
+ }
+
+ private static void assertEqualsArray(double[] exp, double[] was)
+ {
+ assertTrue("Arrays don't match", Arrays.equals(exp, was));
+ }
+
+ /** Removes whitespace text nodes if they have an element sibling.
+ */
+ private static void normalizeWhitspace(Element element, boolean ignoreWhitespace)
+ {
+ boolean hasChildElement = false;
+ ArrayList toDetach = new ArrayList();
+
+ String nodeName = element.getNodeName();
+ NodeList childNodes = element.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++)
+ {
+ Node node = childNodes.item(i);
+ if (node.getNodeType() == Node.TEXT_NODE)
+ {
+ String nodeValue = node.getNodeValue();
+ if (nodeValue.trim().length() == 0)
+ toDetach.add(node);
+ }
+ if (node.getNodeType() == Node.ELEMENT_NODE)
+ {
+ normalizeWhitspace((Element)node, ignoreWhitespace);
+ hasChildElement = true;
+ }
+ }
+
+ // remove whitespace nodes
+ if (hasChildElement || ignoreWhitespace)
+ {
+ Iterator it = toDetach.iterator();
+ while (it.hasNext())
+ {
+ Node node = (Node)it.next();
+ element.removeChild(node);
+ }
+ }
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -0,0 +1,201 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.spi.test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Hashtable;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
+import org.jboss.wsf.spi.utils.ObjectNameFactory;
+
+/**
+ * A JBossWS test helper that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class JBossWSTestHelper
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(JBossWSTestHelper.class);
+
+ private static MBeanServerConnection server;
+ private static String integrationTarget;
+
+ /** Deploy the given archive
+ */
+ public void deploy(String archive) throws Exception
+ {
+ URL url = getArchiveURL(archive);
+ getDeployer().deploy(url);
+ }
+
+ /** Undeploy the given archive
+ */
+ public void undeploy(String archive) throws Exception
+ {
+ URL url = getArchiveURL(archive);
+ getDeployer().undeploy(url);
+ }
+
+ /** True, if -Djbossws.integration.target=jboss50 */
+ public static boolean isTargetJBoss50()
+ {
+ String target = getIntegrationTarget();
+ return "jboss50".equals(target);
+ }
+
+ /** True, if -Djbossws.integration.target=jboss42 */
+ public static boolean isTargetJBoss42()
+ {
+ String target = getIntegrationTarget();
+ return "jboss42".equals(target);
+ }
+
+ public boolean isIntegrationNative()
+ {
+ String vendor = Service.class.getPackage().getImplementationVendor();
+ return vendor.startsWith("JBoss");
+ }
+
+ public boolean isIntegrationSunRI()
+ {
+ String vendor = Service.class.getPackage().getImplementationVendor();
+ return vendor.startsWith("Sun Microsystems");
+ }
+
+ public boolean isIntegrationXFire()
+ {
+ throw new NotImplementedException();
+ }
+
+ /**
+ * Get the JBoss server host from system property "jboss.bind.address"
+ * This defaults to "localhost"
+ */
+ public static String getServerHost()
+ {
+ String hostName = System.getProperty("jboss.bind.address", "localhost");
+ return hostName;
+ }
+
+ public static MBeanServerConnection getServer()
+ {
+ if (server == null)
+ {
+ Hashtable jndiEnv = null;
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ jndiEnv = iniCtx.getEnvironment();
+ server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
+ }
+ catch (NamingException ex)
+ {
+ throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex);
+ }
+ }
+ return server;
+ }
+
+ private TestDeployer getDeployer()
+ {
+ return new TestDeployerJBoss(getServer());
+ }
+
+ private static String getIntegrationTarget()
+ {
+ if (integrationTarget == null)
+ {
+ integrationTarget = System.getProperty("jbossws.integration.target");
+
+ if (integrationTarget == null)
+ throw new IllegalStateException("Cannot obtain jbossws.integration.target");
+
+ // Read the JBoss SpecificationVersion
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
+ if (jbossVersion.startsWith("5.0"))
+ jbossVersion = "jboss50";
+ else if (jbossVersion.startsWith("4.2"))
+ jbossVersion = "jboss42";
+ else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
+
+ if (jbossVersion.equals(integrationTarget) == false)
+ {
+ throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
+ //integrationTarget = jbossVersion;
+ }
+ }
+ catch (Throwable th)
+ {
+ // ignore, we are not running on jboss-4.2 or greater
+ }
+ }
+ return integrationTarget;
+ }
+
+ /** Try to discover the URL for the deployment archive */
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ URL url = null;
+ try
+ {
+ url = new URL(archive);
+ }
+ catch (MalformedURLException ignore)
+ {
+ // ignore
+ }
+
+ if (url == null)
+ {
+ File file = new File(archive);
+ if (file.exists())
+ url = file.toURL();
+ }
+
+ if (url == null)
+ {
+ File file = new File("libs/" + archive);
+ if (file.exists())
+ url = file.toURL();
+ }
+
+ if (url == null)
+ throw new IllegalArgumentException("Cannot obtain URL for: " + archive);
+
+ return url;
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.spi.test;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * A test setup that deploys/undeploys archives
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class JBossWSTestSetup extends TestSetup
+{
+ private JBossWSTestHelper delegate = new JBossWSTestHelper();
+ private String[] archives = new String[0];
+
+ public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList)
+ {
+ return new JBossWSTestSetup(testClass, archiveList);
+ }
+
+ public static JBossWSTestSetup newTestSetup(Test test, String archiveList)
+ {
+ return new JBossWSTestSetup(test, archiveList);
+ }
+
+ protected JBossWSTestSetup(Class testClass, String archiveList)
+ {
+ super(new TestSuite(testClass));
+ getArchiveArray(archiveList);
+ }
+
+ protected JBossWSTestSetup(Test test, String archiveList)
+ {
+ super(test);
+ getArchiveArray(archiveList);
+ }
+
+ private void getArchiveArray(String archiveList)
+ {
+ if (archiveList != null)
+ {
+ StringTokenizer st = new StringTokenizer(archiveList, ", ");
+ archives = new String[st.countTokens()];
+
+ for (int i = 0; i < archives.length; i++)
+ archives[i] = st.nextToken();
+ }
+ }
+
+ protected void setUp() throws Exception
+ {
+ List clientJars = new ArrayList();
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[i];
+ try
+ {
+ delegate.deploy(archive);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ delegate.undeploy(archive);
+ }
+
+ if (archive.endsWith("-client.jar"))
+ {
+ URL archiveURL = delegate.getArchiveURL(archive);
+ clientJars.add(archiveURL);
+ }
+ }
+
+ // add the client jars to the classloader
+ if (!clientJars.isEmpty())
+ {
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ URL[] urls = new URL[clientJars.size()];
+ for (int i = 0; i < clientJars.size(); i++)
+ {
+ urls[i] = (URL)clientJars.get(i);
+ }
+ URLClassLoader cl = new URLClassLoader(urls, parent);
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[archives.length - i - 1];
+ delegate.undeploy(archive);
+ }
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.spi.test;
+
+import java.net.URL;
+
+/**
+ * WS test deployer
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 16-May-2006
+ */
+public interface TestDeployer
+{
+ /** Deploy the given archive
+ */
+ void deploy(URL archive) throws Exception;
+
+ /** Undeploy the given archive
+ */
+ void undeploy(URL archive) throws Exception;
+}
\ No newline at end of file
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.spi.test;
+
+import java.net.URL;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+/**
+ * A JBossWS test helper that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class TestDeployerJBoss implements TestDeployer
+{
+ private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
+
+ private MBeanServerConnection server;
+
+ public TestDeployerJBoss(MBeanServerConnection server)
+ {
+ this.server = server;
+ }
+
+ public void deploy(URL url) throws Exception
+ {
+ server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" });
+ }
+
+ public void undeploy(URL url) throws Exception
+ {
+ server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" });
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.spi.test;
+
+// $Id$
+
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.activation.DataHandler;
+import javax.xml.transform.stream.StreamSource;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @since 22-Sep-2006
+ */
+public class XOPTestSupport
+{
+
+ public static byte[] getBytesFromFile(File file) throws IOException
+ {
+ InputStream is = new FileInputStream(file);
+
+ long length = file.length();
+ byte[] bytes = new byte[(int)length];
+
+ int offset = 0;
+ int numRead = 0;
+ while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)
+ {
+ offset += numRead;
+ }
+
+ is.close();
+ return bytes;
+ }
+
+ public static Image createTestImage(File imgFile)
+ {
+ Image image = null;
+ try
+ {
+ URL url = imgFile.toURL();
+
+ image = null;
+ try
+ {
+ image = Toolkit.getDefaultToolkit().createImage(url);
+ }
+ catch (Throwable th)
+ {
+ //log.warn("Cannot create Image: " + th);
+ }
+ }
+ catch (MalformedURLException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ return image;
+ }
+
+ public static StreamSource createTestSource()
+ {
+ return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes()));
+ }
+
+ public static DataHandler createDataHandler(File imgFile)
+ {
+ try
+ {
+ URL url = imgFile.toURL();
+ return new DataHandler(url);
+ }
+ catch (MalformedURLException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,297 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import javax.management.MBeanServerConnection;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.transform.Source;
-
-import junit.framework.TestCase;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.utils.DOMUtils;
-import org.jboss.wsf.spi.utils.DOMWriter;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Base class for JBossWS test cases
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public abstract class JBossWSTest extends TestCase
-{
- // provide logging
- protected Logger log = Logger.getLogger(getClass().getName());
-
- private JBossWSTestHelper delegate = new JBossWSTestHelper();
-
- public JBossWSTest()
- {
- }
-
- public JBossWSTest(String name)
- {
- super(name);
- }
-
- /** Get the MBeanServerConnection from JNDI */
- public MBeanServerConnection getServer() throws NamingException
- {
- return JBossWSTestHelper.getServer();
- }
-
- /** True, if -Djbossws.integration.target=jboss?? */
- public boolean isTargetJBoss()
- {
- return JBossWSTestHelper.isTargetJBoss();
- }
-
- /** True, if -Djbossws.integration.target=tomcat */
- public boolean isTargetTomcat()
- {
- return JBossWSTestHelper.isTargetTomcat();
- }
-
- public boolean isTargetJBoss50()
- {
- return JBossWSTestHelper.isTargetJBoss50();
- }
-
- public boolean isTargetJBoss42()
- {
- return JBossWSTestHelper.isTargetJBoss42();
- }
-
- public boolean isTargetJBoss40()
- {
- return JBossWSTestHelper.isTargetJBoss40();
- }
-
- /** Deploy the given archive
- */
- public void deploy(String archive) throws Exception
- {
- delegate.deploy(archive);
- }
-
- /** Undeploy the given archive
- */
- public void undeploy(String archive) throws Exception
- {
- delegate.undeploy(archive);
- }
-
- /** Get the client's env context for a given name.
- */
- protected InitialContext getInitialContext(String clientName) throws NamingException
- {
- InitialContext iniCtx = new InitialContext();
- Hashtable env = iniCtx.getEnvironment();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.put("j2ee.clientName", clientName);
- return new InitialContext(env);
- }
-
- /** Get the client's env context
- */
- protected InitialContext getInitialContext() throws NamingException
- {
- return getInitialContext("jbossws-client");
- }
-
- public boolean hasJDK15()
- {
- try
- {
- Class.forName("java.lang.Enum");
- return true;
- }
- catch (ClassNotFoundException ex)
- {
- return false;
- }
- }
-
- public String getServerHost()
- {
- return JBossWSTestHelper.getServerHost();
- }
-
- public Element getElementFromSource(Source retObj) throws Exception
- {
- return DOMUtils.sourceToElement(retObj);
- }
-
- public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace)
- {
- normalizeWhitspace(expElement, ignoreWhitespace);
- normalizeWhitspace(wasElement, ignoreWhitespace);
- String expStr = DOMWriter.printNode(expElement, false);
- String wasStr = DOMWriter.printNode(wasElement, false);
- if (expStr.equals(wasStr) == false)
- {
- System.out.println("\nExp: " + expStr + "\nWas: " + wasStr);
- Logger.getLogger(JBossWSTest.class).error("\nExp: " + expStr + "\nWas: " + wasStr);
- }
- assertEquals(expStr, wasStr);
- }
-
- public static void assertEquals(Element expElement, Element wasElement)
- {
- assertEquals(expElement, wasElement, false);
- }
-
- public static void assertEquals(Object exp, Object was)
- {
- if (exp instanceof Object[] && was instanceof Object[])
- assertEqualsArray((Object[])exp, (Object[])was);
- else if (exp instanceof byte[] && was instanceof byte[])
- assertEqualsArray((byte[])exp, (byte[])was);
- else if (exp instanceof boolean[] && was instanceof boolean[])
- assertEqualsArray((boolean[])exp, (boolean[])was);
- else if (exp instanceof short[] && was instanceof short[])
- assertEqualsArray((short[])exp, (short[])was);
- else if (exp instanceof int[] && was instanceof int[])
- assertEqualsArray((int[])exp, (int[])was);
- else if (exp instanceof long[] && was instanceof long[])
- assertEqualsArray((long[])exp, (long[])was);
- else if (exp instanceof float[] && was instanceof float[])
- assertEqualsArray((float[])exp, (float[])was);
- else if (exp instanceof double[] && was instanceof double[])
- assertEqualsArray((double[])exp, (double[])was);
- else TestCase.assertEquals(exp, was);
- }
-
- private static void assertEqualsArray(Object[] exp, Object[] was)
- {
- if (exp == null && was == null)
- return;
-
- if (exp != null && was != null)
- {
- if (exp.length != was.length)
- {
- fail("Expected <" + exp.length + "> array items, but was <" + was.length + ">");
- }
- else
- {
- for (int i = 0; i < exp.length; i++)
- {
-
- Object compExp = exp[i];
- Object compWas = was[i];
- assertEquals(compExp, compWas);
- }
- }
- }
- else if (exp == null)
- {
- fail("Expected a null array, but was: " + Arrays.asList(was));
- }
- else if (was == null)
- {
- fail("Expected " + Arrays.asList(exp) + ", but was: null");
- }
- }
-
- private static void assertEqualsArray(byte[] exp, byte[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(boolean[] exp, boolean[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(short[] exp, short[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(int[] exp, int[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(long[] exp, long[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(float[] exp, float[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(double[] exp, double[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- /** Removes whitespace text nodes if they have an element sibling.
- */
- private static void normalizeWhitspace(Element element, boolean ignoreWhitespace)
- {
- boolean hasChildElement = false;
- ArrayList toDetach = new ArrayList();
-
- String nodeName = element.getNodeName();
- NodeList childNodes = element.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++)
- {
- Node node = childNodes.item(i);
- if (node.getNodeType() == Node.TEXT_NODE)
- {
- String nodeValue = node.getNodeValue();
- if (nodeValue.trim().length() == 0)
- toDetach.add(node);
- }
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- normalizeWhitspace((Element)node, ignoreWhitespace);
- hasChildElement = true;
- }
- }
-
- // remove whitespace nodes
- if (hasChildElement || ignoreWhitespace)
- {
- Iterator it = toDetach.iterator();
- while (it.hasNext())
- {
- Node node = (Node)it.next();
- element.removeChild(node);
- }
- }
- }
-}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,204 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.utils.ObjectNameFactory;
-
-/**
- * A JBossWS test helper that deals with test deployment/undeployment, etc.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class JBossWSTestHelper
-{
- // provide logging
- private static Logger log = Logger.getLogger(JBossWSTestHelper.class);
-
- private static MBeanServerConnection server;
- private static String integrationTarget;
-
- /** Deploy the given archive
- */
- public void deploy(String archive) throws Exception
- {
- URL url = getArchiveURL(archive);
- getDeployer().deploy(url);
- }
-
- /** Undeploy the given archive
- */
- public void undeploy(String archive) throws Exception
- {
- URL url = getArchiveURL(archive);
- getDeployer().undeploy(url);
- }
-
- /** True, if -Djbossws.integration.target=tomcat */
- public static boolean isTargetTomcat()
- {
- String target = getIntegrationTarget();
- return "tomcat".equals(target);
- }
-
- /** True, if -Djbossws.integration.target=jboss?? */
- public static boolean isTargetJBoss()
- {
- String target = getIntegrationTarget();
- return target != null && target.startsWith("jboss");
- }
-
- /** True, if -Djbossws.integration.target=jboss50 */
- public static boolean isTargetJBoss50()
- {
- String target = getIntegrationTarget();
- return "jboss50".equals(target);
- }
-
- /** True, if -Djbossws.integration.target=jboss42 */
- public static boolean isTargetJBoss42()
- {
- String target = getIntegrationTarget();
- return "jboss42".equals(target);
- }
-
- /** True, if -Djbossws.integration.target=jboss40 */
- public static boolean isTargetJBoss40()
- {
- String target = getIntegrationTarget();
- return "jboss40".equals(target);
- }
-
- /**
- * Get the JBoss server host from system property "jboss.bind.address"
- * This defaults to "localhost"
- */
- public static String getServerHost()
- {
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- return hostName;
- }
-
- public static MBeanServerConnection getServer()
- {
- if (server == null)
- {
- try
- {
- InitialContext iniCtx = new InitialContext();
- server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
- }
- catch (NamingException ex)
- {
- throw new RuntimeException("Cannot obtain MBeanServerConnection", ex);
- }
- }
- return server;
- }
-
- private TestDeployer getDeployer()
- {
- return new TestDeployerJBoss(getServer());
- }
-
- private static String getIntegrationTarget()
- {
- if (integrationTarget == null)
- {
- integrationTarget = System.getProperty("jbossws.integration.target");
-
- // Read the JBoss SpecificationVersion
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
- if (jbossVersion.startsWith("5.0"))
- jbossVersion = "jboss50";
- else if (jbossVersion.startsWith("4.2"))
- jbossVersion = "jboss42";
- else if (jbossVersion.startsWith("4.0"))
- jbossVersion = "jboss40";
- else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
-
- if (jbossVersion.equals(integrationTarget) == false)
- {
- log.warn("Integration target mismatch, using: " + jbossVersion);
- integrationTarget = jbossVersion;
- }
- }
- catch (Throwable th)
- {
- // ignore, we are not running on jboss-4.2 or greater
- }
-
- if (integrationTarget == null)
- {
- log.warn("Cannot obtain jbossws.integration.target, using default: tomcat");
- integrationTarget = "tomcat";
- }
- }
- return integrationTarget;
- }
-
- /** Try to discover the URL for the deployment archive */
- public URL getArchiveURL(String archive) throws MalformedURLException
- {
- URL url = null;
- try
- {
- url = new URL(archive);
- }
- catch (MalformedURLException ignore)
- {
- // ignore
- }
-
- if (url == null)
- {
- File file = new File(archive);
- if (file.exists())
- url = file.toURL();
- }
-
- if (url == null)
- {
- File file = new File("libs/" + archive);
- if (file.exists())
- url = file.toURL();
- }
-
- if (url == null)
- throw new IllegalArgumentException("Cannot obtain URL for: " + archive);
-
- return url;
- }
-}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,132 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * A test setup that deploys/undeploys archives
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class JBossWSTestSetup extends TestSetup
-{
- private JBossWSTestHelper delegate = new JBossWSTestHelper();
- private String[] archives = new String[0];
-
- public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList)
- {
- return new JBossWSTestSetup(testClass, archiveList);
- }
-
- public static JBossWSTestSetup newTestSetup(Test test, String archiveList)
- {
- return new JBossWSTestSetup(test, archiveList);
- }
-
- protected JBossWSTestSetup(Class testClass, String archiveList)
- {
- super(new TestSuite(testClass));
- getArchiveArray(archiveList);
- }
-
- protected JBossWSTestSetup(Test test, String archiveList)
- {
- super(test);
- getArchiveArray(archiveList);
- }
-
- private void getArchiveArray(String archiveList)
- {
- if (archiveList != null)
- {
- StringTokenizer st = new StringTokenizer(archiveList, ", ");
- archives = new String[st.countTokens()];
-
- for (int i = 0; i < archives.length; i++)
- archives[i] = st.nextToken();
- }
- }
-
- protected void setUp() throws Exception
- {
- List clientJars = new ArrayList();
- for (int i = 0; i < archives.length; i++)
- {
- String archive = archives[i];
- boolean isJ2EEClient = archive.endsWith("-client.jar");
- if (delegate.isTargetJBoss() || isJ2EEClient == false)
- {
- try
- {
- delegate.deploy(archive);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- delegate.undeploy(archive);
- }
- }
-
- if (isJ2EEClient)
- {
- URL archiveURL = delegate.getArchiveURL(archive);
- clientJars.add(archiveURL);
- }
- }
-
- // add the client jars to the classloader
- if( !clientJars.isEmpty() )
- {
- ClassLoader parent = Thread.currentThread().getContextClassLoader();
- URL[] urls = new URL[clientJars.size()];
- for(int i=0; i<clientJars.size(); i++)
- {
- urls[i] = (URL)clientJars.get(i);
- }
- URLClassLoader cl = new URLClassLoader(urls, parent);
- Thread.currentThread().setContextClassLoader(cl);
- }
- }
-
- protected void tearDown() throws Exception
- {
- for (int i = 0; i < archives.length; i++)
- {
- String archive = archives[archives.length - i - 1];
- boolean isJ2EEClient = archive.endsWith("-client.jar");
- if (delegate.isTargetJBoss() || isJ2EEClient == false)
- {
- delegate.undeploy(archive);
- }
- }
- }
-}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.net.URL;
-
-/**
- * WS test deployer
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-May-2006
- */
-public interface TestDeployer
-{
- /** Deploy the given archive
- */
- void deploy(URL archive) throws Exception;
-
- /** Undeploy the given archive
- */
- void undeploy(URL archive) throws Exception;
-}
\ No newline at end of file
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.net.URL;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-/**
- * A JBossWS test helper that deals with test deployment/undeployment, etc.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class TestDeployerJBoss implements TestDeployer
-{
- private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
-
- private MBeanServerConnection server;
-
- public TestDeployerJBoss(MBeanServerConnection server)
- {
- this.server = server;
- }
-
- public void deploy(URL url) throws Exception
- {
- server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" });
- }
-
- public void undeploy(URL url) throws Exception
- {
- server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" });
- }
-}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,9 +22,10 @@
package org.jboss.test.ws.benchmark.jaxrpc;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,9 +22,10 @@
package org.jboss.test.ws.benchmark.jaxrpc;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.xml.rpc.Service;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,9 +22,10 @@
package org.jboss.test.ws.benchmark.jaxrpc;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,9 +22,10 @@
package org.jboss.test.ws.benchmark.jaxrpc;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,12 +21,12 @@
*/
package org.jboss.test.ws.benchmark.jaxws;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.benchmark.jaxws.doclit.BenchmarkService;
import junit.framework.Test;
import org.jboss.test.ws.benchmark.jaxws.doclit.*;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import javax.xml.ws.Service;
import javax.xml.ws.BindingProvider;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,7 +34,6 @@
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.CommonBinding;
import org.jboss.ws.core.CommonBindingProvider;
@@ -50,6 +49,7 @@
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,7 +23,6 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.config.EndpointProperty;
import org.jboss.ws.metadata.config.JBossWSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC;
@@ -33,6 +32,7 @@
import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test parsing of the JBossWS config
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,7 +34,6 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
@@ -45,6 +44,7 @@
import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase;
import org.jboss.ws.core.jaxrpc.binding.SerializerSupport;
import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.xb.binding.NamespaceRegistry;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -36,10 +36,10 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -36,9 +36,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.soap.SOAPBodyElementRpc;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/** Test call on a SOAPConnection
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,10 +32,10 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.Text;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test the SOAPContentElement
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,7 +32,7 @@
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test the SOAPElement
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,9 +30,9 @@
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,7 +26,7 @@
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPFactory;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test the SOAPFactory
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -35,9 +35,9 @@
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,9 +31,9 @@
import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.NameImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,10 +32,10 @@
import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.NameImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -39,7 +39,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.CommonBinding;
import org.jboss.ws.core.CommonBindingProvider;
@@ -53,6 +52,7 @@
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* TODO
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,7 +34,7 @@
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Document;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.ws.common.utils;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_161.custom.HelloObj;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.JavaUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,11 +23,11 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Tests WSDL11Reader ability to parse WSDL Files
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,11 +23,11 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test the XSModel, and how it handles multiple schemas
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import javax.xml.rpc.ServiceFactory;
import org.jboss.net.protocol.URLStreamHandlerFactory;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test a wsdl import functionality.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,7 +27,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
import org.jboss.ws.extensions.eventing.EventingConstants;
@@ -46,6 +45,7 @@
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.IOUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,11 +24,11 @@
import java.io.File;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* The WSDL may contain or import XSD schema definitions.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.ws.interop.soapwsdl;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.interop.ClientScenario;
import org.jboss.test.ws.interop.InteropConfigFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,7 +24,8 @@
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport;
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI;
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesProxy;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import junit.framework.Test;
import javax.xml.ws.Service;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,7 +24,8 @@
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport;
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI;
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesProxy;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import junit.framework.Test;
import javax.xml.ws.Service;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,10 +21,11 @@
*/
package org.jboss.test.ws.interop.soapwsdl.baserpclit;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport;
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI;
import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesProxy;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import junit.framework.Test;
import javax.xml.ws.BindingProvider;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,10 +22,10 @@
package org.jboss.test.ws.interop.wsa;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.ws.interop.wsse;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestHelper;
import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestHelper;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,8 +22,9 @@
package org.jboss.test.ws.interop.wsse;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
* @version $Id: EncryptTestCase.java 2064 2007-01-24 11:30:23Z heiko.braun(a)jboss.com $
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,8 +22,9 @@
package org.jboss.test.ws.interop.wsse;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
/**
* @author Heiko Braun, <heiko(a)openj.net>
* @since 07-Mar-2006
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test anonymous types
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test soap encoded href
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,8 +34,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test soap encoded marshalling
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -54,8 +54,6 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.ArrayOfBookHolder;
import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.ArrayOfQNameHolder;
import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.ArrayOfbooleanHolder;
@@ -79,6 +77,8 @@
import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumLongHolder;
import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumShortHolder;
import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumStringHolder;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test soap encoded parameters
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test env entry access
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test env entry access
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,7 +29,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.ServiceFactory;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test case to test that a deployment containg a stateless session bean exposed
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,9 +23,9 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Cannot handle xsd:import of xml schema
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,20 +22,17 @@
package org.jboss.test.ws.jaxrpc.jbws1093;
import java.io.BufferedReader;
-import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints
@@ -60,21 +57,9 @@
super.setUp();
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.test.ws/jbws1093", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,18 +21,13 @@
*/
package org.jboss.test.ws.jaxrpc.jbws1107;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test case to test that an endpoint can be accessed if there is whitespace
@@ -56,25 +51,12 @@
super.setUp();
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/jbws1107/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/jbws1107/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.test.ws/jbws1107", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
}
}
-
public void testAccessEnpoint() throws Exception
{
assertEquals("Hello", port.echoString("Hello"));
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,7 +25,7 @@
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Client security configuration not loaded when client deployed with issolated classloader
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,9 +29,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Scoped class loading domains for WS endpoints
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -35,8 +35,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Support empty soap body elements
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Anonymous Simple Type causes NullPointerException
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Each web services invocation causes a new HTTP session to be created.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -35,9 +35,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* The prefix "xsi" for attribute "xsi:nil" is not bound
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* WS Client does not clean up temporary xsd files
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/** Test that we can deploy an already modified web.xml
* This also allows for redeployment of an expanded *.war
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,8 +27,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/** Test to load client wsdl from war inside an ear
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Unmarshall issue with xsi:type specified bean property
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,9 +31,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* NPE in replaceAddressLocation with SOAP1.2 WSDL
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Attachment parts with doclit message
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,9 +31,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* [JBWS-1386] - ComplexType with base64Binary property
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,11 +31,11 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,12 +31,12 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.jbws1427.interfaces.RequestService;
import org.jboss.test.ws.jaxrpc.jbws1427.services.Message;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/** Test nested xsd imports
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,18 +21,13 @@
*/
package org.jboss.test.ws.jaxrpc.jbws1619;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* ServletEndpointContext.getHttpSession has an incorrect implementation
@@ -57,21 +52,9 @@
super.setUp();
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.test.ws/jbws1619", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,8 +32,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/** Test IN, INOUT, OUT of unsignedLong, etc.
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,8 +27,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -39,8 +39,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* soap response does not respect minOccurs=0
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/** Test mapping of primitive types in jaxrpc-mapping.xml
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Handle Simple Types with Enumerated Values
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,7 +26,7 @@
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Document/Literal parameter wrapping with null values
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* JBoss creates SOAP messages that don't conform WS-I
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* JBoss ignores metadata supplied in a JAX-RPC Mapping DD
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,8 +31,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* JBoss ignores metadata supplied in a JAX-RPC Mapping DD
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* No serializer found exception for method returning an array of objects
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* JBoss ignores metadata supplied in a JAX-RPC Mapping DD
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -38,8 +38,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,8 +32,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* No serializer found exception for method returning an array of objects
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,8 +25,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,8 +32,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Axis-1.2RC2 client may send messages like this
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,10 +26,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.jbws663.holders.ResponseInfoHolder;
import org.jboss.test.ws.jaxrpc.jbws663.holders.SubscriptionInfoHolder;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Multiple bindings are not supported
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,10 +26,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.jbws663.holders.ResponseInfoHolder;
import org.jboss.test.ws.jaxrpc.jbws663.holders.SubscriptionInfoHolder;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Multiple bindings are not supported
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* The type associated with a message part references a complex schema type and not a schema element that uses the schema type.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,8 +27,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* rpc-literal binding MUST namespace qualify the descendents of part accessor elements
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -35,8 +35,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Cannot find custom datatypes in WEB-INF/lib
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Document/Literal webservices that are oneway
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Handling of xml:lang and any namespace="##other"
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,11 +31,11 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLException;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Protect access to WSDL
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Empty unwrapped arrays incorrectly unmarshalled as a null value
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,7 +24,7 @@
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -33,8 +33,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMWriter;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,8 +27,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Cannot deploy a ws containing more than one service per wsdl
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -45,8 +45,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
public class JBWS801TestCase extends JBossWSTest
{
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* A handler's handleFault() method is never called
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -39,8 +39,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Access to /context/services/Foo is denied
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Access to /context/services/Foo is denied
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -39,8 +39,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.w3c.dom.Document;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,9 +30,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Attributes of type xsd:QName incorrectly serialized
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,7 +31,7 @@
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,9 +30,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Deserialization of complex bean containing an array of complex beans
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,9 +24,9 @@
import java.io.File;
import java.net.URL;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* XML entity usage in wsdl contained schema
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import javax.xml.rpc.Service;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test standard JAX-RPC types.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,10 +32,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the Dynamic Invocation Interface (DII) on the Call
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,8 +31,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test standard JAX-RPC types.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,9 +29,9 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean;
import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean2;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.JavaUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -54,9 +54,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test DII with Holders
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* A test that tests overloaded methods.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,39 +1,33 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxrpc.samples.docstyle.bare;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JSE test case for an document/literal/bare style service.
@@ -56,22 +50,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService");
- port = (TrivialService)service.getPort(TrivialService.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/docstyle/bare/WEB-INF/wsdl/SampleService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/docstyle/bare/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/docstyle/bare", "SampleService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (TrivialService)service.getPort(TrivialService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-docstyle-bare");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService");
+ port = (TrivialService)service.getPort(TrivialService.class);
}
}
@@ -81,6 +62,6 @@
String product = "Ferrari";
TrivialOrder req = new TrivialOrder(person, product);
TrivialOrderResponse res = port.purchase(req);
- assertEquals("ok" + person +product, res.getResult());
+ assertEquals("ok" + person + product, res.getResult());
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,39 +1,33 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxrpc.samples.docstyle.wrapped;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JSE test case for an document/literal/wrapped style service.
@@ -56,22 +50,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService");
- port = (TrivialService)service.getPort(TrivialService.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/wsdl/SampleService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/docstyle/wrapped", "SampleService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (TrivialService)service.getPort(TrivialService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-docstyle-wrapped");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService");
+ port = (TrivialService)service.getPort(TrivialService.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -33,10 +33,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceExt;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test static handlers
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,8 +22,6 @@
package org.jboss.test.ws.jaxrpc.samples.exception;
import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.net.URL;
import java.rmi.RemoteException;
import javax.naming.InitialContext;
@@ -31,7 +29,6 @@
import javax.xml.rpc.Call;
import javax.xml.rpc.Service;
import javax.xml.rpc.ServiceFactory;
-import javax.xml.rpc.Stub;
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.Detail;
import javax.xml.soap.MessageFactory;
@@ -46,9 +43,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test user exception propagation.
@@ -67,24 +63,10 @@
private ExceptionServiceInterface getPort() throws Exception
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- ExceptionService service = (ExceptionService)iniCtx.lookup("java:comp/env/service/ExceptionService");
- ExceptionServiceInterface port = service.getPort();
- return port;
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/exception/WEB-INF/wsdl/ExceptionService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/exception/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/exception", "ExceptionService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- ExceptionServiceInterface port = (ExceptionServiceInterface)service.getPort(ExceptionServiceInterface.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-exception");
- return port;
- }
+ InitialContext iniCtx = getInitialContext();
+ ExceptionService service = (ExceptionService)iniCtx.lookup("java:comp/env/service/ExceptionService");
+ ExceptionServiceInterface port = service.getPort();
+ return port;
}
/** Test creation of a SOAPFault */
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,23 +21,18 @@
*/
package org.jboss.test.ws.jaxrpc.samples.handler;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import javax.xml.rpc.holders.StringHolder;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test bound and unbound headers
@@ -62,22 +57,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (HeaderTestService)service.getPort(HeaderTestService.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/handler/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/handler/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/handler", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (HeaderTestService)service.getPort(HeaderTestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-handler");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (HeaderTestService)service.getPort(HeaderTestService.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,10 +32,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.client.CallImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the Dynamic Invocation Interface (DII) on the Call
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,12 +30,12 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test bound and unbound headers
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -53,9 +53,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test DII with Holders
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,16 +21,13 @@
*/
package org.jboss.test.ws.jaxrpc.samples.holder;
-import java.io.File;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.net.URL;
import java.util.GregorianCalendar;
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import javax.xml.rpc.holders.BigDecimalHolder;
import javax.xml.rpc.holders.BigIntegerHolder;
import javax.xml.rpc.holders.BooleanHolder;
@@ -54,9 +51,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test Holders
@@ -79,22 +75,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (HolderTestService)service.getPort(HolderTestService.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/holder/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/holder/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/holder", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (HolderTestService)service.getPort(HolderTestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-holder");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (HolderTestService)service.getPort(HolderTestService.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test EJB endpoint for a document style service.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the Dynamic Invocation Interface (DII) on a Call that is preconfigured from WSDL
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the Dynamic Invocation Interface (DII) on the Call
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test EJB Service
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,10 +28,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the DynamicProxy Call
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,19 +21,13 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109pojo;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JSE endpoint for a document style service.
@@ -56,22 +50,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/jsr109pojo", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-doc");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
+ port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the Dynamic Invocation Interface (DII) on a Call that is preconfigured from WSDL
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the Dynamic Invocation Interface (DII) on the Call
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,9 +31,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JSE test case for an rpc style service.
@@ -56,7 +56,7 @@
if (port == null)
{
- if (isTargetJBoss42() || isTargetJBoss40())
+ if (isTargetJBoss42())
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,10 +28,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the DynamicProxy Call
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.jaxrpc.samples.message;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.net.URL;
import javax.naming.InitialContext;
@@ -31,7 +30,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPConnection;
@@ -48,9 +46,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -132,24 +129,10 @@
private MessageTestService getPort() throws Exception
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService");
- MessageTestService port = (MessageTestService)service.getPort(MessageTestService.class);
- return port;
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/message/WEB-INF/wsdl/MessageService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/message/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/message", "MessageService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- MessageTestService port = (MessageTestService)service.getPort(MessageTestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-message");
- return port;
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService");
+ MessageTestService port = (MessageTestService)service.getPort(MessageTestService.class);
+ return port;
}
private SOAPElement convertToSOAPElement(Element reqElement) throws TransformerException, SOAPException
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,23 +23,19 @@
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.InputStreamReader;
-import java.net.URL;
import javax.activation.DataHandler;
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import javax.xml.rpc.Stub;
import javax.xml.transform.stream.StreamSource;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test SOAP with XOP through the JAXRPC dynamic proxy layer.
@@ -64,23 +60,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestService");
- port = (EmployeeRecords)service.getPort(EmployeeRecords.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/wsdl/EmployeeService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/mtom", "EmployeeService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (EmployeeRecords)service.getPort(EmployeeRecords.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-mtom");
- }
-
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestService");
+ port = (EmployeeRecords)service.getPort(EmployeeRecords.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,19 +21,13 @@
*/
package org.jboss.test.ws.jaxrpc.samples.oneway;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JSE test case for onway operations.
@@ -56,22 +50,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (OneWayTestService)service.getPort(OneWayTestService.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/oneway/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/oneway/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/oneway", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (OneWayTestService)service.getPort(OneWayTestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-oneway");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (OneWayTestService)service.getPort(OneWayTestService.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,39 +1,33 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxrpc.samples.rpcstyle;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JSE test case for an rpc style service.
@@ -56,23 +50,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService");
- port = (TrivialService)service.getPort(TrivialService.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/rpcstyle/WEB-INF/wsdl/SampleService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/rpcstyle/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/rpcstyle", "SampleService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (TrivialService)service.getPort(TrivialService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-rpcstyle");
-
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService");
+ port = (TrivialService)service.getPort(TrivialService.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* A web service client that connects to a secured SLSB endpoint using.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -40,9 +40,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test SOAP with Attachements (SwA) through the JAXRPC DII layer.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,16 +31,13 @@
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import javax.xml.transform.stream.StreamSource;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test SOAP with Attachements (SwA) through the JAXRPC dynamic proxy layer.
@@ -65,22 +62,9 @@
if (port == null)
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/AttachmentService");
- port = (Attachment)service.getPort(Attachment.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/swa/WEB-INF/wsdl/Attachment.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/swa/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/swa", "Attachment");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (Attachment)service.getPort(Attachment.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-swa");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/AttachmentService");
+ port = (Attachment)service.getPort(Attachment.class);
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -47,9 +47,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.soap.SOAPBodyElementRpc;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test SOAP with Attachements (SwA) through the SAAJ layer.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
import org.jboss.logging.Logger;
-import org.jboss.test.ws.JBossWSTestHelper;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestHelper;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,9 +27,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.samples.wsbpel.JbpmBpelTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test business process behavior based on web services.
@@ -49,15 +49,8 @@
protected void setUp() throws Exception
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- helloService = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello");
- }
- else
- {
- throw new IllegalStateException("Unsupported target server");
- }
+ InitialContext iniCtx = getInitialContext();
+ helloService = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello");
}
public void testSayHelloProxy() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,21 +21,13 @@
*/
package org.jboss.test.ws.jaxrpc.samples.wssecurity;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
@@ -68,29 +60,9 @@
private Hello getPort() throws Exception
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
- Hello port = (Hello)service.getPort(Hello.class);
- return port;
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml").toURL();
- URL securityURL = new File("resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL();
-
- QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
- ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName, mappingURL, securityURL);
-
- Hello port = (Hello)service.getPort(Hello.class);
-
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-encrypt");
- ((StubExt)port).setConfigName("Standard WSSecurity Client");
-
- return port;
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
+ Hello port = (Hello)service.getPort(Hello.class);
+ return port;
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -21,21 +21,13 @@
*/
package org.jboss.test.ws.jaxrpc.samples.wssecurity;
-import java.io.File;
-import java.net.URL;
-
import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
@@ -68,29 +60,9 @@
private Hello getPort() throws Exception
{
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
- Hello port = (Hello)service.getPort(Hello.class);
- return port;
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml").toURL();
- URL securityURL = new File("resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL();
-
- QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
- ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName, mappingURL, securityURL);
-
- Hello port = (Hello)service.getPort(Hello.class);
-
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-sign");
- ((StubExt)port).setConfigName("Standard WSSecurity Client");
-
- return port;
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
+ Hello port = (Hello)service.getPort(Hello.class);
+ return port;
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,11 +29,11 @@
import javax.xml.rpc.Stub;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* This test simulates the usage of a jboss-ws-security keystore and truststore use cases
@@ -56,7 +56,7 @@
{
if (port == null)
{
- if (isTargetJBoss42() || isTargetJBoss40())
+ if (isTargetJBoss42())
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,11 +32,11 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXRPC <service-ref>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,11 +31,11 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXRPC <service-ref>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,11 +32,11 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXRPC <service-ref>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -39,8 +39,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,9 +29,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test <wsdl-publish-location>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,7 +29,7 @@
import org.apache.ws.policy.util.PolicyFactory;
import org.apache.ws.policy.util.PolicyReader;
import org.apache.ws.policy.util.PolicyWriter;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test the WS-Policy parser
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,12 +31,12 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.SecurityDecoder;
import org.jboss.ws.extensions.security.SecurityStore;
import org.jboss.ws.extensions.security.Util;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security service handling of a non signed/encrypted client
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,7 +32,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.EncryptionOperation;
@@ -49,6 +48,7 @@
import org.jboss.ws.extensions.security.TimestampOperation;
import org.jboss.ws.extensions.security.Util;
import org.jboss.ws.extensions.security.WsuIdTarget;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,7 +25,7 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Add support for fault signing and encryption
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,7 +25,7 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Add support for fault signing and encryption
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,8 +29,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,12 +30,12 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.SecurityDecoder;
import org.jboss.ws.extensions.security.SecurityStore;
import org.jboss.ws.extensions.security.Util;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test UsernameToken
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,8 +27,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal from a web client.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,8 +29,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
public class AccountSignupTestCase extends JBossWSTest
{
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,7 +28,6 @@
import javax.xml.rpc.Stub;
import javax.xml.transform.Source;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler;
import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse;
@@ -39,6 +38,7 @@
import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.IOUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test MTOM functionality with jaxrpc-handlers in place.<br>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test MTOM functionaly without any jaxrpc handlers in place.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,7 +29,6 @@
import javax.xml.rpc.Stub;
import javax.xml.transform.Source;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler;
import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse;
@@ -40,6 +39,7 @@
import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.IOUtils;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,8 +26,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test anonymous bare types.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,9 +34,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.Constants;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test SOAP12 binding type
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -36,8 +36,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* A complex JAX-WS test
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -38,11 +38,11 @@
import junit.extensions.TestSetup;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestHelper;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestHelper;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JAXWS Endpoint deployment
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -36,8 +36,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JAXWS handler lifecycle
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test SOAP12 binding type
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,8 +31,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* A JAX-WS holder test case
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,9 +32,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.CallImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,8 +29,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* JAXWSDeployerJSE is not handling jsp servlet defs correctly
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,10 +29,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* wsdlReader fails with faults defined on jaxws SEI
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,10 +25,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* EJB vehicle using loader repository not sufficiently isolated
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,10 +25,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* EJB vehicle using loader repository not sufficiently isolated
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,10 +30,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Investigate "Is Not A Servlet" error with multiple servlets in the web.xml
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -37,8 +37,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Arrays with JSR181 endpoints
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* EJB3 jmx name is incorrectly derrived
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* [JBWS-981] Virtual host configuration for EJB endpoints
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAX-WS metadata builder.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test @WebServiceRef overrides in jboss-client.xml
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceRef
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,8 +29,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,9 +32,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test stateful endpoint using ws-addressing
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,8 +34,6 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.eventing.EventingConstants;
@@ -47,6 +45,8 @@
import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse;
import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint;
import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the eventing example service.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxws.client.ServiceExt;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxws.client.ServiceExt;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,8 +31,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxws.client.ServiceExt;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test WS-Security with RPC/Literal
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -33,10 +33,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXWS <service-ref>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,10 +31,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JAXRPC <service-ref>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,10 +34,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the jaxws <service-ref>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test different JAXB accesor types.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.extensions.addressing.EndpointReferenceImpl;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -34,8 +34,8 @@
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.util.xml.DOMUtils;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test the SOAPAddressingProperties
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,8 +25,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test endpoint using ws-addressing.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -33,8 +33,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test endpoint using ws-addressing
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,9 +22,10 @@
package org.jboss.test.ws.jaxws.wsdd;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.BindingProvider;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -35,7 +35,6 @@
import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.addressing.JAXWSAConstants;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.soap.SOAPElementImpl;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
@@ -50,6 +49,7 @@
import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Eventing test case support.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,7 +30,6 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.jaxws.DeliveryType;
@@ -41,6 +40,7 @@
import org.jboss.ws.extensions.eventing.jaxws.Subscribe;
import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse;
import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the eventing endpoints.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,10 +27,10 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse;
import org.jboss.ws.extensions.eventing.mgmt.EventDispatcher;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType;
@@ -36,6 +35,7 @@
import org.jboss.ws.extensions.eventing.mgmt.Filter;
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager;
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionTicket;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,11 +30,11 @@
import org.apache.ws.policy.Policy;
import org.apache.ws.policy.PrimitiveAssertion;
import org.apache.ws.policy.XorCompositeAssertion;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.WSException;
import org.jboss.ws.extensions.policy.deployer.PolicyDeployer;
import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer;
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* @author Alessio Soldano, <mailto:alessio.soldano@javalinux.it>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,7 +30,6 @@
import javax.xml.namespace.QName;
import org.apache.ws.policy.Policy;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.deployer.PolicyDeployer;
@@ -43,6 +42,7 @@
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* @author Alessio Soldano, <mailto:alessio.soldano@javalinux.it>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,7 +24,6 @@
import java.io.File;
import java.io.Writer;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.common.jbossxb.complex.ComplexTypes;
import org.jboss.test.ws.tools.sei.ArrayInterface;
import org.jboss.test.ws.tools.sei.CustomInterface;
@@ -40,6 +39,7 @@
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.WSToolsConstants;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.IOUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -33,7 +33,6 @@
import javax.xml.rpc.encoding.TypeMapping;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.WSDL11Validator;
import org.jboss.test.ws.tools.validation.WSDLValidator;
@@ -47,6 +46,7 @@
import org.jboss.ws.tools.client.ServiceCreator;
import org.jboss.ws.tools.exceptions.JBossWSToolsException;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.JavaUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,10 +23,10 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.WSDLToJava;
import org.jboss.ws.tools.interfaces.WSDLToJavaIntf;
+import org.jboss.wsf.spi.test.JBossWSTest;
/** Testcase that tests WSDL 2.0 Assertions for the JBossWS Tools project
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,13 +24,13 @@
import java.io.IOException;
import java.util.List;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.Configuration;
import org.jboss.ws.tools.WSTools;
import org.jboss.ws.tools.Configuration.JavaToWSDLConfig;
import org.jboss.ws.tools.Configuration.OperationConfig;
import org.jboss.ws.tools.Configuration.WSDLToJavaConfig;
import org.jboss.ws.tools.config.ToolsSchemaConfigReader;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* TestCase that tests the parsing of the xml configuration file
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,8 +23,8 @@
import java.io.FileInputStream;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,12 +27,12 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.common.jbossxb.complex.Derived;
import org.jboss.test.ws.common.jbossxb.simple.SimpleUserType;
import org.jboss.ws.Constants;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,12 +26,12 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_161.customexceptions.UserException;
import org.jboss.test.ws.tools.sei.Derived;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition;
import org.jboss.ws.tools.schema.SchemaTypeCreator;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,8 +28,8 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.tools.WSContractProvider;
import org.jboss.wsf.spi.utils.JavaUtils;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,10 +23,10 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,8 +23,8 @@
import java.io.IOException;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,9 +25,9 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.util.xml.DOMUtils;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.IOUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -25,8 +25,8 @@
import java.io.FileInputStream;
import java.io.FileReader;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,10 +23,10 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* JBWS-1184 - Test the use of wrapper jave type for generated source
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,10 +23,10 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test for a port name which ends 'PortType'
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,10 +24,10 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,11 +24,11 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.WSException;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* [JBWS-1260] - Test case to test various scenarios unwrapping parameters
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,10 +23,10 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,10 +24,10 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,10 +23,10 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,10 +24,10 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test case to test WSDL to Java where the element names in the
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,10 +24,10 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test case for http://jira.jboss.com/jira/browse/JBWS-1607
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,10 +24,10 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test case for http://jira.jboss.com/jira/browse/JBWS-1627
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,11 +29,11 @@
import org.apache.ws.policy.util.DOMPolicyReader;
import org.apache.ws.policy.util.PolicyFactory;
import org.apache.ws.policy.util.PolicyReader;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.IOUtils;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,10 +23,10 @@
import java.io.File;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
*
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,8 +23,8 @@
import java.io.FileInputStream;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,10 +26,10 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_204.wscompile.anontypes.Items;
import org.jboss.ws.Constants;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -28,12 +28,12 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_204.wscompile.nillabletypes.NillableType;
import org.jboss.ws.Constants;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,7 +26,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.jaxrpcmapping.MethodParamPartsMapping;
@@ -37,6 +36,7 @@
import org.jboss.ws.metadata.jaxrpcmapping.ServiceInterfaceMapping;
import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping;
import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -27,11 +27,11 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,8 +24,8 @@
import java.io.File;
import org.jboss.logging.Logger;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.wsf.spi.test.JBossWSTest;
/** Checks the fixture for Java Source Code Comparison
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,7 +23,7 @@
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test case that uses XMLUnit to compare two xml files
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -26,7 +26,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
@@ -34,6 +33,7 @@
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.WSDLToJava;
import org.jboss.ws.tools.interfaces.WSDLToJavaIntf;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Test case that tests the WSDLTypes
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -46,7 +46,6 @@
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.apache.xerces.xs.XSWildcard;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSComplexTypeDefinition;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSElementDeclaration;
@@ -55,6 +54,7 @@
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSParticle;
import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.xb.binding.sunday.unmarshalling.LSInputAdaptor;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
Deleted: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,293 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import javax.management.MBeanServerConnection;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.xml.ws.Service;
-
-import junit.framework.TestCase;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.utils.DOMUtils;
-import org.jboss.wsf.spi.utils.DOMWriter;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Base class for JBossWS test cases
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public abstract class JBossWSTest extends TestCase
-{
- // provide logging
- protected Logger log = Logger.getLogger(getClass().getName());
-
- private JBossWSTestHelper delegate = new JBossWSTestHelper();
-
- public JBossWSTest()
- {
- }
-
- public JBossWSTest(String name)
- {
- super(name);
- }
-
- /** Get the MBeanServerConnection from JNDI */
- public MBeanServerConnection getServer() throws NamingException
- {
- return JBossWSTestHelper.getServer();
- }
-
- public boolean isTargetJBoss50()
- {
- return JBossWSTestHelper.isTargetJBoss50();
- }
-
- public boolean isTargetJBoss42()
- {
- return JBossWSTestHelper.isTargetJBoss42();
- }
-
- public boolean isIntegrationNative()
- {
- return delegate.isIntegrationNative();
-
- }
-
- public boolean isIntegrationSunRI()
- {
- return delegate.isIntegrationSunRI();
- }
-
- public boolean isIntegrationXFire()
- {
- return delegate.isIntegrationXFire();
- }
-
- /** Deploy the given archive
- */
- public void deploy(String archive) throws Exception
- {
- delegate.deploy(archive);
- }
-
- /** Undeploy the given archive
- */
- public void undeploy(String archive) throws Exception
- {
- delegate.undeploy(archive);
- }
-
- /** Get the client's env context for a given name.
- */
- protected InitialContext getInitialContext(String clientName) throws NamingException
- {
- InitialContext iniCtx = new InitialContext();
- Hashtable env = iniCtx.getEnvironment();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.put("j2ee.clientName", clientName);
- return new InitialContext(env);
- }
-
- /** Get the client's env context
- */
- protected InitialContext getInitialContext() throws NamingException
- {
- return getInitialContext("jbossws-client");
- }
-
- public boolean hasJDK15()
- {
- try
- {
- Class.forName("java.lang.Enum");
- return true;
- }
- catch (ClassNotFoundException ex)
- {
- return false;
- }
- }
-
- public String getServerHost()
- {
- return JBossWSTestHelper.getServerHost();
- }
-
- public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace)
- {
- normalizeWhitspace(expElement, ignoreWhitespace);
- normalizeWhitspace(wasElement, ignoreWhitespace);
- String expStr = DOMWriter.printNode(expElement, false);
- String wasStr = DOMWriter.printNode(wasElement, false);
- if (expStr.equals(wasStr) == false)
- {
- System.out.println("\nExp: " + expStr + "\nWas: " + wasStr);
- Logger.getLogger(JBossWSTest.class).error("\nExp: " + expStr + "\nWas: " + wasStr);
- }
- assertEquals(expStr, wasStr);
- }
-
- public static void assertEquals(Element expElement, Element wasElement)
- {
- assertEquals(expElement, wasElement, false);
- }
-
- public static void assertEquals(Object exp, Object was)
- {
- if (exp instanceof Object[] && was instanceof Object[])
- assertEqualsArray((Object[])exp, (Object[])was);
- else if (exp instanceof byte[] && was instanceof byte[])
- assertEqualsArray((byte[])exp, (byte[])was);
- else if (exp instanceof boolean[] && was instanceof boolean[])
- assertEqualsArray((boolean[])exp, (boolean[])was);
- else if (exp instanceof short[] && was instanceof short[])
- assertEqualsArray((short[])exp, (short[])was);
- else if (exp instanceof int[] && was instanceof int[])
- assertEqualsArray((int[])exp, (int[])was);
- else if (exp instanceof long[] && was instanceof long[])
- assertEqualsArray((long[])exp, (long[])was);
- else if (exp instanceof float[] && was instanceof float[])
- assertEqualsArray((float[])exp, (float[])was);
- else if (exp instanceof double[] && was instanceof double[])
- assertEqualsArray((double[])exp, (double[])was);
- else TestCase.assertEquals(exp, was);
- }
-
- private static void assertEqualsArray(Object[] exp, Object[] was)
- {
- if (exp == null && was == null)
- return;
-
- if (exp != null && was != null)
- {
- if (exp.length != was.length)
- {
- fail("Expected <" + exp.length + "> array items, but was <" + was.length + ">");
- }
- else
- {
- for (int i = 0; i < exp.length; i++)
- {
-
- Object compExp = exp[i];
- Object compWas = was[i];
- assertEquals(compExp, compWas);
- }
- }
- }
- else if (exp == null)
- {
- fail("Expected a null array, but was: " + Arrays.asList(was));
- }
- else if (was == null)
- {
- fail("Expected " + Arrays.asList(exp) + ", but was: null");
- }
- }
-
- private static void assertEqualsArray(byte[] exp, byte[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(boolean[] exp, boolean[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(short[] exp, short[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(int[] exp, int[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(long[] exp, long[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(float[] exp, float[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- private static void assertEqualsArray(double[] exp, double[] was)
- {
- assertTrue("Arrays don't match", Arrays.equals(exp, was));
- }
-
- /** Removes whitespace text nodes if they have an element sibling.
- */
- private static void normalizeWhitspace(Element element, boolean ignoreWhitespace)
- {
- boolean hasChildElement = false;
- ArrayList toDetach = new ArrayList();
-
- String nodeName = element.getNodeName();
- NodeList childNodes = element.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++)
- {
- Node node = childNodes.item(i);
- if (node.getNodeType() == Node.TEXT_NODE)
- {
- String nodeValue = node.getNodeValue();
- if (nodeValue.trim().length() == 0)
- toDetach.add(node);
- }
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- normalizeWhitspace((Element)node, ignoreWhitespace);
- hasChildElement = true;
- }
- }
-
- // remove whitespace nodes
- if (hasChildElement || ignoreWhitespace)
- {
- Iterator it = toDetach.iterator();
- while (it.hasNext())
- {
- Node node = (Node)it.next();
- element.removeChild(node);
- }
- }
- }
-}
Deleted: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,201 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
-import org.jboss.wsf.spi.utils.ObjectNameFactory;
-
-/**
- * A JBossWS test helper that deals with test deployment/undeployment, etc.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class JBossWSTestHelper
-{
- // provide logging
- private static Logger log = Logger.getLogger(JBossWSTestHelper.class);
-
- private static MBeanServerConnection server;
- private static String integrationTarget;
-
- /** Deploy the given archive
- */
- public void deploy(String archive) throws Exception
- {
- URL url = getArchiveURL(archive);
- getDeployer().deploy(url);
- }
-
- /** Undeploy the given archive
- */
- public void undeploy(String archive) throws Exception
- {
- URL url = getArchiveURL(archive);
- getDeployer().undeploy(url);
- }
-
- /** True, if -Djbossws.integration.target=jboss50 */
- public static boolean isTargetJBoss50()
- {
- String target = getIntegrationTarget();
- return "jboss50".equals(target);
- }
-
- /** True, if -Djbossws.integration.target=jboss42 */
- public static boolean isTargetJBoss42()
- {
- String target = getIntegrationTarget();
- return "jboss42".equals(target);
- }
-
- public boolean isIntegrationNative()
- {
- String vendor = Service.class.getPackage().getImplementationVendor();
- return vendor.startsWith("JBoss");
- }
-
- public boolean isIntegrationSunRI()
- {
- String vendor = Service.class.getPackage().getImplementationVendor();
- return vendor.startsWith("Sun Microsystems");
- }
-
- public boolean isIntegrationXFire()
- {
- throw new NotImplementedException();
- }
-
- /**
- * Get the JBoss server host from system property "jboss.bind.address"
- * This defaults to "localhost"
- */
- public static String getServerHost()
- {
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- return hostName;
- }
-
- public static MBeanServerConnection getServer()
- {
- if (server == null)
- {
- Hashtable jndiEnv = null;
- try
- {
- InitialContext iniCtx = new InitialContext();
- jndiEnv = iniCtx.getEnvironment();
- server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
- }
- catch (NamingException ex)
- {
- throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex);
- }
- }
- return server;
- }
-
- private TestDeployer getDeployer()
- {
- return new TestDeployerJBoss(getServer());
- }
-
- private static String getIntegrationTarget()
- {
- if (integrationTarget == null)
- {
- integrationTarget = System.getProperty("jbossws.integration.target");
-
- if (integrationTarget == null)
- throw new IllegalStateException("Cannot obtain jbossws.integration.target");
-
- // Read the JBoss SpecificationVersion
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
- if (jbossVersion.startsWith("5.0"))
- jbossVersion = "jboss50";
- else if (jbossVersion.startsWith("4.2"))
- jbossVersion = "jboss42";
- else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
-
- if (jbossVersion.equals(integrationTarget) == false)
- {
- throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
- //integrationTarget = jbossVersion;
- }
- }
- catch (Throwable th)
- {
- // ignore, we are not running on jboss-4.2 or greater
- }
- }
- return integrationTarget;
- }
-
- /** Try to discover the URL for the deployment archive */
- public URL getArchiveURL(String archive) throws MalformedURLException
- {
- URL url = null;
- try
- {
- url = new URL(archive);
- }
- catch (MalformedURLException ignore)
- {
- // ignore
- }
-
- if (url == null)
- {
- File file = new File(archive);
- if (file.exists())
- url = file.toURL();
- }
-
- if (url == null)
- {
- File file = new File("libs/" + archive);
- if (file.exists())
- url = file.toURL();
- }
-
- if (url == null)
- throw new IllegalArgumentException("Cannot obtain URL for: " + archive);
-
- return url;
- }
-}
Deleted: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,124 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * A test setup that deploys/undeploys archives
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class JBossWSTestSetup extends TestSetup
-{
- private JBossWSTestHelper delegate = new JBossWSTestHelper();
- private String[] archives = new String[0];
-
- public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList)
- {
- return new JBossWSTestSetup(testClass, archiveList);
- }
-
- public static JBossWSTestSetup newTestSetup(Test test, String archiveList)
- {
- return new JBossWSTestSetup(test, archiveList);
- }
-
- protected JBossWSTestSetup(Class testClass, String archiveList)
- {
- super(new TestSuite(testClass));
- getArchiveArray(archiveList);
- }
-
- protected JBossWSTestSetup(Test test, String archiveList)
- {
- super(test);
- getArchiveArray(archiveList);
- }
-
- private void getArchiveArray(String archiveList)
- {
- if (archiveList != null)
- {
- StringTokenizer st = new StringTokenizer(archiveList, ", ");
- archives = new String[st.countTokens()];
-
- for (int i = 0; i < archives.length; i++)
- archives[i] = st.nextToken();
- }
- }
-
- protected void setUp() throws Exception
- {
- List clientJars = new ArrayList();
- for (int i = 0; i < archives.length; i++)
- {
- String archive = archives[i];
- try
- {
- delegate.deploy(archive);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- delegate.undeploy(archive);
- }
-
- if (archive.endsWith("-client.jar"))
- {
- URL archiveURL = delegate.getArchiveURL(archive);
- clientJars.add(archiveURL);
- }
- }
-
- // add the client jars to the classloader
- if (!clientJars.isEmpty())
- {
- ClassLoader parent = Thread.currentThread().getContextClassLoader();
- URL[] urls = new URL[clientJars.size()];
- for (int i = 0; i < clientJars.size(); i++)
- {
- urls[i] = (URL)clientJars.get(i);
- }
- URLClassLoader cl = new URLClassLoader(urls, parent);
- Thread.currentThread().setContextClassLoader(cl);
- }
- }
-
- protected void tearDown() throws Exception
- {
- for (int i = 0; i < archives.length; i++)
- {
- String archive = archives[archives.length - i - 1];
- delegate.undeploy(archive);
- }
- }
-}
Deleted: trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.net.URL;
-
-/**
- * WS test deployer
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-May-2006
- */
-public interface TestDeployer
-{
- /** Deploy the given archive
- */
- void deploy(URL archive) throws Exception;
-
- /** Undeploy the given archive
- */
- void undeploy(URL archive) throws Exception;
-}
\ No newline at end of file
Deleted: trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.net.URL;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-/**
- * A JBossWS test helper that deals with test deployment/undeployment, etc.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class TestDeployerJBoss implements TestDeployer
-{
- private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
-
- private MBeanServerConnection server;
-
- public TestDeployerJBoss(MBeanServerConnection server)
- {
- this.server = server;
- }
-
- public void deploy(URL url) throws Exception
- {
- server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" });
- }
-
- public void undeploy(URL url) throws Exception
- {
- server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" });
- }
-}
Deleted: trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-// $Id$
-
-import java.awt.Image;
-import java.awt.Toolkit;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.activation.DataHandler;
-import javax.xml.transform.stream.StreamSource;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @since 22-Sep-2006
- */
-public class XOPTestSupport
-{
-
- public static byte[] getBytesFromFile(File file) throws IOException
- {
- InputStream is = new FileInputStream(file);
-
- long length = file.length();
- byte[] bytes = new byte[(int)length];
-
- int offset = 0;
- int numRead = 0;
- while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)
- {
- offset += numRead;
- }
-
- is.close();
- return bytes;
- }
-
- public static Image createTestImage(File imgFile)
- {
- Image image = null;
- try
- {
- URL url = imgFile.toURL();
-
- image = null;
- try
- {
- image = Toolkit.getDefaultToolkit().createImage(url);
- }
- catch (Throwable th)
- {
- //log.warn("Cannot create Image: " + th);
- }
- }
- catch (MalformedURLException e)
- {
- throw new RuntimeException(e);
- }
-
- return image;
- }
-
- public static StreamSource createTestSource()
- {
- return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes()));
- }
-
- public static DataHandler createDataHandler(File imgFile)
- {
- try
- {
- URL url = imgFile.toURL();
- return new DataHandler(url);
- }
- catch (MalformedURLException e)
- {
- throw new RuntimeException(e);
- }
- }
-}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -39,8 +39,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.xml.sax.InputSource;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -35,8 +35,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JAXWS asynchrous proxy
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,8 +32,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JAXWS WebServiceContext
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,8 +32,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JAXWS WebServiceContext
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,9 +29,9 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestHelper;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestHelper;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test ear deployment
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -29,8 +29,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.w3c.dom.Element;
/**
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,8 +32,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JSR-181 annotation: javax.jws.HandlerChain
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -36,8 +36,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -37,8 +37,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -56,7 +56,7 @@
import javax.xml.registry.infomodel.TelephoneNumber;
import javax.xml.registry.infomodel.User;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -31,8 +31,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JAXWS logical handlers
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test JAXWS logical handlers
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -33,8 +33,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Element;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -43,8 +43,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -43,8 +43,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -44,8 +44,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -37,8 +37,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JSR-181 annotation: javax.jws.SOAPBinding
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -1,9 +1,10 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.xml.ws.Service;
import javax.xml.namespace.QName;
import javax.activation.DataHandler;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -40,8 +40,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JSR-181 annotation: javax.jws.WebParam
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -35,8 +35,8 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JSR-181 annotation: javax.jws.webresult
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,7 +30,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* Base testing class for @WebService
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JSR-181 annotation: javax.jws.WebService
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test the JSR-181 annotation: javax.jws.WebService
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -30,8 +30,8 @@
import javax.xml.transform.Source;
import javax.xml.ws.soap.SOAPBinding;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.jaxws.samples.xop.XOPTestSupport;
+import org.jboss.wsf.spi.test.JBossWSTest;
/**
* User: hbraun
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -24,8 +24,9 @@
// $Revision: $
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -32,7 +32,7 @@
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
/**
* Test service endpoint capability to process inlined and optimized
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341)
@@ -22,9 +22,10 @@
package org.jboss.test.ws.jaxws.samples.xop.doclit;
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.BindingProvider;
17 years, 6 months
- 1
- 0
JBossWS SVN: r3340 - in trunk: jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 10:57:14 -0400 (Thu, 31 May 2007)
New Revision: 3340
Added:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java
Removed:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerTomcat.java
Modified:
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
trunk/testsuite/ant-import/build-jars-jaxws.xml
trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java
trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java
trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java
Log:
Add FIXME: [JBWS-1670] SunRI client does not throw UserException
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-31 14:57:14 UTC (rev 3340)
@@ -5,7 +5,6 @@
# [JBWS-1699] - Fix WebServiceContext.getMessageContext()
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-org/jboss/test/ws/jaxws/samples/exception/**
org/jboss/test/ws/jaxws/samples/handlerchain/**
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -305,7 +305,7 @@
}
if (faultBeanName == null)
- faultBeanName = JavaUtils.getPackageName(omd.getEndpointMetaData().getServiceEndpointInterface()) + "." + exception.getSimpleName() + "Bean";
+ faultBeanName = JavaUtils.getPackageName(omd.getEndpointMetaData().getServiceEndpointInterface()) + ".jaxws." + exception.getSimpleName() + "Bean";
QName xmlName = new QName(namespace, name);
@@ -364,7 +364,7 @@
if (requestWrapperType == null)
{
String packageName = JavaUtils.getPackageName(method.getDeclaringClass());
- requestWrapperType = packageName + "." + JavaUtils.capitalize(method.getName());
+ requestWrapperType = packageName + ".jaxws." + JavaUtils.capitalize(method.getName());
}
// JAX-WS p.37 pg.1, the annotation only affects the element name, not the type name
@@ -397,7 +397,7 @@
if (responseWrapperType == null)
{
String packageName = JavaUtils.getPackageName(method.getDeclaringClass());
- responseWrapperType = packageName + "." + JavaUtils.capitalize(method.getName()) + "Response";
+ responseWrapperType = packageName + ".jaxws." + JavaUtils.capitalize(method.getName()) + "Response";
}
ParameterMetaData retMetaData = new ParameterMetaData(operation, xmlName, xmlType, responseWrapperType);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -143,7 +143,7 @@
JMethod method = clazz.method(JMod.PUBLIC, type, getterPrefix(type) + JavaUtils.capitalize(variable));
method.body()._return(JExpr._this().ref(variable));
- method = clazz.method(JMod.PUBLIC, type, "set" + JavaUtils.capitalize(variable));
+ method = clazz.method(JMod.PUBLIC, void.class, "set" + JavaUtils.capitalize(variable));
method.body().assign(JExpr._this().ref(variable), method.param(type, variable));
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -43,10 +43,10 @@
{
// provide logging
private static Logger log = Logger.getLogger(JBossWSTestHelper.class);
-
+
private static MBeanServerConnection server;
private static String integrationTarget;
-
+
/** Deploy the given archive
*/
public void deploy(String archive) throws Exception
@@ -97,7 +97,7 @@
String target = getIntegrationTarget();
return "jboss40".equals(target);
}
-
+
/**
* Get the JBoss server host from system property "jboss.bind.address"
* This defaults to "localhost"
@@ -108,7 +108,7 @@
return hostName;
}
- public static MBeanServerConnection getServer()
+ public static MBeanServerConnection getServer()
{
if (server == null)
{
@@ -127,20 +127,7 @@
private TestDeployer getDeployer()
{
- if (isTargetJBoss())
- {
- return new TestDeployerJBoss(getServer());
- }
- else if (isTargetTomcat())
- {
- String username = System.getProperty("tomcat.manager.username");
- String password = System.getProperty("tomcat.manager.password");
- return new TestDeployerTomcat(username, password);
- }
- else
- {
- throw new IllegalStateException("Unsupported integration target: " + getIntegrationTarget());
- }
+ return new TestDeployerJBoss(getServer());
}
private static String getIntegrationTarget()
@@ -148,7 +135,7 @@
if (integrationTarget == null)
{
integrationTarget = System.getProperty("jbossws.integration.target");
-
+
// Read the JBoss SpecificationVersion
try
{
@@ -160,9 +147,8 @@
jbossVersion = "jboss42";
else if (jbossVersion.startsWith("4.0"))
jbossVersion = "jboss40";
- else
- throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
-
+ else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
+
if (jbossVersion.equals(integrationTarget) == false)
{
log.warn("Integration target mismatch, using: " + jbossVersion);
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerTomcat.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -1,129 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.util.Base64;
-
-/**
- * A deployer that deploys to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-May-2006
- */
-public class TestDeployerTomcat implements TestDeployer
-{
- private String username, password;
-
- // Map<String,String> of URL to context path
- private static Map pathMap = new HashMap();
-
- public TestDeployerTomcat(String username, String password)
- {
- this.username = username;
- this.password = password;
- }
-
- public void deploy(URL url) throws Exception
- {
- File destDir = new File(new File(url.getFile()).getParent() + "/wspublish");
- destDir.mkdirs();
-
- // Use reflection to invoke wspublish.process() from the tomcat integration layer
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class wspublishClass = loader.loadClass("org.jboss.ws.integration.tomcat.wspublish");
- Method process = wspublishClass.getMethod("process", new Class[]{URL.class, File.class, String.class});
- URL warURL = (URL)process.invoke(wspublishClass.newInstance(), new Object[]{url, destDir, null});
-
- String path = warURL.toExternalForm();
- path = path.substring(path.lastIndexOf("/"));
- if (path.endsWith(".war"))
- path = path.substring(0, path.length() - 4);
-
- URL managerURL = new URL(getManagerPath() + "/deploy?path=" + path + "&war=" + warURL.toExternalForm());
- HttpURLConnection con = getURLConnection(managerURL);
-
- con.connect();
-
- BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
- String status = br.readLine();
-
- if (status == null)
- throw new IllegalStateException("Cannot obtain deploy status");
-
- if (status.startsWith("OK") == false)
- throw new IllegalStateException("Cannot deploy application: " + status);
-
- path = status.substring(status.indexOf("/"));
- pathMap.put(url.toExternalForm(), path);
- }
-
- public void undeploy(URL url) throws Exception
- {
- String path = (String) pathMap.get(url.toExternalForm());
- if (path != null)
- {
- URL managerURL = new URL(getManagerPath() + "/undeploy?path=" + path);
- HttpURLConnection con = getURLConnection(managerURL);
-
- con.connect();
-
- BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
- String status = br.readLine();
-
- if (status == null)
- throw new IllegalStateException("Cannot obtain undeploy status");
-
- if (status.startsWith("OK") == false)
- throw new IllegalStateException("Cannot undeploy application: " + status);
- }
- }
-
- private String getManagerPath() throws MalformedURLException
- {
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- return "http://" + hostName + ":8080/manager";
- }
-
- private HttpURLConnection getURLConnection(URL managerURL) throws IOException, ProtocolException
- {
- HttpURLConnection con = (HttpURLConnection)managerURL.openConnection();
- con.setRequestMethod("GET");
- con.setDoInput(true);
-
- String authorization = username + ":" + password;
- authorization = Base64.encodeBytes(authorization.getBytes());
- con.setRequestProperty("Authorization", "Basic " + authorization);
- return con;
- }
-}
Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-31 14:57:14 UTC (rev 3340)
@@ -82,6 +82,7 @@
<!-- jaxws-samples-exception -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/exception/jaxws/**"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/>
Modified: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -30,7 +30,9 @@
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.namespace.QName;
import javax.xml.transform.Source;
+import javax.xml.ws.Service;
import junit.framework.TestCase;
@@ -69,18 +71,6 @@
return JBossWSTestHelper.getServer();
}
- /** True, if -Djbossws.integration.target=jboss?? */
- public boolean isTargetJBoss()
- {
- return JBossWSTestHelper.isTargetJBoss();
- }
-
- /** True, if -Djbossws.integration.target=tomcat */
- public boolean isTargetTomcat()
- {
- return JBossWSTestHelper.isTargetTomcat();
- }
-
public boolean isTargetJBoss50()
{
return JBossWSTestHelper.isTargetJBoss50();
@@ -91,11 +81,22 @@
return JBossWSTestHelper.isTargetJBoss42();
}
- public boolean isTargetJBoss40()
+ public boolean isIntegrationNative()
{
- return JBossWSTestHelper.isTargetJBoss40();
+ return delegate.isIntegrationNative();
+
}
+ public boolean isIntegrationSunRI()
+ {
+ return delegate.isIntegrationSunRI();
+ }
+
+ public boolean isIntegrationXFire()
+ {
+ return delegate.isIntegrationXFire();
+ }
+
/** Deploy the given archive
*/
public void deploy(String archive) throws Exception
@@ -146,11 +147,6 @@
return JBossWSTestHelper.getServerHost();
}
- public Element getElementFromSource(Source retObj) throws Exception
- {
- return DOMUtils.sourceToElement(retObj);
- }
-
public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace)
{
normalizeWhitspace(expElement, ignoreWhitespace);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -30,8 +30,11 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
@@ -44,10 +47,10 @@
{
// provide logging
private static Logger log = Logger.getLogger(JBossWSTestHelper.class);
-
+
private static MBeanServerConnection server;
private static String integrationTarget;
-
+
/** Deploy the given archive
*/
public void deploy(String archive) throws Exception
@@ -64,20 +67,6 @@
getDeployer().undeploy(url);
}
- /** True, if -Djbossws.integration.target=tomcat */
- public static boolean isTargetTomcat()
- {
- String target = getIntegrationTarget();
- return "tomcat".equals(target);
- }
-
- /** True, if -Djbossws.integration.target=jboss?? */
- public static boolean isTargetJBoss()
- {
- String target = getIntegrationTarget();
- return target != null && target.startsWith("jboss");
- }
-
/** True, if -Djbossws.integration.target=jboss50 */
public static boolean isTargetJBoss50()
{
@@ -92,13 +81,23 @@
return "jboss42".equals(target);
}
- /** True, if -Djbossws.integration.target=jboss40 */
- public static boolean isTargetJBoss40()
+ public boolean isIntegrationNative()
{
- String target = getIntegrationTarget();
- return "jboss40".equals(target);
+ String vendor = Service.class.getPackage().getImplementationVendor();
+ return vendor.startsWith("JBoss");
}
+ public boolean isIntegrationSunRI()
+ {
+ String vendor = Service.class.getPackage().getImplementationVendor();
+ return vendor.startsWith("Sun Microsystems");
+ }
+
+ public boolean isIntegrationXFire()
+ {
+ throw new NotImplementedException();
+ }
+
/**
* Get the JBoss server host from system property "jboss.bind.address"
* This defaults to "localhost"
@@ -109,7 +108,7 @@
return hostName;
}
- public static MBeanServerConnection getServer()
+ public static MBeanServerConnection getServer()
{
if (server == null)
{
@@ -130,20 +129,7 @@
private TestDeployer getDeployer()
{
- if (isTargetJBoss())
- {
- return new TestDeployerJBoss(getServer());
- }
- else if (isTargetTomcat())
- {
- String username = System.getProperty("tomcat.manager.username");
- String password = System.getProperty("tomcat.manager.password");
- return null; //new TestDeployerTomcat(username, password);
- }
- else
- {
- throw new IllegalStateException("Unsupported integration target: " + getIntegrationTarget());
- }
+ return new TestDeployerJBoss(getServer());
}
private static String getIntegrationTarget()
@@ -151,7 +137,10 @@
if (integrationTarget == null)
{
integrationTarget = System.getProperty("jbossws.integration.target");
-
+
+ if (integrationTarget == null)
+ throw new IllegalStateException("Cannot obtain jbossws.integration.target");
+
// Read the JBoss SpecificationVersion
try
{
@@ -161,27 +150,18 @@
jbossVersion = "jboss50";
else if (jbossVersion.startsWith("4.2"))
jbossVersion = "jboss42";
- else if (jbossVersion.startsWith("4.0"))
- jbossVersion = "jboss40";
- else
- throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
-
+ else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
+
if (jbossVersion.equals(integrationTarget) == false)
{
- log.warn("Integration target mismatch, using: " + jbossVersion);
- integrationTarget = jbossVersion;
+ throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
+ //integrationTarget = jbossVersion;
}
}
catch (Throwable th)
{
// ignore, we are not running on jboss-4.2 or greater
}
-
- if (integrationTarget == null)
- {
- log.warn("Cannot obtain jbossws.integration.target, using default: tomcat");
- integrationTarget = "tomcat";
- }
}
return integrationTarget;
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -82,21 +82,17 @@
for (int i = 0; i < archives.length; i++)
{
String archive = archives[i];
- boolean isJ2EEClient = archive.endsWith("-client.jar");
- if (delegate.isTargetJBoss() || isJ2EEClient == false)
+ try
{
- try
- {
- delegate.deploy(archive);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- delegate.undeploy(archive);
- }
+ delegate.deploy(archive);
}
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ delegate.undeploy(archive);
+ }
- if (isJ2EEClient)
+ if (archive.endsWith("-client.jar"))
{
URL archiveURL = delegate.getArchiveURL(archive);
clientJars.add(archiveURL);
@@ -104,11 +100,11 @@
}
// add the client jars to the classloader
- if( !clientJars.isEmpty() )
+ if (!clientJars.isEmpty())
{
ClassLoader parent = Thread.currentThread().getContextClassLoader();
URL[] urls = new URL[clientJars.size()];
- for(int i=0; i<clientJars.size(); i++)
+ for (int i = 0; i < clientJars.size(); i++)
{
urls[i] = (URL)clientJars.get(i);
}
@@ -122,11 +118,7 @@
for (int i = 0; i < archives.length; i++)
{
String archive = archives[archives.length - i - 1];
- boolean isJ2EEClient = archive.endsWith("-client.jar");
- if (delegate.isTargetJBoss() || isJ2EEClient == false)
- {
- delegate.undeploy(archive);
- }
+ delegate.undeploy(archive);
}
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -20,12 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.ws.jaxws.samples.exception;
+
import javax.jws.WebService;
@WebService
public interface ExceptionEndpoint
{
public void throwRuntimeException();
+
public void throwSoapFaultException();
+
public void throwApplicationException() throws UserException;
}
\ No newline at end of file
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -87,8 +87,8 @@
}
catch (SOAPFaultException e)
{
- assertEquals("oh no, a runtime exception occured.", e.getMessage());
- assertEquals("oh no, a runtime exception occured.", e.getFault().getFaultString());
+ String faultString = e.getFault().getFaultString();
+ assertTrue(faultString.indexOf("oh no, a runtime exception occured.") > 0);
}
}
@@ -101,7 +101,6 @@
}
catch (SOAPFaultException e)
{
- assertEquals("this is a fault string!", e.getMessage());
assertEquals("this is a fault string!", e.getFault().getFaultString());
assertEquals("mr.actor", e.getFault().getFaultActor());
assertEquals("FooCode", e.getFault().getFaultCodeAsName().getLocalName());
@@ -112,6 +111,12 @@
public void testApplicationException() throws Exception
{
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1670] SunRI client does not throw UserException");
+ return;
+ }
+
try
{
proxy.throwApplicationException();
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -21,12 +21,15 @@
*/
package org.jboss.test.ws.jaxws.samples.exception;
+import javax.xml.ws.WebFault;
+
/**
* A mach application exception
*
* @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
* @version $Revision$
*/
+@WebFault(faultBean="org.jboss.test.ws.jaxws.samples.exception.jaxws.UserExceptionBean")
public class UserException extends Exception
{
private int errorCode;
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.exception.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException")
+@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ThrowApplicationException {
+
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.exception.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse")
+@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ThrowApplicationExceptionResponse {
+
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.exception.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException")
+@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ThrowRuntimeException {
+
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.exception.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse")
+@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ThrowRuntimeExceptionResponse {
+
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.exception.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException")
+@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ThrowSoapFaultException {
+
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.exception.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse")
+@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ThrowSoapFaultExceptionResponse {
+
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -0,0 +1,50 @@
+
+package org.jboss.test.ws.jaxws.samples.exception.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "UserException")
+@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "UserException", propOrder = {
+ "errorCategory",
+ "errorCode",
+ "message"
+})
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class UserExceptionBean {
+
+ @XmlElement(namespace = "", name = "errorCategory")
+ private String errorCategory;
+ @XmlElement(namespace = "", name = "errorCode")
+ private int errorCode;
+ @XmlElement(namespace = "", name = "message")
+ private String message;
+
+ public String getErrorCategory() {
+ return this.errorCategory;
+ }
+
+ public void setErrorCategory(String errorCategory) {
+ this.errorCategory = errorCategory;
+ }
+
+ public int getErrorCode() {
+ return this.errorCode;
+ }
+
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -71,7 +71,7 @@
Dispatch<Source> dispatch = createDispatch("ProviderEndpoint");
Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse(reqString)));
- Element docElement = getElementFromSource(resPayload);
+ Element docElement = DOMUtils.sourceToElement(resPayload);
assertEquals(DOMUtils.parse(resString), docElement);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -68,7 +68,7 @@
payload = "<ns1:feedback xmlns:ns1='http://oneway.samples.jaxws.ws.test.jboss.org/'/>";
Source retObj = (Source)dispatch.invoke(new StreamSource(new StringReader(payload)));
- Element docElement = getElementFromSource(retObj);
+ Element docElement = DOMUtils.sourceToElement(retObj);
Element retElement = DOMUtils.getFirstChildElement(docElement);
String retPayload = DOMWriter.printNode(retElement, false);
assertEquals("<return>ok</return>", retPayload);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -80,7 +80,7 @@
Dispatch<Source> dispatch = createDispatch("ProviderEndpoint");
Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse(reqString)));
- Element docElement = getElementFromSource(resPayload);
+ Element docElement = DOMUtils.sourceToElement(resPayload);
assertEquals(DOMUtils.parse(resString), docElement);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-31 14:30:59 UTC (rev 3339)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-31 14:57:14 UTC (rev 3340)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxws.samples.webmethod;
import java.io.ByteArrayInputStream;
@@ -78,15 +78,8 @@
MessageFactory msgFactory = MessageFactory.newInstance();
SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
- String reqEnv =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" +
- " <ns1:echoString xmlns:ns1='" + targetNS + "'>" +
- " <arg0>Hello</arg0>" +
- " </ns1:echoString>" +
- " </env:Body>" +
- "</env:Envelope>";
+ String reqEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header/>" + " <env:Body>" + " <ns1:echoString xmlns:ns1='"
+ + targetNS + "'>" + " <arg0>Hello</arg0>" + " </ns1:echoString>" + " </env:Body>" + "</env:Envelope>";
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
URL epURL = new URL(endpointURL);
@@ -103,15 +96,8 @@
MessageFactory msgFactory = MessageFactory.newInstance();
SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
- String reqEnv =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" +
- " <ns1:noWebMethod xmlns:ns1='" + targetNS + "'>" +
- " <String_1>Hello</String_1>" +
- " </ns1:noWebMethod>" +
- " </env:Body>" +
- "</env:Envelope>";
+ String reqEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header/>" + " <env:Body>" + " <ns1:noWebMethod xmlns:ns1='"
+ + targetNS + "'>" + " <String_1>Hello</String_1>" + " </ns1:noWebMethod>" + " </env:Body>" + "</env:Envelope>";
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
URL epURL = new URL(endpointURL);
@@ -129,22 +115,18 @@
QName serviceName = new QName(targetNS, "TestEndpointService");
QName portName = new QName(targetNS, "TestEndpointPort");
- String reqPayload =
- "<ns1:noWebMethod xmlns:ns1='" + targetNS + "'>" +
- " <String_1>Hello</String_1>" +
- "</ns1:noWebMethod>";
+ String reqPayload = "<ns1:noWebMethod xmlns:ns1='" + targetNS + "'>" + " <String_1>Hello</String_1>" + "</ns1:noWebMethod>";
- String expPayload =
- "<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <faultcode>env:Client</faultcode>" +
- " <faultstring>Endpoint {http://webmethod.samples.jaxws.ws.test.jboss.org/}TestEndpointPort does not contain operation meta data for: {http://webmethod.samples.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" +
- "</env:Fault>";
+ String expPayload = "<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"
+ + " <faultcode>env:Client</faultcode>"
+ + " <faultstring>Endpoint {http://webmethod.samples.jaxws.ws.test.jboss.org/}TestEndpointPort does not contain operation meta data for: {http://webmethod.samples.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>"
+ + "</env:Fault>";
Service service = Service.create(wsdlURL, serviceName);
Dispatch dispatch = service.createDispatch(portName, StreamSource.class, Mode.PAYLOAD);
Source retSource = (Source)dispatch.invoke(new StreamSource(new StringReader(reqPayload)));
- Element retEl = getElementFromSource(retSource);
-
+ Element retEl = DOMUtils.sourceToElement(retSource);
+
assertEquals(DOMUtils.parse(expPayload), retEl);
}
}
\ No newline at end of file
17 years, 6 months
- 1
- 0
JBossWS SVN: r3339 - in trunk/integration: sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-31 10:30:59 -0400 (Thu, 31 May 2007)
New Revision: 3339
Modified:
trunk/integration/spi/etc/wsconsume.sh
trunk/integration/spi/etc/wsprovide.sh
trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl
Log:
Dynmic wsprovide classpath depending on the stack that's deployed
Modified: trunk/integration/spi/etc/wsconsume.sh
===================================================================
--- trunk/integration/spi/etc/wsconsume.sh 2007-05-31 14:21:01 UTC (rev 3338)
+++ trunk/integration/spi/etc/wsconsume.sh 2007-05-31 14:30:59 UTC (rev 3339)
@@ -38,7 +38,7 @@
fi
#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#AVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
# Setup JBoss sepecific properties
JAVA_OPTS="$JAVA_OPTS"
Modified: trunk/integration/spi/etc/wsprovide.sh
===================================================================
--- trunk/integration/spi/etc/wsprovide.sh 2007-05-31 14:21:01 UTC (rev 3338)
+++ trunk/integration/spi/etc/wsprovide.sh 2007-05-31 14:30:59 UTC (rev 3339)
@@ -46,25 +46,44 @@
# Setup the java endorsed dirs
JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-# Setup the wstools classpath
+# is it a JBossWS-native or SunRI installation?
+if [ -a $JBOSS_HOME/client/jbossws-client.jar ]; then
+ JBOSSWS_NATIVE="true"
+fi
+
+#
+# Setup the wsprovide classpath
+# The classpath is dynamically build depending on the stack that
+# is deployed. See $JBOSSWS_NATIVE above.
+#
+
+# shared libs
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
-
+# shared jaxws libs
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
+# stack specific dependencies
+if [ "x$JBOSSWS_NATIVE" = "x" ]; then
+ echo "Seems to be a Sun-RI stack deployed"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-sunri-client.jar"
+else
+ echo "Seems to be a JBossWS-Native stack deployed"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+fi
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl 2007-05-31 14:21:01 UTC (rev 3338)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl 2007-05-31 14:30:59 UTC (rev 3339)
@@ -1 +1 @@
-TODO:SUNRIProviderImpl
\ No newline at end of file
+FIXME: JBWS-1667 (Implement WSContractProvider for Sun-RI integration)
\ No newline at end of file
17 years, 6 months
- 1
- 0
JBossWS SVN: r3338 - in trunk/integration: sunri/ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-31 10:21:01 -0400 (Thu, 31 May 2007)
New Revision: 3338
Modified:
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
Log:
Cleanup deployment task with regard to SPI tools dependencies
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 13:56:45 UTC (rev 3337)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 14:21:01 UTC (rev 3338)
@@ -13,199 +13,208 @@
<project>
- <!-- ================================================================== -->
- <!-- Deployment JBossWS/Native -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Deployment JBossWS/Native -->
+ <!-- ================================================================== -->
- <macrodef name="macro-deploy-native50">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <element name="copy-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <copy todir="${jboss50.home}/client" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
+ <macrodef name="macro-deploy-native50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <element name="copy-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <copy-tasks/>
-
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
- <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>
- <!-- Deploy juddi-service.sar -->
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native50">
- <element name="delete-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <delete>
- <fileset dir="${jboss50.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss50.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-jboss50.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
- <!-- Undeploy juddi-service.sar -->
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
- <delete-tasks/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-native42">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <element name="copy-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <copy todir="${jboss42.home}/client" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
+ <!-- SERVER JARS -->
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
- <copy-tasks/>
-
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <!-- Deploy juddi-service.sar -->
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native42">
- <element name="delete-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <delete>
- <fileset dir="${jboss42.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss42.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/lib">
- <include name="jbossws-integration.jar"/> <!-- The old integration jar-->
- </fileset>
- <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-jboss42.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <!-- Undeploy juddi-service.sar -->
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <copy-tasks/>
- <delete-tasks/>
- </sequential>
- </macrodef>
-
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native50">
+ <element name="delete-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <delete>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss50.home}/client">
+
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+
+ <include name="jbossws-integration-tools.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+
+ <include name="jbossws-jboss50.jar"/>
+
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
+ <delete-tasks/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-native42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <element name="copy-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-integration-tools.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+
+ <copy-tasks/>
+
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native42">
+ <element name="delete-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <!--include name="jbossws-spi.jar"/-->
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-integration-tools.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+
+ <include name="jbossws-jboss42.jar"/>
+
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/lib">
+ <include name="jbossws-integration.jar"/> <!-- The old integration jar-->
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
+ <delete-tasks/>
+ </sequential>
+ </macrodef>
+
</project>
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-31 13:56:45 UTC (rev 3337)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-31 14:21:01 UTC (rev 3338)
@@ -13,135 +13,136 @@
<project>
- <!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-sunri50">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/client">
- <fileset dir="@{stacklibs}">
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-sunri50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/>
- <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss50 -->
- <macrodef name="macro-undeploy-sunri50">
- <sequential>
- <delete>
- <fileset dir="${jboss50.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-sunri42">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/client">
- <fileset dir="@{stacklibs}">
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss42 -->
- <macrodef name="macro-undeploy-sunri42">
- <sequential>
- <delete>
- <fileset dir="${jboss42.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- </sequential>
- </macrodef>
-
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss50 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-sunri50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/>
+ <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss50 -->
+ <macrodef name="macro-undeploy-sunri50">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss50.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+
+ <include name="jbossws-jboss50.jar"/>
+
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-sunri42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/client">
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss42 -->
+ <macrodef name="macro-undeploy-sunri42">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+
+ <include name="jbossws-jboss42.jar"/>
+
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ </sequential>
+ </macrodef>
+
</project>
17 years, 6 months
- 1
- 0