JBossWS SVN: r2245 - in branches/jbossws-1.2.0: integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50 and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 19:31:28 -0500 (Thu, 01 Feb 2007)
New Revision: 2245
Modified:
branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java
branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml
Log:
Simplify Configurable, ConfigurationProvider
Modified: branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -29,7 +29,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.server.AbstractServiceEndpointServlet;
import org.jboss.ws.core.server.ServiceEndpoint;
-import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
/**
@@ -61,13 +60,8 @@
{
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
+ sepMetaData.setConfigName(configName, configFile);
- ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData;
- configProvider.setConfigName(configName, configFile);
-
- // configure handler chain
- configProvider.configure(sepMetaData);
-
log.debug("Updated server meta data" + sepMetaData);
}
}
Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -62,12 +62,8 @@
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
- ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData;
- configProvider.setConfigName(configName, configFile);
+ sepMetaData.setConfigName(configName, configFile);
- // configure handler chain
- configProvider.configure(sepMetaData);
-
log.debug("Updated server meta data" + sepMetaData);
}
}
Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-02 00:31:28 UTC (rev 2245)
@@ -60,11 +60,10 @@
<priority value="INFO"/>
</category>
- <!-- Enable SOAP message tracing
+ <!-- Enable SOAP message tracing -->
<category name="jbossws.SOAPMessage">
<priority value="TRACE" class="org.jboss.logging.XLevel"/>
</category>
- -->
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -65,22 +65,19 @@
private void configure()
{
// process MTOM config elements
- if(epMetaData!=null)
+ if (epMetaData != null)
{
- ConfigurationProvider configProvider = (ConfigurationProvider)epMetaData;
- configProvider.configure(this);
+ epMetaData.configure(this);
}
}
protected void initBinding(String bindingId, Type type)
{
- if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId)
- || CommonSOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId))
+ if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) || CommonSOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId))
{
binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS() : new SOAP11BindingJAXRPC());
}
- else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)
- || CommonSOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId))
+ else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || CommonSOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId))
{
binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS() : new SOAP12BindingJAXRPC());
}
@@ -88,7 +85,7 @@
{
throw new WSException("Unsupported binding: " + bindingId);
}
-
+
}
public CommonBinding getCommonBinding()
@@ -96,7 +93,8 @@
return binding;
}
- public void update(Observable observable, Object object) {
+ public void update(Observable observable, Object object)
+ {
log.debug("Update config: " + object);
configure();
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -21,6 +21,8 @@
*/
package org.jboss.ws.core.jaxws;
+// $Id: $
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -35,18 +37,19 @@
* Cache JAXBContext's.
*
* @author Heiko.Braun(a)jboss.org
- * @version $Id:$
* @since 26.01.2007
*/
-public class JAXBContextCache {
-
+public class JAXBContextCache
+{
private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>();
- private JAXBContext get(Integer id) {
+ private JAXBContext get(Integer id)
+ {
return cache.get(id);
}
- private void add(Integer id, JAXBContext context) {
+ private void add(Integer id, JAXBContext context)
+ {
cache.put(id, context);
}
@@ -61,7 +64,7 @@
{
Integer id = buildId(classes);
JAXBContext ctx = get(id);
- if(null==ctx)
+ if (null == ctx)
{
ctx = JAXBContext.newInstance(classes);
add(id, ctx);
@@ -81,7 +84,7 @@
{
Integer id = buildId(clazz);
JAXBContext ctx = get(id);
- if(null==ctx)
+ if (null == ctx)
{
ctx = JAXBContext.newInstance(clazz);
add(id, ctx);
@@ -105,7 +108,7 @@
private static Integer buildId(Class[] classes)
{
int sum = 0;
- for(Class cls : classes)
+ for (Class cls : classes)
{
sum += cls.hashCode();
}
@@ -114,6 +117,6 @@
private static Integer buildId(Class clazz)
{
- return buildId(new Class[] {clazz});
+ return buildId(new Class[] { clazz });
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -127,9 +127,6 @@
{
log.debug("Configuration change event received. Reconfigure handler chain: " + object);
- // reconfigure endpoint meta data handler information from config
- ((ConfigurationProvider)epMetaData).configure(epMetaData);
-
// re-populate the binding handler chain
resetCreateBindingHandlerChain();
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -33,8 +33,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -223,14 +221,6 @@
private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData)
{
- // Add pre handlers
- UnifiedVirtualFile vfsRoot = epMetaData.getRootFile();
- String configName = epMetaData.getConfigName();
- String configFile = epMetaData.getConfigFile();
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile);
- epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.PRE));
-
// Setup the endpoint handlers
if (serviceRefMetaData != null)
{
@@ -243,9 +233,6 @@
}
}
}
-
- // Add post handlers
- epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.POST));
}
private void setupSecurity(WSSecurityConfiguration securityConfig, UnifiedVirtualFile vfsRoot)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -22,7 +22,6 @@
// $Id$
package org.jboss.ws.metadata.builder.jaxrpc;
-import java.net.URL;
import java.util.Set;
import javax.management.ObjectName;
@@ -30,9 +29,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
@@ -220,14 +216,6 @@
// Setup the endpoint operations
setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping);
- // Add pre handlers
- UnifiedVirtualFile vfsRoot = sepMetaData.getRootFile();
- String configName = sepMetaData.getConfigName();
- String configFile = sepMetaData.getConfigFile();
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile);
- sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE));
-
// Setup the endpoint handlers
for (UnifiedHandlerMetaData uhmd : pcMetaData.getHandlers())
{
@@ -237,9 +225,6 @@
sepMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(sepMetaData, HandlerType.ENDPOINT));
}
}
-
- // Add post handlers
- sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.POST));
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -196,7 +196,7 @@
processSOAPBinding(epMetaData, wsClass);
// process config, this will as well setup the handler
- epMetaData.configure(epMetaData);
+ epMetaData.initEndpointConfig();
// Process an optional @HandlerChain annotation
processHandlerChain(epMetaData, wsClass);
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -146,7 +146,7 @@
processWebContext(udi, sepClass, linkName, sepMetaData);
// setup handler chain from config
- sepMetaData.configure(sepMetaData);
+ sepMetaData.initEndpointConfig();
// Process an optional @HandlerChain annotation
if (sepClass.isAnnotationPresent(HandlerChain.class))
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -1,3 +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.
+ */
package org.jboss.ws.metadata.config;
import java.util.Observer;
@@ -8,8 +29,8 @@
* to get notified then the configuration changes.
*
* @author Heiko.Braun(a)jboss.org
- * @version $Id$
* @since 15.12.2006
*/
-public interface Configurable extends Observer {
+public interface Configurable extends Observer
+{
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -31,15 +31,16 @@
*
* @see org.jboss.ws.metadata.umdm.EndpointMetaData
*/
-public interface ConfigurationProvider {
+public interface ConfigurationProvider
+{
- static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml";
- static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml";
- static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint";
+ static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml";
+ static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml";
+ static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint";
- static final String DEFAULT_JAXRPC_CLIENT_CONFIG_FILE = "META-INF/standard-jaxrpc-client-config.xml";
- static final String DEFAULT_JAXWS_CLIENT_CONFIG_FILE = "META-INF/standard-jaxws-client-config.xml";
- static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client";
+ static final String DEFAULT_JAXRPC_CLIENT_CONFIG_FILE = "META-INF/standard-jaxrpc-client-config.xml";
+ static final String DEFAULT_JAXWS_CLIENT_CONFIG_FILE = "META-INF/standard-jaxws-client-config.xml";
+ static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client";
/**
* Callback for components that require configuration through jbossws-dd
@@ -55,6 +56,6 @@
String getConfigName();
void setConfigName(String configName);
-
+
void setConfigName(String configName, String configFile);
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -68,7 +68,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-May-2005
*/
-public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider, Configurable
+public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider
{
// provide logging
private static Logger log = Logger.getLogger(EndpointMetaData.class);
@@ -127,7 +127,7 @@
private ConfigObservable configObservable = new ConfigObservable();
- private JAXBContextCache jaxbCache;
+ private JAXBContextCache jaxbCache = new JAXBContextCache();
public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type)
{
@@ -579,8 +579,6 @@
}
public JAXBContextCache getJaxbCache() {
- if(null == jaxbCache)
- jaxbCache = new JAXBContextCache();
return jaxbCache;
}
@@ -589,26 +587,13 @@
/**
* Callback for components that require configuration through jbossws-dd
- *
- * @param configurable
*/
public void configure(Configurable configurable)
{
-
- // emit notificatins when the config changes
- registerConfigObserver(configurable);
-
- if (null == config)
- {
- log.trace("Create new config: " + getConfigFile() + ":" + getConfigName());
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
- }
- else
- {
- log.trace("Reusing cached config. Current should be: " + getConfigFile() + ":" + getConfigName());
- }
-
+ // Make sure we have a configuration
+ if (config == null)
+ initEndpointConfig();
+
// SOAPBinding configuration
if (configurable instanceof CommonBindingProvider)
{
@@ -621,30 +606,6 @@
log.debug("Enable MTOM on endpoint " + this.getPortName());
}
}
-
- // Configure EndpointMetaData
- else if (configurable instanceof EndpointMetaData)
- {
-
- log.debug("Configure EndpointMetaData");
-
- // It's not necessarily the same instance
- EndpointMetaData epmd = (EndpointMetaData)configurable;
-
- // TODO: Why should we keep them?
- List<HandlerMetaData> sepHandlers = epmd.getHandlerMetaData(HandlerType.ENDPOINT);
- epmd.clearHandlers();
-
- List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE);
- List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST);
-
- epmd.addHandlers(preHandlers);
- epmd.addHandlers(sepHandlers);
- epmd.addHandlers(postHandlers);
-
- log.debug("Added " + preHandlers.size() + " PRE handlers");
- log.debug("Added " + postHandlers.size() + " POST handlers");
- }
}
public UnifiedVirtualFile getRootFile()
@@ -688,27 +649,47 @@
if (configName.equals(this.configName) == false)
{
this.configName = configName;
- this.config = null;
-
- // notify observers
+
log.debug("Reconfiguration forced, new config is '" + configName + "'");
- this.configObservable.doNotify(configName);
+ initEndpointConfig();
+ reconfigHandlerMetaData();
+ configObservable.doNotify(configName);
}
}
+
+ public void initEndpointConfig()
+ {
+ log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
+ JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
+ config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
+ }
- public List<Class> getRegisteredTypes()
+ private void reconfigHandlerMetaData()
{
- return Collections.unmodifiableList(registeredTypes);
+ log.debug("Configure EndpointMetaData");
+
+ List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT);
+ clearHandlers();
+
+ List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE);
+ List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST);
+
+ addHandlers(preHandlers);
+ addHandlers(sepHandlers);
+ addHandlers(postHandlers);
+
+ log.debug("Added " + preHandlers.size() + " PRE handlers");
+ log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
+ log.debug("Added " + postHandlers.size() + " POST handlers");
}
- public void update(Observable observable, Object object)
+ public List<Class> getRegisteredTypes()
{
- log.trace("Ingore configuration change notification");
+ return Collections.unmodifiableList(registeredTypes);
}
class ConfigObservable extends Observable
{
-
public void doNotify(Object object)
{
setChanged();
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -91,7 +91,7 @@
private Use encStyle;
// The security configuration
- private WSSecurityConfiguration securityConfiguration;
+ private WSSecurityConfiguration securityConfig;
public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName)
{
@@ -323,12 +323,12 @@
public WSSecurityConfiguration getSecurityConfiguration()
{
- return securityConfiguration;
+ return securityConfig;
}
public void setSecurityConfiguration(WSSecurityConfiguration securityConfiguration)
{
- this.securityConfiguration = securityConfiguration;
+ this.securityConfig = securityConfiguration;
}
public Use getEncodingStyle()
@@ -373,7 +373,7 @@
{
// Validate that there is at least one handler configured
// if we have a security configuration
- if (securityConfiguration != null)
+ if (securityConfig != null)
{
int handlerCount = 0;
for (EndpointMetaData epMetaData : endpoints.values())
@@ -436,6 +436,7 @@
buffer.append("\n jaxrpcMapping=" + mappingLocation);
buffer.append("\n handlerChain=" + handlerChain);
buffer.append("\n publishLocation=" + wsdlPublishLocation);
+ buffer.append("\n securityConfig=" + (securityConfig != null ? "found" : null));
buffer.append("\n properties=" + properties);
buffer.append("\n" + types);
buffer.append("\n");
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -34,13 +34,9 @@
private static final long serialVersionUID = 4219543242657899910L;
private Timestamp timestamp;
-
private Username username;
-
private Sign sign;
-
private Encrypt encrypt;
-
private Requires requires;
public Encrypt getEncrypt()
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -35,9 +35,7 @@
private static final long serialVersionUID = -2802677183149218760L;
private String type;
-
private String alias;
-
private String algorithm;
public Encrypt(String type, String alias, String algorithm)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -35,7 +35,6 @@
private static final long serialVersionUID = 4223295703633326725L;
private Config config;
-
private String name;
public Operation(String name)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -36,9 +36,7 @@
private static final long serialVersionUID = 8294850341855208663L;
private String name;
-
private Config defaultConfig;
-
private HashMap<String, Operation> operations = new HashMap<String, Operation>();
public Port(String name)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -34,9 +34,7 @@
private static final long serialVersionUID = 6899913633295989845L;
private RequireTimestamp requireTimestamp;
-
private RequireSignature requireSignature;
-
private RequireEncryption requireEncryption;
public RequireEncryption getRequireEncryption()
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -33,9 +33,7 @@
private static final long serialVersionUID = -2645745357707804441L;
private String type;
-
private String alias;
-
private boolean includeTimestamp;
public Sign(String type, String alias, boolean includeTimestamp)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -21,21 +21,23 @@
*/
package org.jboss.ws.metadata.wsse;
+// $Id: $
+
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
+import org.jboss.logging.Logger;
import org.jboss.ws.core.UnifiedVirtualFile;
+import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder;
/**
- * Created by IntelliJ IDEA.
- * User: hbraun
- * Date: 14.12.2006
- * Time: 16:17:02
- * To change this template use File | Settings | File Templates.
+ * @author hbraun
+ * @author Thomas.Diesler(a)jboss.com
*/
public class WSSecurityConfigFactory
{
+ // provide logging
+ final Logger log = Logger.getLogger(JAXRPCServerMetaDataBuilder.class);
public static WSSecurityConfigFactory newInstance()
{
@@ -52,6 +54,7 @@
if (location != null)
{
+ log.debug("createConfiguration from: " + location);
config = WSSecurityOMFactory.newInstance().parse(location);
// Get and set deployment path to the keystore file
@@ -59,39 +62,32 @@
{
location = getResource(vfsRoot, config.getKeyStoreFile());
if (location != null)
+ {
+ log.debug("Add keystore: " + location);
config.setKeyStoreURL(location);
+ }
}
if (config.getTrustStoreFile() != null)
{
location = getResource(vfsRoot, config.getTrustStoreFile());
if (location != null)
+ {
+ log.debug("Add truststore: " + location);
config.setTrustStoreURL(location);
+ }
}
}
return config;
}
- /**
- *
- * @param vfsRoot
- * @param resource
- * @return null, when the resource cannot be found
- */
private URL getResource(UnifiedVirtualFile vfsRoot, String resource)
{
try
{
UnifiedVirtualFile child = vfsRoot.findChild(resource);
- URL url = child.toURL();
- if (url != null)
- {
- InputStream inputStream = url.openStream();
- inputStream.close();
- }
-
- return url;
+ return child.toURL();
}
catch (Exception e)
{
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -36,25 +36,20 @@
private static final long serialVersionUID = 1022564645797303076L;
private Config defaultConfig;
-
private HashMap<String, Port> ports = new HashMap<String, Port>();
-
private String keyStoreFile;
-
private URL keyStoreURL;
-
private String keyStoreType;
-
private String keyStorePassword;
-
private String trustStoreFile;
-
private URL trustStoreURL;
-
private String trustStoreType;
-
private String trustStorePassword;
+ public WSSecurityConfiguration()
+ {
+ }
+
public Config getDefaultConfig()
{
return defaultConfig;
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml 2007-02-02 00:31:28 UTC (rev 2245)
@@ -8,7 +8,7 @@
<!-- $Id$ -->
-<project>
+<project name="JBossWS Benchamrks">
<!-- ================================================================== -->
<!-- Building -->
17 years, 3 months
- 1
- 0
JBossWS SVN: r2244 - in branches/jbossws-1.2.0: build/ant-import and 23 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 17:03:24 -0500 (Thu, 01 Feb 2007)
New Revision: 2244
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
Removed:
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml
Modified:
branches/jbossws-1.2.0/build/ant-import/build-setup.xml
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
branches/jbossws-1.2.0/build/version.properties
branches/jbossws-1.2.0/integration-jboss40/.classpath
branches/jbossws-1.2.0/integration-jboss42/.classpath
branches/jbossws-1.2.0/integration-jboss50/.classpath
branches/jbossws-1.2.0/integration-tomcat/.classpath
branches/jbossws-1.2.0/integration-tomcat/build.xml
branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java
branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
branches/jbossws-1.2.0/jbossws-core/.classpath
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
branches/jbossws-1.2.0/jbossws-tests/.classpath
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Fix tomcat deployment, add target container AS-4.0.5
Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -59,6 +59,7 @@
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
+ <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/>
<property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/>
<available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -40,8 +40,8 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common-sources.jar" dest="${thirdparty.dir}/jboss-common-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
@@ -87,7 +87,7 @@
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -138,10 +138,12 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>AS-5.0</string>
+ <string>AS-4.2</string>
<string>AS-4.0</string>
<string>AS-4.0-jdk14</string>
- <string>AS-4.2</string>
- <string>AS-5.0</string>
+ <string>AS-4.0.5</string>
+ <string>AS-4.0.5-jdk14</string>
<string>TC-5.5</string>
</jobNames>
<name>Target Container</name>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5 (from rev 2242, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-02-01 16:51:14 UTC (rev 2242)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -6,16 +6,16 @@
#
# Module settings
#
-MODULE=AS-4.0
-SVNBASE=`basename @hudson.jboss40.url@`
+MODULE=AS-4.0.5
+SVNBASE=JBoss_4_0_5_GA
#
# checkout with an explicit version
#
if [ -d "$SVNBASE" ]; then
- svn up -r(a)hudson.jboss40.rev@ $SVNBASE
+ svn up $SVNBASE
else
- svn co -r(a)hudson.jboss40.rev@ @hudson.jboss40.url@
+ svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
fi
#
@@ -46,7 +46,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build AS-4.0</description>
+ <description>Build AS-4.0.5</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14 (from rev 2242, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-02-01 16:51:14 UTC (rev 2242)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -6,16 +6,16 @@
#
# Module settings
#
-MODULE=AS-4.0-jdk14
-SVNBASE=`basename @hudson.jboss40.url@`
-
+MODULE=AS-4.0.5-jdk14
+SVNBASE=JBoss_4_0_5_GA
+
#
# checkout with an explicit version
#
if [ -d "$SVNBASE" ]; then
- svn up -r(a)hudson.jboss40.rev@ $SVNBASE
+ svn up $SVNBASE
else
- svn co -r(a)hudson.jboss40.rev@ @hudson.jboss40.url@
+ svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
fi
export JAVA_HOME=(a)hudson.jdk14@
@@ -48,7 +48,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build AS-4.0 with jdk-1.4</description>
+ <description>Build AS-4.0.5-jdk14</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -3,9 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>
- AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, TC-5.5
- </childProjects>
+ <childProjects>AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, AS-4.0.5, AS-4.0.5-jdk14, TC-5.5</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -3,11 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>
- JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5,
- JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14,
- JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5
- </childProjects>
+ <childProjects>JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-01 22:03:24 UTC (rev 2244)
@@ -34,7 +34,7 @@
gnu-getopt=1.0.10
hibernate=3.2.1.GA
jboss-backport-concurrent=2.1.0.GA
-jboss-common-core=2.0.4.Alpha
+jboss-common=1.0.3.GA
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
Modified: branches/jbossws-1.2.0/integration-jboss40/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-jboss40/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -11,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -30,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-jboss42/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-jboss42/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -11,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-jboss50/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -3,7 +3,6 @@
<classpathentry excluding="org/jboss/ws/integration/jboss50/ServiceRefHandler.java" kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar" sourcepath="/build/thirdparty/jboss-vfs-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
@@ -12,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -31,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-tomcat/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -10,7 +10,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -99,9 +99,6 @@
<include name="META-INF/standard-jaxws-client-config.xml"/>
<include name="META-INF/standard-jaxws-endpoint-config.xml"/>
</fileset>
- <classes dir="${tomcat.resources.dir}/jbossws.war/WEB-INF">
- <include name="log4j.xml"/>
- </classes>
</war>
</target>
@@ -110,9 +107,10 @@
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${tomcat.output.lib.dir}/build"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-impl.jar"/>
- <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-j2ee.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
@@ -122,7 +120,7 @@
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
- <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/log4j.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
<jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf">
@@ -144,6 +142,11 @@
<include name="xercesImpl.jar"/>
</fileset>
</copy>
+ <copy todir="${tomcat.common.classes}" overwrite="true">
+ <fileset dir="${tomcat.resources.dir}">
+ <include name="log4j.xml"/>
+ </fileset>
+ </copy>
<copy todir="${tomcat.common.lib}" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jbossws-core.jar"/>
Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -40,7 +40,9 @@
{
try
{
- File tmpdir = File.createTempFile("jbossws", null).getParentFile();
+ File tmpFile = File.createTempFile("jbossws", null);
+ File tmpdir = tmpFile.getParentFile();
+ tmpFile.delete();
return tmpdir;
}
catch (IOException e)
@@ -53,7 +55,9 @@
{
try
{
- File tmpdir = File.createTempFile("jbossws", null).getParentFile();
+ File tmpFile = File.createTempFile("jbossws", null);
+ File tmpdir = tmpFile.getParentFile();
+ tmpFile.delete();
return tmpdir;
}
catch (IOException e)
Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -25,7 +25,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.net.URLClassLoader;
import javax.servlet.ServletConfig;
@@ -73,7 +72,7 @@
{
String message = "Failed to initialze service endpoint";
log.error(message, ex);
- throw new WSException(message, ex);
+ WSException.rethrow(message, ex);
}
finally
{
@@ -179,9 +178,17 @@
protected UnifiedVirtualFile getWebservicesFile(URLClassLoader ctxLoader)
{
- URL url = ctxLoader.findResource("WEB-INF/webservices.xml");
- return url != null ? new ResourceLoaderAdapter(ctxLoader) : null;
+ UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(ctxLoader);
+ try
+ {
+ return vfsRoot.findChild("WEB-INF/webservices.xml");
+ }
+ catch (IOException e)
+ {
+ return null;
+ }
}
+
private void undeployServiceEndpoints(ServletContext servletContext)
{
Deleted: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ -->
-
-<!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
--->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="../logs/jbossws.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="INFO"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.ws">
- <priority value="DEBUG"/>
- </category>
-
- <category name="org.jboss.remoting">
- <priority value="INFO"/>
- </category>
-
- <category name="jbossws.SOAPMessage">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
-
- <!--
- <category name="org.jboss.xb">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
-<!--
- <appender-ref ref="CONSOLE"/>
--->
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Added: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml (rev 0)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ -->
+
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite: http://jakarta.apache.org/log4j
+-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${catalina.home}/logs/jbossws.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="INFO"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Enable SOAP message tracing
+ <category name="jbossws.SOAPMessage">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.2.0/jbossws-core/.classpath
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -9,7 +9,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -31,5 +30,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/getopt.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -86,38 +86,31 @@
// For each service
for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
- File targetFile = getPublishLocation(deploymentName, serviceMetaData);
- targetFile.getParentFile().mkdirs();
+ File wsdlFile = getPublishLocation(deploymentName, serviceMetaData);
+ wsdlFile.getParentFile().mkdirs();
// Get the wsdl definition and write it to the wsdl publish location
try
{
- Writer fWriter = IOUtils.getCharsetFileWriter(targetFile, Constants.DEFAULT_XML_CHARSET);
+ Writer fWriter = IOUtils.getCharsetFileWriter(wsdlFile, Constants.DEFAULT_XML_CHARSET);
WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();
new WSDLWriter(wsdlDefinitions).write(fWriter, Constants.DEFAULT_XML_CHARSET);
- URL wsdlPublishURL = targetFile.toURL();
- serviceMetaData.setWsdlLocation(wsdlPublishURL);
+ URL wsdlPublishURL = wsdlFile.toURL();
log.info("WSDL published to: " + wsdlPublishURL);
- // delete wsdl temp file
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
- if (targetFile.getAbsolutePath().startsWith(config.getServerTempDir().getAbsolutePath()))
- targetFile.delete();
-
// udpate the wsdl file location
- serviceMetaData.setWsdlLocation(wsdlPublishURL);
-
+ serviceMetaData.setWsdlLocation(wsdlFile.toURL());
+
// Process the wsdl imports
Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition();
if (wsdl11Definition != null)
{
- publishWsdlImports(targetFile.toURL(), wsdl11Definition);
+ publishWsdlImports(wsdlFile.toURL(), wsdl11Definition);
// Publish XMLSchema imports
Document document = wsdlDefinitions.getWsdlDocument();
- publishSchemaImports(targetFile.toURL(), document.getDocumentElement());
+ publishSchemaImports(wsdlFile.toURL(), document.getDocumentElement());
}
else
{
@@ -130,7 +123,7 @@
}
catch (Exception e)
{
- throw new WSException("Cannot publish wsdl to: " + targetFile, e);
+ throw new WSException("Cannot publish wsdl to: " + wsdlFile, e);
}
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -24,6 +24,7 @@
import java.io.InputStream;
import java.net.URL;
+import org.jboss.ws.WSException;
import org.jboss.ws.core.UnifiedVirtualFile;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.webservices.WebservicesFactory;
@@ -66,7 +67,7 @@
}
catch (Exception ex)
{
- throw new RuntimeException(ex);
+ WSException.rethrow(ex);
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -295,19 +295,19 @@
}
}
}
-
+
WSDLDefinitions wsdlDefinitions = null;
if (wsdlURL != null)
{
- wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWSDLDefinition(wsdlURL.toExternalForm());
+ String wsdlKey = wsMetaData.getDeploymentName() + getServiceName();
+ wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlKey);
if (wsdlDefinitions == null)
{
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
wsdlDefinitions = factory.parse(wsdlURL);
- wsMetaData.addWSDLDefinition(wsdlURL.toExternalForm(), wsdlDefinitions);
+ wsMetaData.addWsdlDefinition(wsdlKey, wsdlDefinitions);
}
}
-
return wsdlDefinitions;
}
@@ -431,6 +431,7 @@
buffer.append("\n qname=" + serviceName);
buffer.append("\n refName=" + serviceRefName);
buffer.append("\n wsdName=" + wsdName);
+ buffer.append("\n wsdlFile=" + wsdlFile);
buffer.append("\n wsdlLocation=" + wsdlLocation);
buffer.append("\n jaxrpcMapping=" + mappingLocation);
buffer.append("\n handlerChain=" + handlerChain);
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -140,12 +140,12 @@
services.add(serviceMetaData);
}
- public void addWSDLDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions)
+ public void addWsdlDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions)
{
wsdlMap.put(wsdlFile, wsdlDefinitions);
}
- public WSDLDefinitions getWSDLDefinition(String wsdlFile)
+ public WSDLDefinitions getWsdlDefinition(String wsdlFile)
{
return wsdlMap.get(wsdlFile);
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -30,7 +30,7 @@
<get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
@@ -60,7 +60,7 @@
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 22:03:24 UTC (rev 2244)
@@ -9,7 +9,7 @@
ibm-wsdl4j=@ibm-wsdl4j@
javassist=@javassist@
jbpm-bpel=@jbpm-bpel@
-jboss-common-core=@jboss-common-core@
+jboss-common=@jboss-common@
jboss-common-logging-log4j=@jboss-common-logging-log4j@
jboss-common-logging-spi=@jboss-common-logging-spi@
jboss-ejb3=@jboss-ejb3@
Modified: branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -76,7 +76,7 @@
<jndi-name>ejb/RoleSecuredSLSB</jndi-name>
<port-component>
<port-component-name>RoleSecured</port-component-name>
- <port-component-uri>/ws4ee-samples-ejb/RoleSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-samples-ejb/RoleSecured</port-component-uri>
</port-component>
</session>
<session>
@@ -84,7 +84,7 @@
<jndi-name>ejb/BasicSecuredSLSB</jndi-name>
<port-component>
<port-component-name>BasicSecured</port-component-name>
- <port-component-uri>/ws4ee-samples-ejb/BasicSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-samples-ejb/BasicSecured</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: branches/jbossws-1.2.0/jbossws-tests/.classpath
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -19,7 +19,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -39,5 +38,6 @@
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -15,12 +15,10 @@
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws424.TestSEI</service-endpoint-interface>
</port-component-ref>
- <!-- FIXME: SAAJ view of fault detail is broken in ws4ee
<handler>
<handler-name>TestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.jbws424.TestHandler</handler-class>
</handler>
- -->
</service-ref>
</application-client>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-01 22:03:24 UTC (rev 2244)
@@ -15,8 +15,9 @@
# JBoss excludes
org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/**
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
# TODO: Why are these excluded
# [JBWS-1471] - Remove unwanted tomcat excludes
17 years, 3 months
- 1
- 0
JBossWS SVN: r2243 - branches/jbossws-1.2.0/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 12:57:20 -0500 (Thu, 01 Feb 2007)
New Revision: 2243
Modified:
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
Log:
jaxb-xjc.jar is required
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 16:51:14 UTC (rev 2242)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 17:57:20 UTC (rev 2243)
@@ -86,7 +86,7 @@
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
17 years, 3 months
- 1
- 0
JBossWS SVN: r2242 - in branches/jbossws-1.2.0: jbossws-core/src/main/resources/samples and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 11:51:14 -0500 (Thu, 01 Feb 2007)
New Revision: 2242
Removed:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/
Modified:
branches/jbossws-1.2.0/build/ant-import/build-samples.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
Log:
Fix samples build
Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 16:22:09 UTC (rev 2241)
+++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 16:51:14 UTC (rev 2242)
@@ -24,8 +24,6 @@
<copy todir="${build.src.samples.dir}">
<fileset dir="${core.samples.dir}">
<include name="ant-import/build-thirdparty.xml"/>
- <include name="etc/jndi.properties"/>
- <include name="etc/log4j.xml"/>
<include name="ant.properties.example"/>
<include name="build.xml"/>
</fileset>
@@ -43,12 +41,14 @@
<copy todir="${build.src.samples.dir}">
<fileset dir="${tests.dir}">
- <include name="ant-imports/build-samples-jaxrpc.xml"/>
- <include name="ant-imports/build-samples-jaxws.xml"/>
+ <include name="ant-import/build-samples-jaxrpc.xml"/>
+ <include name="ant-import/build-samples-jaxws.xml"/>
+ <include name="src/main/etc/*"/>
<include name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/>
<include name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/>
<include name="src/main/java/org/jboss/test/ws/*"/>
<include name="src/main/resources/jaxrpc/samples/**"/>
+ <include name="src/main/resources/jaxrpc/samples-override/**"/>
<include name="src/main/resources/jaxws/samples/**"/>
<include name="src/main/resources/*excludes.txt"/>
</fileset>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01 16:22:09 UTC (rev 2241)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01 16:51:14 UTC (rev 2242)
@@ -24,8 +24,10 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
@@ -37,11 +39,15 @@
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
+ <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
<unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
</target>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01 16:22:09 UTC (rev 2241)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01 16:51:14 UTC (rev 2242)
@@ -7,7 +7,7 @@
jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss42
+jbossws.integration.target=jboss50
# The JBoss server instance
jboss.server.instance=default
@@ -17,9 +17,15 @@
tomcat.manager.username=manager
tomcat.manager.password=manager
+# JBoss Repository
+jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
+#jboss.repository=http://repository.jboss.com
+
# Force thirdparty HTTP get
#force.thirdparty.get=true
-# JBoss Repository
-jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
-#jboss.repository=http://repository.jboss.com
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=yes
+javac.fail.onerror=yes
+javac.verbose=no
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01 16:22:09 UTC (rev 2241)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01 16:51:14 UTC (rev 2242)
@@ -320,9 +320,7 @@
<!-- generate mapping artifacts -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="core.classpath"/>
- <classpath location="${jbossws.client.jar}"/>
- <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
- <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
+ <classpath location="${tests.lib.dir}/jbossws-client.jar"/>
<classpath location="${thirdparty.dir}/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath location="${tests.output.dir}"/>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 16:22:09 UTC (rev 2241)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 16:51:14 UTC (rev 2242)
@@ -2,8 +2,10 @@
# $Id: version.properties 1420 2006-11-14 12:44:10Z thomas.diesler(a)jboss.com $
# thirdparty library versions
+apache-collections=@apache-collections@
apache-log4j=@apache-log4j@
apache-logging=@apache-logging@
+dom4j=@dom4j@
ibm-wsdl4j=@ibm-wsdl4j@
javassist=@javassist@
jbpm-bpel=@jbpm-bpel@
@@ -15,6 +17,7 @@
jboss-security=@jboss-security@
jbossas-core-libs=@jbossas-core-libs@
oswego-concurrent=@oswego-concurrent@
+stax-api=@stax-api@
sun-jaf=@sun-jaf@
sun-jaxb=@sun-jaxb@
sun-javamail=@sun-javamail@
17 years, 3 months
- 1
- 0
JBossWS SVN: r2241 - in branches/jbossws-1.2.0/jbossws-tests/src/main: java/org/jboss/test/ws/jaxrpc/samples/xop and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 11:22:09 -0500 (Thu, 01 Feb 2007)
New Revision: 2241
Added:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java
Removed:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
Log:
Include XOP in jaxrpc samples
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -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 JBossTestDeployer implements JBossWSTestDeployer
-{
- private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
-
- private MBeanServerConnection server;
-
- public JBossTestDeployer(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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -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 JBossWSTestDeployer
-{
- /** 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
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -125,17 +125,17 @@
return server;
}
- private JBossWSTestDeployer getDeployer()
+ private TestDeployer getDeployer()
{
if (isTargetJBoss())
{
- return new JBossTestDeployer(getServer());
+ return new TestDeployerJBoss(getServer());
}
else if (isTargetTomcat())
{
String username = System.getProperty("tomcat.manager.username");
String password = System.getProperty("tomcat.manager.password");
- return new TomcatTestDeployer(username, password);
+ return new TestDeployerTomcat(username, password);
}
else
{
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -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.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
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -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.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" });
+ }
+}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -0,0 +1,129 @@
+/*
+ * 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("jbosstest.server.host", "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;
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -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 TomcatTestDeployer implements JBossWSTestDeployer
-{
- private String username, password;
-
- // Map<String,String> of URL to context path
- private static Map pathMap = new HashMap();
-
- public TomcatTestDeployer(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("jbosstest.server.host", "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;
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java (from rev 2240, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -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.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);
+ }
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -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.jaxrpc.samples.xop;
-
-// $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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -32,7 +32,7 @@
public void testCircularReferences() throws Exception
{
SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/xop/circular.xsd");
+ File f = new File("resources/jaxrpc/samples/xop/circular.xsd");
assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
XSModel xsModel = utils.parseSchema(f.toURL());
@@ -57,7 +57,7 @@
public void testXOPElementScan() throws Exception
{
SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/xop/schema.xsd");
+ File f = new File("resources/jaxrpc/samples/xop/schema.xsd");
assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
XSModel xsModel = utils.parseSchema(f.toURL());
@@ -96,7 +96,7 @@
{
SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/xop/schema.xsd");
+ File f = new File("resources/jaxrpc/samples/xop/schema.xsd");
assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
XSModel xsModel = utils.parseSchema(f.toURL());
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -29,7 +29,7 @@
import javax.xml.transform.Source;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.samples.xop.XOPTestSupport;
+import org.jboss.test.ws.XOPTestSupport;
import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -30,7 +30,7 @@
import javax.xml.transform.Source;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.samples.xop.XOPTestSupport;
+import org.jboss.test.ws.XOPTestSupport;
import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 16:22:09 UTC (rev 2241)
@@ -31,7 +31,7 @@
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.samples.xop.XOPTestSupport;
+import org.jboss.test.ws.XOPTestSupport;
/**
* User: hbraun
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml 2007-02-01 16:22:09 UTC (rev 2241)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/XOPTestCase</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-doclit?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-01 16:22:09 UTC (rev 2241)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/XOPHandlerTestCase</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-doclit_handler?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml 2007-02-01 16:22:09 UTC (rev 2241)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/XOPTestCaseRPC</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-rpclit?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-01 16:22:09 UTC (rev 2241)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-rpclit_handler?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override>
</service-ref>
</jboss-client>
17 years, 3 months
- 1
- 0
JBossWS SVN: r2240 - in branches/jbossws-1.2.0/jbossws-tests: src/main/java/org/jboss/test/ws/jaxrpc and 17 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 11:06:53 -0500 (Thu, 01 Feb 2007)
New Revision: 2240
Added:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/
Removed:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/
Modified:
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
Log:
Partial commit - JAXRPC XOP not included in samples
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -2941,129 +2941,8 @@
</metainf>
</jar>
- <!-- jaxrpc-xop-doclit without handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
+ <!-- Please add alphabetically -->
- <!-- jaxrpc-xop-doclit with handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
- <include name="webservices.xml"/>
- </webinf>
- </war>
-
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-xop-rpclit without handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-xop-rpclit with handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
- <include name="webservices.xml"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
- <!-- Please add alphabetically -->
-
</target>
</project>
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -485,10 +485,11 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
+
<!-- jaxrpc-samples-store-pass-encrypt.war -->
<replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war"
+ webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
@@ -525,35 +526,34 @@
</jar>
<!-- jaxrpc-samples-wsbpel -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="webservices.xml" />
- <include name="classes/bpel-application.xml" />
+ <include name="webservices.xml"/>
+ <include name="classes/bpel-application.xml"/>
</webinf>
<webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
- <include name="wsdl/**" />
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
</webinf>
</war>
<jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
<fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
</fileset>
<metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
- <include name="application-client.xml" />
- <include name="jboss-client.xml" />
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
</metainf>
<metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
+ <include name="jaxrpc-mapping.xml"/>
</metainf>
- </jar>
+ </jar>
<!-- jaxrpc-samples-wssecurity-sign -->
<war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
@@ -627,6 +627,126 @@
</metainf>
</jar>
+ <!-- jaxrpc-samples-xop-doclit without handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-xop-doclit with handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-xop-rpclit without handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-xop-rpclit with handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
<!-- Please add alphabetically -->
</target>
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop (from rev 2232, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2007-02-01 05:15:13 UTC (rev 2232)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,103 +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.jaxrpc.xop;
-
-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>
- * @version $Id$
- * @since Sep 22, 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()
- {
- Image image = null;
- try
- {
- URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").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()
- {
- try
- {
- URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL();
- return new DataHandler(url);
- }
- catch (MalformedURLException e)
- {
- throw new RuntimeException(e);
- }
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTestSupport.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -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.test.ws.jaxrpc.samples.xop;
+
+// $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);
+ }
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-01 05:15:13 UTC (rev 2232)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,119 +0,0 @@
-package org.jboss.test.ws.jaxrpc.xop;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.xerces.xs.XSComplexTypeDefinition;
-import org.apache.xerces.xs.XSModel;
-import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner;
-import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
-import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils;
-import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
-import org.jboss.xb.binding.NamespaceRegistry;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @since Jun 9, 2006
- */
-public class XOPTypeDefTestCase extends TestCase
-{
- public XOPTypeDefTestCase(String string)
- {
- super(string);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- public void testCircularReferences() throws Exception
- {
- SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/xop/circular.xsd");
- assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
-
- XSModel xsModel = utils.parseSchema(f.toURL());
- assertNotNull(xsModel);
- WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
- JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
-
- XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
-
- assertNotNull("Root type def not found", xsType);
- XOPScanner scanner = new XOPScanner();
-
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
-
- // it fails when getting a stack overflow ;)
- }
- }
-
- public void testXOPElementScan() throws Exception
- {
- SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/xop/schema.xsd");
- assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
-
- XSModel xsModel = utils.parseSchema(f.toURL());
- assertNotNull(xsModel);
- WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
- JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
-
- // test custom binary declaration
- XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit");
-
- assertNotNull("Root type def not found", xsType);
- XOPScanner scanner = new XOPScanner();
-
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
- assertNotNull("Unable to find xop typedef in schema", resultType);
- }
-
- scanner.reset();
-
- // test the xmime binary declaration
- xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit");
- assertNotNull("Root type def not found", xsType);
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
- assertNotNull("Unable to find XOP typedef in schema", resultType);
- }
-
- }
-
- public void testMSFTElementScan() throws Exception
- {
-
- SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/xop/schema.xsd");
- assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
-
- XSModel xsModel = utils.parseSchema(f.toURL());
- assertNotNull(xsModel);
- WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
- JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
-
- XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit");
-
- assertNotNull("Root type def not found", xsType);
- XOPScanner scanner = new XOPScanner();
-
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
- assertNotNull("Unable to find xop typedef in schema", resultType);
- }
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -0,0 +1,119 @@
+package org.jboss.test.ws.jaxrpc.samples.xop;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.xerces.xs.XSComplexTypeDefinition;
+import org.apache.xerces.xs.XSModel;
+import org.apache.xerces.xs.XSTypeDefinition;
+import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner;
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
+import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils;
+import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
+import org.jboss.xb.binding.NamespaceRegistry;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @since Jun 9, 2006
+ */
+public class XOPTypeDefTestCase extends TestCase
+{
+ public XOPTypeDefTestCase(String string)
+ {
+ super(string);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ public void testCircularReferences() throws Exception
+ {
+ SchemaUtils utils = SchemaUtils.getInstance();
+ File f = new File("resources/jaxrpc/xop/circular.xsd");
+ assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
+
+ XSModel xsModel = utils.parseSchema(f.toURL());
+ assertNotNull(xsModel);
+ WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
+ JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
+
+ XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
+
+ assertNotNull("Root type def not found", xsType);
+ XOPScanner scanner = new XOPScanner();
+
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+
+ // it fails when getting a stack overflow ;)
+ }
+ }
+
+ public void testXOPElementScan() throws Exception
+ {
+ SchemaUtils utils = SchemaUtils.getInstance();
+ File f = new File("resources/jaxrpc/xop/schema.xsd");
+ assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
+
+ XSModel xsModel = utils.parseSchema(f.toURL());
+ assertNotNull(xsModel);
+ WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
+ JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
+
+ // test custom binary declaration
+ XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit");
+
+ assertNotNull("Root type def not found", xsType);
+ XOPScanner scanner = new XOPScanner();
+
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+ assertNotNull("Unable to find xop typedef in schema", resultType);
+ }
+
+ scanner.reset();
+
+ // test the xmime binary declaration
+ xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit");
+ assertNotNull("Root type def not found", xsType);
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+ assertNotNull("Unable to find XOP typedef in schema", resultType);
+ }
+
+ }
+
+ public void testMSFTElementScan() throws Exception
+ {
+
+ SchemaUtils utils = SchemaUtils.getInstance();
+ File f = new File("resources/jaxrpc/xop/schema.xsd");
+ assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
+
+ XSModel xsModel = utils.parseSchema(f.toURL());
+ assertNotNull(xsModel);
+ WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
+ JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
+
+ XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit");
+
+ assertNotNull("Root type def not found", xsType);
+ XOPScanner scanner = new XOPScanner();
+
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+ assertNotNull("Unable to find xop typedef in schema", resultType);
+ }
+ }
+}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit)
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.doclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.GenericHandler;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.doclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
import java.awt.Image;
import java.io.File;
@@ -29,15 +29,15 @@
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;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.utils.IOUtils;
@@ -48,7 +48,7 @@
*/
public abstract class XOPBase extends JBossWSTest {
- private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg");
+ private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg");
protected abstract XOPPing getPort();
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.doclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
@@ -43,7 +43,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar");
+ return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar");
}
protected void setUp() throws Exception
@@ -56,7 +56,7 @@
port = (XOPPing)service.getPort(XOPPing.class);
}
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler");
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler");
}
protected XOPPing getPort() {
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -4,16 +4,16 @@
*/
//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.xop.doclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
public interface XOPPing extends java.rmi.Remote
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,16 +1,16 @@
-package org.jboss.test.ws.jaxrpc.xop.doclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
import java.rmi.RemoteException;
-import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
/**
* MTOM test service impl.
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -5,7 +5,7 @@
//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.xop.doclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
import javax.xml.rpc.ServiceException;
@@ -14,6 +14,6 @@
public interface XOPPingService extends javax.xml.rpc.Service
{
- public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException;
+ public org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing getTestServicePort() throws ServiceException;
}
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.doclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
// $Id$
@@ -42,7 +42,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-client.jar");
+ return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar");
}
protected void setUp() throws Exception
@@ -55,7 +55,7 @@
port = (XOPPing)service.getPort(XOPPing.class);
}
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit");
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit");
}
protected XOPPing getPort()
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit)
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,4 +1,4 @@
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.GenericHandler;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.rpclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
import java.awt.Image;
import java.io.File;
@@ -30,15 +30,15 @@
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;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.utils.IOUtils;
@@ -49,7 +49,7 @@
*/
public abstract class XOPBase extends JBossWSTest
{
- private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg");
+ private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg");
protected abstract XOPPing getPort();
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.rpclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
@@ -39,7 +39,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-client.jar");
+ return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar");
}
protected void setUp() throws Exception
@@ -52,7 +52,7 @@
port = (XOPPing)service.getPort(XOPPing.class);
}
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler");
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler");
}
protected XOPPing getPort() {
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -4,18 +4,18 @@
*/
//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
public interface XOPPing extends java.rmi.Remote
{
- public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException;
+ public org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException;
public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException;
public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException;
public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,16 +1,16 @@
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
import java.rmi.RemoteException;
-import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
/**
* @author Heiko Braun, <heiko(a)openj.net>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -5,7 +5,7 @@
//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
import javax.xml.rpc.ServiceException;
@@ -13,5 +13,5 @@
public interface XOPPingService extends javax.xml.rpc.Service
{
- public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException;
+ public org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing getTestServicePort() throws ServiceException;
}
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.rpclit;
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
// $Id$
@@ -41,7 +41,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-client.jar");
+ return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar");
}
protected void setUp() throws Exception
@@ -54,7 +54,7 @@
port = (XOPPing)service.getPort(XOPPing.class);
}
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit");
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit");
}
protected XOPPing getPort() {
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared)
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
import java.util.StringTokenizer;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
import javax.activation.DataHandler;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
import javax.activation.DataHandler;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
import java.awt.Image;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
import java.awt.Image;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -4,7 +4,7 @@
*/
//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
public class PingMsg
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -5,7 +5,7 @@
//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
public class PingMsgResponse
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
import javax.xml.transform.Source;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -19,7 +19,7 @@
* 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.xop.shared;
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
import javax.xml.transform.Source;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 16:06:53 UTC (rev 2240)
@@ -25,14 +25,13 @@
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.InputStream;
-import java.net.URL;
import javax.activation.DataHandler;
import javax.xml.transform.Source;
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.samples.xop.XOPTestSupport;
/**
* User: hbraun
@@ -40,7 +39,7 @@
*/
public abstract class XOPBase extends JBossWSTest
{
- private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg");
+ private File imgFile = new File("resources/jaxws/samples/xop/shared/attach.jpeg");
protected MTOMEndpoint port;
protected SOAPBinding binding;
@@ -53,8 +52,7 @@
{
getBinding().setMTOMEnabled(true);
- URL url = new URL("file:resources/jaxws/samples/xop/shared/attach.jpeg");
- DataHandler dh = new DataHandler(url);
+ DataHandler dh = new DataHandler(imgFile.toURL());
DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
assertNotNull(response);
assertEquals(response.getDataHandler().getContentType(), "image/jpeg");
@@ -65,8 +63,7 @@
{
getBinding().setMTOMEnabled(false);
- URL url = new URL("file:resources/jaxws/samples/xop/shared/attach.jpeg");
- DataHandler dh = new DataHandler(url);
+ DataHandler dh = new DataHandler(imgFile.toURL());
DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
assertNotNull(response);
assertEquals(response.getDataHandler().getContentType(), "application/octet-stream");
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop (from rev 2232, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd 2007-02-01 05:15:13 UTC (rev 2232)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,134 +0,0 @@
-<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"
- xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
-
- <complexType name="Address">
- <sequence>
- <element name="city" nillable="true" type="string"/>
- <element name="state" nillable="true" type="string"/>
- <element name="street" nillable="true" type="string"/>
- <element name="zip" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="AlreadyRegisteredException">
- <complexContent>
- <extension base="tns:RegistrationException">
- <sequence>
- <element name="existingId" type="long"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="BulkRegister">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/>
- <element name="When" nillable="true" type="dateTime"/>
- </sequence>
- </complexType>
- <complexType name="BulkRegisterResponse">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/>
- </sequence>
- </complexType>
- <complexType name="Customer">
- <sequence>
- <element name="address" nillable="true" type="tns:Address"/>
- <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/>
- <element name="id" type="long"/>
- <element name="name" nillable="true" type="tns:Name"/>
- <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/>
- </sequence>
- </complexType>
- <complexType name="GetStatistics">
- <sequence>
- <element name="Customer" nillable="true" type="tns:Customer"/>
- </sequence>
- </complexType>
- <complexType name="GetStatisticsResponse">
- <sequence>
- <element name="Statistics" nillable="true" type="Statistics"/>
- </sequence>
- </complexType>
-
- <complexType name="Statistics">
- <sequence>
- <element name="activationTime" nillable="true" type="dateTime"/>
- <element name="hits" type="long"/>
- </sequence>
- </complexType>
-
-
- <complexType name="InvoiceCustomer">
- <complexContent>
- <extension base="tns:Customer">
- <sequence>
- <element name="cycleDay" type="int"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="Name">
- <sequence>
- <element name="firstName" nillable="true" type="string"/>
- <element name="lastName" nillable="true" type="string"/>
- <element name="middleName" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="PhoneNumber">
- <sequence>
- <element name="areaCode" nillable="true" type="string"/>
- <element name="exchange" nillable="true" type="string"/>
- <element name="line" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="Register">
- <sequence>
- <element name="Customer" nillable="true" type="tns:Customer"/>
- <element name="When" nillable="true" type="dateTime"/>
- </sequence>
- </complexType>
- <complexType name="RegisterForInvoice">
- <sequence>
- <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/>
- </sequence>
- </complexType>
- <complexType name="RegisterForInvoiceResponse">
- <sequence>
- <element name="done" type="boolean"/>
- </sequence>
- </complexType>
- <complexType name="RegisterResponse">
- <sequence>
- <element name="RegisteredID" type="long"/>
- </sequence>
- </complexType>
- <complexType name="RegistrationException">
- <sequence>
- <element name="message" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="ValidationException">
- <complexContent>
- <extension base="tns:RegistrationException">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/>
- <element name="BulkRegister" type="tns:BulkRegister"/>
- <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/>
- <element name="GetStatistics" type="tns:GetStatistics"/>
- <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/>
- <element name="Register" type="tns:Register"/>
- <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/>
- <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/>
- <element name="RegisterResponse" type="tns:RegisterResponse"/>
- <element name="RegistrationException" type="tns:RegistrationException"/>
- <element name="ValidationException" type="tns:ValidationException"/>
-</schema>
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd 2007-02-01 16:06:53 UTC (rev 2240)
@@ -0,0 +1,134 @@
+<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
+
+ <complexType name="Address">
+ <sequence>
+ <element name="city" nillable="true" type="string"/>
+ <element name="state" nillable="true" type="string"/>
+ <element name="street" nillable="true" type="string"/>
+ <element name="zip" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="AlreadyRegisteredException">
+ <complexContent>
+ <extension base="tns:RegistrationException">
+ <sequence>
+ <element name="existingId" type="long"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="BulkRegister">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/>
+ <element name="When" nillable="true" type="dateTime"/>
+ </sequence>
+ </complexType>
+ <complexType name="BulkRegisterResponse">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/>
+ </sequence>
+ </complexType>
+ <complexType name="Customer">
+ <sequence>
+ <element name="address" nillable="true" type="tns:Address"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/>
+ <element name="id" type="long"/>
+ <element name="name" nillable="true" type="tns:Name"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/>
+ </sequence>
+ </complexType>
+ <complexType name="GetStatistics">
+ <sequence>
+ <element name="Customer" nillable="true" type="tns:Customer"/>
+ </sequence>
+ </complexType>
+ <complexType name="GetStatisticsResponse">
+ <sequence>
+ <element name="Statistics" nillable="true" type="Statistics"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Statistics">
+ <sequence>
+ <element name="activationTime" nillable="true" type="dateTime"/>
+ <element name="hits" type="long"/>
+ </sequence>
+ </complexType>
+
+
+ <complexType name="InvoiceCustomer">
+ <complexContent>
+ <extension base="tns:Customer">
+ <sequence>
+ <element name="cycleDay" type="int"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="Name">
+ <sequence>
+ <element name="firstName" nillable="true" type="string"/>
+ <element name="lastName" nillable="true" type="string"/>
+ <element name="middleName" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="PhoneNumber">
+ <sequence>
+ <element name="areaCode" nillable="true" type="string"/>
+ <element name="exchange" nillable="true" type="string"/>
+ <element name="line" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="Register">
+ <sequence>
+ <element name="Customer" nillable="true" type="tns:Customer"/>
+ <element name="When" nillable="true" type="dateTime"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegisterForInvoice">
+ <sequence>
+ <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegisterForInvoiceResponse">
+ <sequence>
+ <element name="done" type="boolean"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegisterResponse">
+ <sequence>
+ <element name="RegisteredID" type="long"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegistrationException">
+ <sequence>
+ <element name="message" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="ValidationException">
+ <complexContent>
+ <extension base="tns:RegistrationException">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/>
+ <element name="BulkRegister" type="tns:BulkRegister"/>
+ <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/>
+ <element name="GetStatistics" type="tns:GetStatistics"/>
+ <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/>
+ <element name="Register" type="tns:Register"/>
+ <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/>
+ <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/>
+ <element name="RegisterResponse" type="tns:RegisterResponse"/>
+ <element name="RegistrationException" type="tns:RegistrationException"/>
+ <element name="ValidationException" type="tns:ValidationException"/>
+</schema>
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit)
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,7 +13,7 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface>
</port-component-ref>
</service-ref>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
<package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type>
+ <package-type>org.jboss.test.ws.jaxrpc.samples.xop.doclit</package-type>
<namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsg</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -19,7 +19,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsgResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -29,7 +29,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImage</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -43,7 +43,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImageResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -53,7 +53,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSource</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -67,7 +67,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSourceResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -77,7 +77,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandler</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -91,7 +91,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandlerResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -101,7 +101,7 @@
</java-xml-type-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface>
+ <service-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPingService</service-interface>
<wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name>
<port-mapping>
<port-name>TestServicePort</port-name>
@@ -110,7 +110,7 @@
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface>
<wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type>
<wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding>
@@ -119,7 +119,7 @@
<wsdl-operation>ping</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -127,7 +127,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -138,7 +138,7 @@
<wsdl-operation>pingImage</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -146,7 +146,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -157,7 +157,7 @@
<wsdl-operation>pingSource</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -165,7 +165,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -176,7 +176,7 @@
<wsdl-operation>pingDataHandler</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -184,7 +184,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -7,7 +7,7 @@
<servlet>
<servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPingImpl</servlet-class>
</servlet>
<servlet-mapping>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,7 +13,7 @@
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
</service-impl-bean>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,11 +13,11 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface>
</port-component-ref>
<handler>
<handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class>
</handler>
</service-ref>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,10 +13,10 @@
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface>
<handler>
<handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class>
</handler>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit)
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,7 +13,7 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface>
</port-component-ref>
</service-ref>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -4,16 +4,16 @@
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
<package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.xop.rpclit</package-type>
+ <package-type>org.jboss.test.ws.jaxrpc.samples.xop.rpclit</package-type>
<namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
</package-mapping>
<package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type>
+ <package-type>org.jboss.test.ws.jaxrpc.samples.xop.shared</package-type>
<namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -27,7 +27,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -37,7 +37,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -51,7 +51,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOutType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -61,7 +61,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -75,7 +75,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceOutType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -85,7 +85,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -99,7 +99,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerOutType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -109,7 +109,7 @@
</java-xml-type-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface>
+ <service-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPingService</service-interface>
<wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name>
<port-mapping>
<port-name>TestServicePort</port-name>
@@ -119,7 +119,7 @@
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface>
<wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type>
<wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding>
@@ -128,7 +128,7 @@
<wsdl-operation>ping</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -136,7 +136,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -175,7 +175,7 @@
<wsdl-operation>pingImage</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -183,7 +183,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -194,7 +194,7 @@
<wsdl-operation>pingSource</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -202,7 +202,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -213,7 +213,7 @@
<wsdl-operation>pingDataHandler</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -221,7 +221,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -7,7 +7,7 @@
<servlet>
<servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPingImpl</servlet-class>
</servlet>
<servlet-mapping>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,7 +13,7 @@
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
</service-impl-bean>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,11 +13,11 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface>
</port-component-ref>
<handler>
<handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class>
</handler>
</service-ref>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-01 15:47:50 UTC (rev 2239)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-01 16:06:53 UTC (rev 2240)
@@ -13,10 +13,10 @@
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface>
<handler>
<handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class>
</handler>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd 2007-02-01 05:15:13 UTC (rev 2232)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd 2007-02-01 16:06:53 UTC (rev 2240)
@@ -1,41 +0,0 @@
-<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://jboss.org/test/ws/xop/doclit"
- xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
- xmlns:tns="http://jboss.org/test/ws/xop/doclit">
-
- <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/>
-
- <s:element name="PingMsg">
- <s:complexType>
- <s:sequence>
- <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
- <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <s:element name="PingMsgResponse">
- <s:complexType>
- <s:sequence>
- <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <s:complexType name="XOPBinary" >
- <s:simpleContent>
- <s:extension base="s:base64Binary" >
- <s:attribute ref="xmime:contentType" use="optional"/>
- </s:extension>
- </s:simpleContent>
- </s:complexType>
-
- <s:element name="MSFTBinary">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
-</s:schema>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd 2007-02-01 16:06:53 UTC (rev 2240)
@@ -0,0 +1,41 @@
+<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://jboss.org/test/ws/xop/doclit"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+ xmlns:tns="http://jboss.org/test/ws/xop/doclit">
+
+ <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/>
+
+ <s:element name="PingMsg">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
+ <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:element name="PingMsgResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:complexType name="XOPBinary" >
+ <s:simpleContent>
+ <s:extension base="s:base64Binary" >
+ <s:attribute ref="xmime:contentType" use="optional"/>
+ </s:extension>
+ </s:simpleContent>
+ </s:complexType>
+
+ <s:element name="MSFTBinary">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+</s:schema>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared (from rev 2239, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared)
17 years, 3 months
- 1
- 0
JBossWS SVN: r2239 - in branches/jbossws-1.2.0: jbossws-core/src/main/resources/samples/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 10:47:50 -0500 (Thu, 01 Feb 2007)
New Revision: 2239
Added:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/jndi.properties
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/log4j.xml
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml
Log:
Partial commit - JAXRPC XOP not included in samples
Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01 15:47:50 UTC (rev 2239)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id:build-thirdparty.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+
+<project name="JBossWS-Thirdparty">
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+ </target>
+
+ <target name="thirdparty-get" depends="prepare" if="force.thirdparty.get"
+ description="Gets the thirdparty libraries">
+
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
+ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+ <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
+ </target>
+
+ <target name="thirdparty-classpath">
+
+ <!-- The compile classpath for jbossws core -->
+ <path id="core.classpath">
+ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <pathelement location="${thirdparty.dir}/javassist.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/>
+ <pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/getopt.jar"/>
+ <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
+ <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
+ <pathelement location="${thirdparty.dir}/xalan.jar"/>
+ </path>
+
+ </target>
+
+</project>
Property changes on: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/jndi.properties
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/jndi.properties (rev 0)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/jndi.properties 2007-02-01 15:47:50 UTC (rev 2239)
@@ -0,0 +1,4 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming.client
+java.naming.provider.url=jnp://localhost:1099
+j2ee.clientName=ws4ee-client
Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/log4j.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/log4j.xml 2007-02-01 15:47:50 UTC (rev 2239)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${log.dir}/samples.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit JBossWS category -->
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!--
+ <category name="org.jboss.xb">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!-- appender-ref ref="CONSOLE"/ -->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml 2007-02-01 15:47:50 UTC (rev 2239)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-benchmark" depends="main">
+ <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Testing -->
+ <!-- ================================================================== -->
+
+ <!-- Run benchmark test cases -->
+ <target name="tests-benchmark" depends="init" description="Run benchmark unit tests">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+</project>
Property changes on: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-01 15:47:50 UTC (rev 2239)
@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxrpc" description="Build the jaxrpc samples deployments">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxrpc-samples-docstyle-bare -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-docstyle-wrapped -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-dynamichandler -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-exception -->
+ <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-handler -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-holder -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jmstransport -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxrpc-samples-jmstransport.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109ejb-rpc -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109ejb-doc -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109pojo-rpc -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109pojo-doc -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-message -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-mtom -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar">
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-oneway -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-rpcstyle -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-secureejb -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-swa -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-store-pass-encrypt.war -->
+ <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-wsbpel -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
+ webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <include name="webservices.xml" />
+ <include name="classes/bpel-application.xml" />
+ </webinf>
+ <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml" />
+ <include name="wsdl/**" />
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
+ <include name="application-client.xml" />
+ <include name="jboss-client.xml" />
+ </metainf>
+ <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml" />
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-wssecurity-sign -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-wssecurity-encrypt -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-01 15:47:50 UTC (rev 2239)
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws sample deployments.">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxws-samples-asynchronous -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-context -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/>
+ </fileset>
+ </jar>
+
+ <!-- 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/ExceptionEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-handlerchain -->
+ <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/samples/handlerchain"
+ file="${tests.output.dir}/resources/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/>
+ </manifest>
+ </jar>
+
+ <!-- jaxws-samples-jsr181ejb -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-jsr181pojo -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-jsr181pojo-docwrapped -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
+ </classes>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-logicalhandler -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
+ <include name="jaxws-server-source-handlers.xml"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
+ <include name="jaxws-server-jaxb-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-oneway -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-provider -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-retail -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
+ <include name="wsdl/*"/>
+ <include name="jaxws-handler.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-soapbinding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webmethod -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webparam -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webresult -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webservice -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-webserviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
+ </manifest>
+ </jar>
+ <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/>
+ </manifest>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override">
+ <include name="jbossws-client-config.xml"/>
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/>
+ </manifest>
+ </jar>
+
+ <!-- jaxws-samples-wsaddressing -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <include name="jaxws-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wseventing.war -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF">
+ <include name="wsdl/jboss-web.xml"/>
+ <include name="wsdl/sysmon.wsdl"/>
+ <include name="wsdl/ws-eventing.wsdl"/>
+ <include name="wsdl/ws-eventing.xsd"/>
+ <include name="wsdl/ws-addr.xsd"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-xop-doclit -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/**/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 3 months
- 1
- 0
JBossWS SVN: r2238 - in branches/jbossws-1.2.0: jbossws-core/src/main/resources/samples and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 10:46:41 -0500 (Thu, 01 Feb 2007)
New Revision: 2238
Removed:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/jaxrpc/
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/jaxws/
Modified:
branches/jbossws-1.2.0/build/ant-import/build-samples.xml
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
Log:
Partial commit - JAXRPC XOP not included in samples
Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 15:46:41 UTC (rev 2238)
@@ -23,17 +23,43 @@
<copy todir="${build.src.samples.dir}">
<fileset dir="${core.samples.dir}">
- <include name="common/imported-build.xml"/>
- <include name="common/build-thirdparty.xml"/>
+ <include name="ant-import/build-thirdparty.xml"/>
+ <include name="etc/jndi.properties"/>
+ <include name="etc/log4j.xml"/>
<include name="ant.properties.example"/>
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
+ <copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/>
+
+ <copy todir="${build.src.samples.dir}">
+ <fileset dir="${core.samples.dir}">
<include name="version.properties"/>
- <include name="**/build.xml"/>
</fileset>
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
</copy>
+ <copy todir="${build.src.samples.dir}">
+ <fileset dir="${tests.dir}">
+ <include name="ant-imports/build-samples-jaxrpc.xml"/>
+ <include name="ant-imports/build-samples-jaxws.xml"/>
+ <include name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/>
+ <include name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/>
+ <include name="src/main/java/org/jboss/test/ws/*"/>
+ <include name="src/main/resources/jaxrpc/samples/**"/>
+ <include name="src/main/resources/jaxws/samples/**"/>
+ <include name="src/main/resources/*excludes.txt"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.src.samples.dir}/src/main">
+ <fileset dir="${core.samples.dir}">
+ <include name="etc/*"/>
+ </fileset>
+ </copy>
+
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
<fileset dir="${core.output.lib.dir}">
@@ -56,291 +82,6 @@
</fileset>
</copy>
- <!-- samples/common -->
- <mkdir dir="${build.src.samples.dir}/common/java"/>
- <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/>
-
- <copy todir="${build.src.samples.dir}/common/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/*.java"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources">
- <fileset dir="${core.samples.dir}/common">
- <include name="tests-*-excludes.txt"/>
- <include name="jndi.properties"/>
- <include name="log4j.xml"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
- </copy>
-
- <!-- samples/docstyle -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/docstyle"/>
- </copy>
-
- <!-- samples/dynamichandler -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/dynamichandler"/>
- </copy>
-
- <!-- samples/exception -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/exception/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/exception/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/exception"/>
- </copy>
-
- <!-- samples/handler -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/handler/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/handler/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/handler"/>
- </copy>
-
- <!-- samples/holder -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/holder/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/holder/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/holder"/>
- </copy>
-
- <!-- samples/jmstransport -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/jmstransport"/>
- </copy>
-
- <!-- samples/jsr109ejb -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109ejb"/>
- </copy>
-
- <!-- samples/jsr109pojo -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**/*"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109pojo"/>
- </copy>
-
- <!-- samples/message -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/message/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/message/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/message/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/message/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/message"/>
- </copy>
-
- <!-- samples/mtom -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/mtom/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/mtom/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/mtom"/>
- </copy>
-
- <!-- samples/oneway -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/oneway/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/oneway/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/oneway"/>
- </copy>
-
- <!-- samples/rpcstyle -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/rpcstyle"/>
- </copy>
-
- <!-- samples/secureejb -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/secureejb"/>
- </copy>
-
- <!-- samples/swa -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/swa/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/swa/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/swa"/>
- </copy>
-
- <!-- samples/wsbpel -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel" />
- </copy>
-
- <!-- samples/wssecurity -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/wssecurity">
- <exclude name="store-pass-encrypt/**"/>
- </fileset>
- </copy>
-
- <!-- JAXWS samples - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- samples/jsr181ejb -->
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181ejb"/>
- </copy>
-
- <!-- samples/jsr181pojo -->
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181pojo"/>
- </copy>
-
- <!-- samples/retail -->
- <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/retail/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/retail/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/retail"/>
- </copy>
-
- <!-- samples/wsaddressing -->
- <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/wsaddressing"/>
- </copy>
-
<!-- Build the samples zip -->
<zip destfile="${build.output.dir}/${samples.target}.zip">
<fileset dir="${build.output.dir}">
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 15:46:41 UTC (rev 2238)
@@ -86,7 +86,7 @@
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01 15:46:41 UTC (rev 2238)
@@ -21,5 +21,5 @@
#force.thirdparty.get=true
# JBoss Repository
-#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
-jboss.repository=http://repository.jboss.com
+jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
+#jboss.repository=http://repository.jboss.com
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01 15:46:41 UTC (rev 2238)
@@ -1,66 +1,501 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
<!-- $Id$ -->
-<project default="main" name="JBossWS Examples">
+<project default="main" basedir="." name="JBossWS-Tests">
+
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+
+ <property name="tests.dir" value="${basedir}"/>
+ <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
+ <property name="tests.lib.dir" value="${tests.dir}/lib"/>
+ <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <import file="${basedir}/common/imported-build.xml"/>
-
+ <!-- Force thirdparty get -->
+ <condition property="force.thirdparty.get">
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ </condition>
+
+ <!-- Use -Ddebug=true for remote debugging -->
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
+ <isset property="debug"/>
+ </condition>
+ <condition property="remote.debug.line" value="">
+ <not>
+ <isset property="debug"/>
+ </not>
+ </condition>
+
+ <!-- Available integration target -->
+ <property name="integration.target.${jbossws.integration.target}" value="true"/>
+
+ <!-- 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>
+ <condition property="jboss.home" value="${jboss40.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
+ </condition>
+
+ <!-- Integration Target Server -->
+ <condition property="jbossws.integration.target.jboss">
+ <isset property="jboss.home"/>
+ </condition>
+ <condition property="jbossws.integration.target.tomcat">
+ <equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
+ </condition>
+
+ <property name="jboss.client" value="${jboss.home}/client"/>
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
+ <property name="jboss.server.lib" value="${jboss.server}/lib"/>
+ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
+ <isset property="jbossws.integration.target.jboss"/>
+ </condition>
+ <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed">
+ <isset property="jbossws.integration.target.tomcat"/>
+ </condition>
+
+ <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
+ otherwise and initialize the node0/node1 cluster hostnames to localhost
+ and ${hostname} by default. If you cannot route multicast traffic between
+ localhost and hostname, then you need to specify node0 and node1 binding
+ in the local.properties that can in order to be able to run the clustering
+ tests.
+ -->
+ <property environment="env"/>
+ <condition property="hostname" value="${env.COMPUTERNAME}">
+ <os family="windows"/>
+ </condition>
+ <condition property="hostname" value="${env.HOSTNAME}">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
+
+ <!-- node0 defaults -->
+ <property name="node0" value="localhost"/>
+ <property name="node0.http.url" value="http://${node0}:8080"/>
+ <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
+ <property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <mkdir dir="${tests.output.dir}/log"/>
+ <touch file="${tests.output.dir}/log/test.log"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+
+ <!-- Define excluded tests -->
+ <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
+ <or>
+ <available file="${jboss.client}/jboss-ejb3-client.jar"/>
+ <isset property="integration.target.tomcat"/>
+ </or>
+ </condition>
+ <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
+ <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
+
+ <echo/>
+ <echo message="-----------------------------------------------"/>
+ <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="tomcat.home = ${tomcat.home}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="endorsed = ${endorsed.dirs}"/>
+ <echo message="excludesfile = ${excludes-short-name}"/>
+ <echo message="-----------------------------------------------"/>
+
+ </target>
+
<!--
- Build the test deployments
+ Init the various classpaths
-->
- <target name="jars" description="build the deployments">
-
- <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/message/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="jars"/>
- <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="jars"/-->
- <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/>
-
- <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="jars"/>
+ <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
+
+ <target name="common-classpath" depends="prepare,thirdparty">
+
+ <!-- The combined compile classpath -->
+ <path id="jbossws.jars.classpath">
+ <pathelement location="${tests.lib.dir}/jbossws-client.jar"/>
+ <pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${tests.lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/>
+ </path>
+
+ <!-- The combined compile classpath -->
+ <path id="javac.classpath">
+ <path refid="core.classpath"/>
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
+ <pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/qdox.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api.jar"/>
+ <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ </path>
</target>
-
+
+ <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">
+
+ <!-- The test client classpath -->
+ <path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jbossretro-rt.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <path refid="javac.classpath"/>
+ </path>
+
+ <!-- The jBPM BPEL classpath -->
+ <path id="jbpm.bpel.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" />
+ <pathelement location="${thirdparty.dir}/commons-collections.jar"/>
+ <pathelement location="${thirdparty.dir}/commons-logging.jar"/>
+ <pathelement location="${thirdparty.dir}/dom4j.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/>
+ <!--
+ <pathelement location="${thirdparty.dir}/log4j.jar"/>
+ <pathelement location="${tests.etc.dir}"/>
+ -->
+ </path>
+ </target>
+
+ <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
+ <!-- The test client classpath -->
+ <path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
+ <path refid="javac.classpath"/>
+ </path>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="compile" depends="compile14,compile15" description="Compile sources"/>
+
+ <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
+ <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile15" depends="init" if="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile-generated" depends="init" description="Compile generated sources">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${tests.output.dir}/wstools/java"/>
+ <exclude name="org/jboss/test/ws/interop/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="copy-resources" depends="init" description="Copy the deployment resources.">
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
+ <!-- Copy resources -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ <exclude name="jaxrpc/samples-override/**"/>
+ </fileset>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
+ </filterset>
+ </copy>
+ <!-- Copy binary files -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <exclude name="**/*.wsdl"/>
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments.">
+ <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ </target>
+
<!--
- Run the testsuite
+ Generate samples sources
-->
- <target name="tests" depends="init" description="run the testsuite">
+ <target name="generate-sources" depends="compile" description="Generate the deployment resources.">
+ <!-- create jbpm process archives -->
+ <mkdir dir="${tests.output.dir}/libs"/>
+ <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
+ </zip>
+ <!-- Copy the BPEL sar -->
+ <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
- <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/message/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="tests"/>
- <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="tests"/-->
- <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/>
-
- <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="tests"/>
-
+ <!-- generate wsdl binding and service definitions for bpel processes -->
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpm.bpel.classpath"/>
+ </taskdef>
+ <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
+ bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
+
+ <!-- generate mapping artifacts -->
+ <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
+ <classpath refid="core.classpath"/>
+ <classpath location="${jbossws.client.jar}"/>
+ <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
+ <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
+ <classpath location="${thirdparty.dir}/concurrent.jar"/>
+ <classpath location="${tests.output.dir}/classes"/>
+ <classpath location="${tests.output.dir}"/>
+ </taskdef>
+ <mkdir dir="${tests.output.dir}/libs"/>
+ <mkdir dir="${tests.output.dir}/wstools/java"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" />
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
+ <move todir="${tests.output.dir}/wstools/java">
+ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+ </move>
+ </target>
+
+ <target name="copy-generated" depends="init" description="Copy the deployment resources.">
+ <!-- Copy generated resources -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.output.dir}/wstools/resources">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+ <!-- Copy resources that cannot (yet) be generated -->
+ <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Testing -->
+ <!-- ================================================================== -->
+
+ <!-- Run all unit tests and generate a report -->
+ <target name="tests" depends="main" description="Run all unit tests and generate a report">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
+ </antcall>
<antcall target="tests-report"/>
-
</target>
-
-</project>
\ No newline at end of file
+
+ <!--
+ Run a collection of unit tests.
+ ant -Dtest=tools test
+ -->
+ <target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
+ </antcall>
+ </target>
+
+ <!-- Common test target -->
+ <target name="tests-main" depends="init">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jbosstest.host.name" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="tomcat.home" value="${tomcat.home}"/>
+ <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
+ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="test.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <batchtest todir="${tests.output.dir}/reports" fork="true">
+ <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
+ -->
+ <target name="one-test" depends="init" if="test" description="Run a single unit test">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <jvmarg line="${remote.debug.line}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jbosstest.host.name" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="tomcat.home" value="${tomcat.home}"/>
+ <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
+ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
+ <!--
+ http://jira.jboss.com/jira/browse/JBWS-917
+ <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
+ <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/>
+ -->
+ <!-- HTTPS hostname wrong: should be <localhost> -->
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="test.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/>
+ </junit>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Reporting -->
+ <!-- ================================================================== -->
+
+ <!-- Build the tests report -->
+ <target name="tests-report" depends="init" description="Build the tests report">
+ <junitreport todir="${tests.output.dir}/reports">
+ <fileset dir="${tests.output.dir}/reports">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${tests.output.dir}/reports/html"/>
+ </junitreport>
+ <zip destfile="${tests.output.dir}/test-report-${build.id}.zip">
+ <fileset dir="${tests.output.dir}" includes="reports/**"/>
+ </zip>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <target name="clean" description="Delete all generated test files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+</project>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 15:46:41 UTC (rev 2238)
@@ -12,6 +12,7 @@
jboss-common-logging-spi=@jboss-common-logging-spi@
jboss-ejb3=@jboss-ejb3@
jboss-jbossxb=@jboss-jbossxb@
+jboss-security=@jboss-security@
jbossas-core-libs=@jbossas-core-libs@
oswego-concurrent=@oswego-concurrent@
sun-jaf=@sun-jaf@
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 15:46:41 UTC (rev 2238)
@@ -16,7 +16,7 @@
<!-- Building -->
<!-- ================================================================== -->
- <target name="build-jars" description="Build the jaxrpc deployments">
+ <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments">
<mkdir dir="${tests.output.dir}/libs"/>
@@ -2485,615 +2485,6 @@
</metainf>
</jar>
- <!-- jaxrpc-samples-docstyle-bare -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-docstyle-wrapped -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-dynamichandler -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-exception -->
- <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-handler -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-holder -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jmstransport -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxrpc-samples-jmstransport.jar"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109ejb-rpc -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109ejb-doc -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109pojo-rpc -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109pojo-doc -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-message -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-mtom -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar">
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-oneway -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-rpcstyle -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-secureejb -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-swa -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-store-pass-encrypt.war -->
- <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-wsbpel -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="webservices.xml" />
- <include name="classes/bpel-application.xml" />
- </webinf>
- <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
- <include name="wsdl/**" />
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
- <include name="application-client.xml" />
- <include name="jboss-client.xml" />
- </metainf>
- <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-wssecurity-sign -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-wssecurity-encrypt -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
<!-- jaxrpc-utf16 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-01 15:46:41 UTC (rev 2238)
@@ -16,7 +16,7 @@
<!-- Building -->
<!-- ================================================================== -->
- <target name="build-jars" description="Build the deployments.">
+ <target name="build-jars-jaxws" description="Build the deployments.">
<mkdir dir="${tests.output.dir}/libs"/>
@@ -194,289 +194,6 @@
</webinf>
</war>
- <!-- jaxws-samples-asynchronous -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-context -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/>
- </fileset>
- </jar>
-
- <!-- 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/ExceptionEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-handlerchain -->
- <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/samples/handlerchain"
- file="${tests.output.dir}/resources/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/>
- </manifest>
- </jar>
-
- <!-- jaxws-samples-jsr181ejb -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
- <include name="jboss-wsse-server.xml"/>
- <include name="wsse.*"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-jsr181pojo -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-jsr181pojo-docwrapped -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
- </classes>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-logicalhandler -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
- <include name="jaxws-server-source-handlers.xml"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
- <include name="jaxws-server-jaxb-handlers.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-oneway -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-provider -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-retail -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
- <include name="wsdl/*"/>
- <include name="jaxws-handler.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-soapbinding -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webmethod -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webparam -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webresult -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webservice -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
- </fileset>
- </jar>
-
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-01 15:46:41 UTC (rev 2238)
@@ -17,6 +17,7 @@
<import file="${basedir}/../integration-jboss40/build.xml"/>
<import file="${basedir}/../integration-tomcat/build.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
+ <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/>
<property name="core.output.dir" value="${core.dir}/output"/>
<property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
@@ -107,9 +108,6 @@
<target name="prepare">
- <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/>
- <available property="installer.setup" file="jboss-ejb3-client.jar"/>
-
<mkdir dir="${tests.output.dir}/log"/>
<touch file="${tests.output.dir}/log/test.log"/>
@@ -299,8 +297,10 @@
<!-- ================================================================== -->
<target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments.">
- <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars" inheritall="true"/>
- <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
</target>
<!--
@@ -374,12 +374,6 @@
</copy>
</target>
- <!-- Custom targets that are not needed very often -->
-
- <target name="build-benchmark" depends="main">
- <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/>
- </target>
-
<!-- ================================================================== -->
<!-- Testing -->
<!-- ================================================================== -->
@@ -392,14 +386,6 @@
<antcall target="tests-report"/>
</target>
- <!-- Run benchmark test cases -->
- <target name="tests-benchmark" depends="init" description="Run benchmark unit tests">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/>
- </antcall>
- <antcall target="tests-report"/>
- </target>
-
<!-- Run samples test cases -->
<target name="tests-samples" depends="init" description="Run samples unit tests">
<antcall target="tests-main">
@@ -417,8 +403,8 @@
</target>
<!--
- Run a collection of unit tests.
- ant -Dtest=tools test
+ Run a collection of unit tests.
+ ant -Dtest=tools test
-->
<target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
<antcall target="tests-main">
@@ -462,8 +448,8 @@
</target>
<!--
- Run a single unit test.
- ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
-->
<target name="one-test" depends="init" if="test" description="Run a single unit test">
<mkdir dir="${tests.output.dir}/reports"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2007-02-01 15:46:41 UTC (rev 2238)
@@ -1,26 +1,28 @@
/*
-* 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.xop;
+// $Id$
+
import java.awt.Image;
import java.awt.Toolkit;
import java.io.ByteArrayInputStream;
@@ -36,12 +38,13 @@
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
- * @since Sep 22, 2006
+ * @since 22-Sep-2006
*/
-public class XOPTestSupport {
+public class XOPTestSupport
+{
- public static byte[] getBytesFromFile(File file) throws IOException {
+ public static byte[] getBytesFromFile(File file) throws IOException
+ {
InputStream is = new FileInputStream(file);
long length = file.length();
@@ -49,8 +52,8 @@
int offset = 0;
int numRead = 0;
- while (offset < bytes.length
- && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) {
+ while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)
+ {
offset += numRead;
}
@@ -58,12 +61,12 @@
return bytes;
}
- public static Image createTestImage()
+ public static Image createTestImage(File imgFile)
{
Image image = null;
try
{
- URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL();
+ URL url = imgFile.toURL();
image = null;
try
@@ -85,15 +88,15 @@
public static StreamSource createTestSource()
{
- return new StreamSource( new ByteArrayInputStream("<some><nestedXml/></some>".getBytes()));
+ return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes()));
}
- public static DataHandler createDataHandler()
+ public static DataHandler createDataHandler(File imgFile)
{
try
{
- URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL();
- return new DataHandler(url);
+ URL url = imgFile.toURL();
+ return new DataHandler(url);
}
catch (MalformedURLException e)
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-01 15:46:41 UTC (rev 2238)
@@ -48,6 +48,8 @@
*/
public abstract class XOPBase extends JBossWSTest {
+ private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg");
+
protected abstract XOPPing getPort();
// ---------------------------------------------------------------------------------
@@ -66,7 +68,7 @@
public void testResponseOptimized() throws Exception {
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg"));
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile);
// disable MTOM
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
@@ -80,7 +82,7 @@
public void testRequestOptimized() throws Exception {
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg"));
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile);
// reusing the stub means cleaning the previous state
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
@@ -97,7 +99,7 @@
public void testImageResponseOptimized() throws Exception {
- Image image = XOPTestSupport.createTestImage();
+ Image image = XOPTestSupport.createTestImage(imgFile);
if(image!=null)
{
@@ -113,7 +115,7 @@
public void testImageRequestOptimized() throws Exception {
- Image image = XOPTestSupport.createTestImage();
+ Image image = XOPTestSupport.createTestImage(imgFile);
if(image!=null)
{
@@ -162,7 +164,7 @@
public void testDHResponseOptimized() throws Exception {
- DataHandler dh = XOPTestSupport.createDataHandler();
+ DataHandler dh = XOPTestSupport.createDataHandler(imgFile);
// disable MTOM
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
@@ -178,7 +180,7 @@
public void testDHRequestOptimized() throws Exception {
- DataHandler dh = XOPTestSupport.createDataHandler();
+ DataHandler dh = XOPTestSupport.createDataHandler(imgFile);
// enable MTOM
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-01 15:46:41 UTC (rev 2238)
@@ -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.jaxrpc.xop.rpclit;
import java.awt.Image;
@@ -47,11 +47,14 @@
* @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $
* @since Sep 25, 2006
*/
-public abstract class XOPBase extends JBossWSTest {
+public abstract class XOPBase extends JBossWSTest
+{
+ private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg");
protected abstract XOPPing getPort();
- public void testRequestResponseOptimized() throws Exception {
+ public void testRequestResponseOptimized() throws Exception
+ {
DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
byte[] bytesIn = IOUtils.convertToBytes(dh);
@@ -59,28 +62,30 @@
}
- public void testResponseOptimized() throws Exception {
+ public void testResponseOptimized() throws Exception
+ {
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg"));
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile);
requestComplex(new PingMsg("0|1", bytesIn));
}
- public void testRequestOptimized() throws Exception {
+ public void testRequestOptimized() throws Exception
+ {
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg"));
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile);
requestComplex(new PingMsg("1|0", bytesIn));
}
private void requestComplex(PingMsg payload) throws Exception
{
- StringTokenizer tok =new StringTokenizer(payload.getMessage(), "|");
+ StringTokenizer tok = new StringTokenizer(payload.getMessage(), "|");
boolean mtomEnabled = tok.nextToken().equals("1");
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled));
PingMsgResponse value = getPort().ping(payload);
- assertNotNull("Return value was null",value);
+ assertNotNull("Return value was null", value);
byte[] bytesOut = value.getXopContent();
assertNotNull("Return xopContent was null", bytesOut);
assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length);
@@ -109,11 +114,12 @@
assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
}
- public void testImageResponseOptimized() throws Exception {
+ public void testImageResponseOptimized() throws Exception
+ {
- Image image = XOPTestSupport.createTestImage();
+ Image image = XOPTestSupport.createTestImage(imgFile);
- if(image!=null)
+ if (image != null)
{
// disable MTOM
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
@@ -125,11 +131,12 @@
}
}
- public void testImageRequestOptimized() throws Exception {
+ public void testImageRequestOptimized() throws Exception
+ {
- Image image = XOPTestSupport.createTestImage();
+ Image image = XOPTestSupport.createTestImage(imgFile);
- if(image!=null)
+ if (image != null)
{
// enable MTOM
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
@@ -141,7 +148,8 @@
}
}
- public void testSourceResponseOptimized() throws Exception {
+ public void testSourceResponseOptimized() throws Exception
+ {
Source source = XOPTestSupport.createTestSource();
@@ -158,7 +166,8 @@
}
- public void testSourceRequestOptimized() throws Exception {
+ public void testSourceRequestOptimized() throws Exception
+ {
Source source = XOPTestSupport.createTestSource();
@@ -174,9 +183,10 @@
assertNotNull("Return xopContent was null", response.getXopContent());
}
- public void testDHResponseOptimized() throws Exception {
+ public void testDHResponseOptimized() throws Exception
+ {
- DataHandler dh = XOPTestSupport.createDataHandler();
+ DataHandler dh = XOPTestSupport.createDataHandler(imgFile);
// disable MTOM
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
@@ -190,9 +200,10 @@
}
- public void testDHRequestOptimized() throws Exception {
+ public void testDHRequestOptimized() throws Exception
+ {
- DataHandler dh = XOPTestSupport.createDataHandler();
+ DataHandler dh = XOPTestSupport.createDataHandler(imgFile);
// enable MTOM
((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 13:44:43 UTC (rev 2237)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 15:46:41 UTC (rev 2238)
@@ -23,6 +23,7 @@
import java.awt.Image;
import java.awt.image.BufferedImage;
+import java.io.File;
import java.io.InputStream;
import java.net.URL;
@@ -39,6 +40,8 @@
*/
public abstract class XOPBase extends JBossWSTest
{
+ private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg");
+
protected MTOMEndpoint port;
protected SOAPBinding binding;
@@ -74,7 +77,7 @@
{
getBinding().setMTOMEnabled(true);
- Image img = XOPTestSupport.createTestImage();
+ Image img = XOPTestSupport.createTestImage(imgFile);
if (img != null) // might fail on unix
{
ImageRequest request = new ImageRequest();
@@ -91,7 +94,7 @@
{
getBinding().setMTOMEnabled(false);
- Image img = XOPTestSupport.createTestImage();
+ Image img = XOPTestSupport.createTestImage(imgFile);
if (img != null) // might fail on unix
{
17 years, 3 months
- 1
- 0
JBossWS SVN: r2237 - in branches/jbossws-1.2.0/jbossws-tests/src/main: java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 08:44:43 -0500 (Thu, 01 Feb 2007)
New Revision: 2237
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
Log:
Fix jboss50 excludes
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-02-01 13:44:43 UTC (rev 2237)
@@ -50,7 +50,7 @@
public void setUp() throws Exception
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-02-01 13:44:43 UTC (rev 2237)
@@ -48,7 +48,7 @@
{
super.setUp();
- if (endpoint == null && isTargetJBoss50() == false)
+ if (endpoint == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-02-01 13:44:43 UTC (rev 2237)
@@ -58,7 +58,7 @@
{
super.setUp();
- if (call == null && isTargetJBoss50() == false)
+ if (call == null)
{
File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml");
assertTrue(javaWsdlMappingFile.exists());
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-02-01 13:44:43 UTC (rev 2237)
@@ -48,7 +48,7 @@
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-02-01 13:44:43 UTC (rev 2237)
@@ -55,7 +55,7 @@
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml");
assertTrue(javaWsdlMappingFile.exists());
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-02-01 13:44:43 UTC (rev 2237)
@@ -162,8 +162,11 @@
{
stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured");
port.getContactInfo("mafia");
- System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL");
- fail("Security exception expected");
+
+ if (isTargetJBoss50())
+ System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL");
+ else
+ fail("Security exception expected");
}
catch (RemoteException ignore)
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-02-01 13:44:43 UTC (rev 2237)
@@ -52,7 +52,7 @@
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-01 13:04:24 UTC (rev 2236)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-01 13:44:43 UTC (rev 2237)
@@ -3,7 +3,7 @@
org/jboss/test/ws/jaxrpc/benchmark/**
org/jboss/test/ws/jaxws/benchmark/**
-# Resolve before JBoss50 goes final
+# Fix before JBoss50 goes final
org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
@@ -13,6 +13,8 @@
org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/wsdlpublish/**
17 years, 3 months
- 1
- 0
JBossWS SVN: r2236 - in branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws: jaxrpc/jbws1148 and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 08:04:24 -0500 (Thu, 01 Feb 2007)
New Revision: 2236
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
Log:
Fix vague javadoc
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -38,9 +38,10 @@
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
/**
- * Test case to test that when a deployment contains both an endpoint and a
- * servlet both are deployed correctly and can be accessed.
+ * Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints
*
+ * http://jira.jboss.org/jira/browse/JBWS-1093
+ *
* @author darran.lofthouse(a)jboss.com
* @since 17-October-2006
*/
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -30,9 +30,10 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * Test a call to an endpoint that uses an anonymous simple
- * type with restriction.
+ * Anonymous Simple Type causes NullPointerException
*
+ * http://jira.jboss.org/jira/browse/JBWS-1148
+ *
* @author darran.lofthouse(a)jboss.com
* @since Oct 22, 2006
*/
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -32,7 +32,10 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
+ * Each web services invocation causes a new HTTP session to be created.
*
+ * http://jira.jboss.org/jira/browse/JBWS-1179
+ *
* @author darran.lofthouse(a)jboss.com
* @since 18-October-2006
*/
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -30,6 +30,10 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
+ * WS Client does not clean up temporary xsd files
+ *
+ * http://jira.jboss.com/jira/browse/JBWS-1205
+ *
* @author darran.lofthouse(a)jboss.com
* @since 21-September-2006
*/
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -33,6 +33,7 @@
/**
* Handling of xml:lang and any namespace="##other"
+ *
* http://jira.jboss.com/jira/browse/JBWS-720
*
* @author Thomas.Diesler(a)jboss.org
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -31,6 +31,7 @@
/**
* Empty unwrapped arrays incorrectly unmarshalled as a null value
+ *
* http://jira.jboss.org/jira/browse/JBWS-732
*
* @author Thomas.Diesler(a)jboss.org
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -38,9 +38,9 @@
import org.jboss.ws.core.utils.DOMWriter;
/**
- * Web services deployment can fail when deploying multiple EJB JARs
+ * ComplexType cannot be constructed from attributes
*
- * http://jira.jboss.com/jira/browse/JBWS-772
+ * http://jira.jboss.com/jira/browse/JBWS-775
*
* @author Thomas.Diesler(a)jboss.org
* @since 24-Mar-2006
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-02-01 11:24:40 UTC (rev 2235)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-02-01 13:04:24 UTC (rev 2236)
@@ -33,7 +33,9 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * Test JBWS-1357 (jsps in deployment)
+ * JAXWSDeployerJSE is not handling jsp servlet defs correctly
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1357
*
* @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
* @version $Revision:1370 $
17 years, 3 months
- 1
- 0