JBossWS SVN: r14185 - stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-22 09:01:25 -0400 (Fri, 22 Apr 2011)
New Revision: 14185
Modified:
stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java
Log:
Fixing testcase; interceptors running before READ phase need check on http method as the wsdl queries are now handled by a READ phase interceptor.
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2011-04-22 10:34:52 UTC (rev 14184)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2011-04-22 13:01:25 UTC (rev 14185)
@@ -49,6 +49,11 @@
public void handleMessage(Message message) throws Fault
{
+ String method = (String)message.get(Message.HTTP_REQUEST_METHOD);
+ if (!method.equals("POST"))
+ {
+ return;
+ }
StringBuilder sb = new StringBuilder();
InputStream is = message.getContent(InputStream.class);
if (is != null)
13 years
- 1
- 0
JBossWS SVN: r14184 - in stack/cxf/branches/cxf24/modules: addons/transports/http/httpserver/src/main/resources/META-INF/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-22 06:34:52 -0400 (Fri, 22 Apr 2011)
New Revision: 14184
Added:
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt
Removed:
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension
Modified:
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
Log:
Fixing http transport configuration: the httpserver destination creation now goes through registration of HttpServerDestinationFactory that is then used by the CXF HTTPTransportFactory
Modified: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-04-22 10:34:52 UTC (rev 14184)
@@ -54,16 +54,14 @@
private static final long serialVersionUID = 1L;
- private HttpServerTransportFactory factory;
private HttpServerEngineFactory serverEngineFactory;
private HttpServerEngine engine;
private URL url;
- public HttpServerDestination(Bus b, DestinationRegistry registry, HttpServerTransportFactory factory, EndpointInfo ei) throws IOException
+ public HttpServerDestination(Bus b, DestinationRegistry registry, EndpointInfo ei) throws IOException
{
super(b, registry, ei);
- this.factory = factory;
- this.serverEngineFactory = factory.getServerEngineFactory();
+ this.serverEngineFactory = getServerEngineFactory();
getAddressValue(ei, true); //generate address if not specified
this.url = new URL(ei.getAddress());
}
@@ -94,6 +92,19 @@
+ engine.getProtocol() + "\" for \"" + url + "\"");
}
}
+
+ protected HttpServerEngineFactory getServerEngineFactory()
+ {
+ HttpServerEngineFactory serverEngineFactory = getBus().getExtension(HttpServerEngineFactory.class);
+ // If it's not there, then create it and register it.
+ // Spring may override it later, but we need it here for default
+ // with no spring configuration.
+ if (serverEngineFactory == null)
+ {
+ serverEngineFactory = new HttpServerEngineFactory(bus);
+ }
+ return serverEngineFactory;
+ }
/**
* Activate receipt of incoming messages.
@@ -122,13 +133,6 @@
engine.removeHandler(endpointInfo.getAddress());
}
- @Override
- public void shutdown()
- {
- factory.removeDestination(endpointInfo);
- super.shutdown();
- }
-
class Handler extends HttpHandlerImpl implements HttpHandler
{
Added: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java (rev 0)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java 2011-04-22 10:34:52 UTC (rev 14184)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.addons.transports.httpserver;
+
+import java.io.IOException;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.apache.cxf.transport.http.DestinationRegistry;
+import org.apache.cxf.transport.http.HttpDestinationFactory;
+
+
+/**
+ * Factory for HttpServerDestination
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 22-Apr-2011
+ *
+ */
+@NoJSR250Annotations()
+public class HttpServerDestinationFactory implements HttpDestinationFactory
+{
+ @Override
+ public AbstractHTTPDestination createDestination(EndpointInfo endpointInfo, Bus bus, DestinationRegistry registry)
+ throws IOException
+ {
+ return new HttpServerDestination(bus, registry, endpointInfo);
+ }
+}
Modified: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2011-04-22 10:34:52 UTC (rev 14184)
@@ -131,6 +131,7 @@
}
else
{
+ System.out.println("******* " + factory + " ****** handlerCount="+handlerCount);
LOG.log(Level.WARNING, "FAILED_TO_SHUTDOWN_ENGINE_MSG", port);
}
}
Modified: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2011-04-22 10:34:52 UTC (rev 14184)
@@ -140,7 +140,10 @@
HttpServerEngine[] engines = portMap.values().toArray(new HttpServerEngine[0]);
for (HttpServerEngine engine : engines)
{
- engine.shutdown();
+ if (engine.getBus() == getBus())
+ {
+ engine.shutdown();
+ }
}
}
Deleted: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2011-04-22 10:34:52 UTC (rev 14184)
@@ -1,118 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.addons.transports.httpserver;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
-
-/**
- * A Destination/Transport factory for the JDK6 httpserver
- *
- * @author alessio.soldano(a)jboss.com
- * @since 19-Aug-2010
- *
- */
-public class HttpServerTransportFactory extends HTTPTransportFactory implements DestinationFactory
-{
- private Map<String, HttpServerDestination> destinations = new ConcurrentHashMap<String, HttpServerDestination>();
-
- public HttpServerTransportFactory()
- {
- super();
- }
-
- @Resource
- public void setBus(Bus b)
- {
- super.setBus(b);
- }
-
- @PostConstruct
- public void finalizeConfig()
- {
- if (null == bus)
- {
- return;
- }
- // This call will register the server engine factory
- // with the Bus.
- getServerEngineFactory();
- }
-
- protected HttpServerEngineFactory getServerEngineFactory()
- {
- HttpServerEngineFactory serverEngineFactory = getBus().getExtension(HttpServerEngineFactory.class);
- // If it's not there, then create it and register it.
- // Spring may override it later, but we need it here for default
- // with no spring configuration.
- if (serverEngineFactory == null)
- {
- serverEngineFactory = new HttpServerEngineFactory(bus);
- serverEngineFactory.setBus(getBus());
- }
- return serverEngineFactory;
- }
-
- public Destination getDestination(EndpointInfo endpointInfo) throws IOException
- {
- String addr = endpointInfo.getAddress();
- HttpServerDestination destination = addr == null ? null : destinations.get(addr);
- if (destination == null)
- {
- destination = createDestination(endpointInfo);
- }
- return destination;
- }
-
- private synchronized HttpServerDestination createDestination(EndpointInfo endpointInfo) throws IOException
- {
- String addr = endpointInfo.getAddress();
- HttpServerDestination destination = addr == null ? null : destinations.get(addr);
- if (destination == null)
- {
- destination = new HttpServerDestination(getBus(), this.registry, this, endpointInfo);
- destinations.put(endpointInfo.getAddress(), destination);
- configure(destination);
- destination.finalizeConfig();
- }
- return destination;
- }
-
- /**
- * This function removes the destination for a particular endpoint.
- */
- void removeDestination(EndpointInfo ei)
- {
- destinations.remove(ei.getAddress());
- }
-
-}
Added: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt (rev 0)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt 2011-04-22 10:34:52 UTC (rev 14184)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerDestinationFactory::true
\ No newline at end of file
Deleted: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml 2011-04-22 10:34:52 UTC (rev 14184)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extensions xmlns="http://cxf.apache.org/bus/extension">
-
- <extension class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" deferred="false">
- <namespace>http://cxf.apache.org/transports/http</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- </extension>
-</extensions>
Deleted: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml 2011-04-22 10:34:52 UTC (rev 14184)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:foo="http://cxf.apache.org/configuration/foo"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-
- <bean class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory"
- id="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory"
- lazy-init="true">
- <property name="bus" ref="cxf"/>
- <property name="transportIds">
- <list>
- <value>http://cxf.apache.org/transports/http</value>
- <value>http://cxf.apache.org/transports/http/configuration</value>
- <value>http://schemas.xmlsoap.org/wsdl/http</value>
- <value>http://schemas.xmlsoap.org/wsdl/http/</value>
- </list>
- </property>
- </bean>
-
-</beans>
Deleted: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension 2011-04-22 10:34:52 UTC (rev 14184)
@@ -1 +0,0 @@
-META-INF/cxf/cxf-extension-httpserver.xml
\ No newline at end of file
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-22 10:34:52 UTC (rev 14184)
@@ -28,16 +28,11 @@
import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.binding.soap.SoapTransportFactory;
-import org.apache.cxf.bus.extension.ExtensionManager;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.service.invoker.Invoker;
-import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.cxf.transport.http.HttpDestinationFactory;
import org.apache.cxf.transport.servlet.ServletDestinationFactory;
-//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.cxf.ws.rm.RMManager;
import org.jboss.wsf.spi.binding.BindingCustomization;
@@ -69,17 +64,8 @@
super();
this.metadata = metadata;
bus = new JBossWSNonSpringBusFactory().createBus();
- //Force servlet transport to prevent CXF from using Jetty or other transports
- new HTTPTransportFactory(bus);
+ //Force servlet transport to prevent CXF from using Jetty / http server or other transports
bus.setExtension(new ServletDestinationFactory(), HttpDestinationFactory.class);
-// //Force servlet transport to prevent CXF from using Jetty or other transports
-// ExtensionManager em = bus.getExtension(ExtensionManager.class);
-// em.activateAllByType(ConduitInitiator.class); //need to activate/register all the beans implementing ConduitInitiator so that does not happen later
-// DestinationFactory factory = new ServletTransportFactory(bus);
-// for (String s : factory.getTransportIds())
-// {
-// registerTransport(factory, s);
-// }
}
/**
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-22 02:27:35 UTC (rev 14183)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-22 10:34:52 UTC (rev 14184)
@@ -99,15 +99,8 @@
log.trace("Could not load additional config from location: " + location, e);
}
}
- //Force servlet transport to prevent CXF from using Jetty or other transports
- new HTTPTransportFactory(bus);
+ //Force servlet transport to prevent CXF from using Jetty / http server or other transports
bus.setExtension(new ServletDestinationFactory(), HttpDestinationFactory.class);
-// //Force servlet transport to prevent CXF from using Jetty or other transports
-// DestinationFactory factory = new ServletTransportFactory(bus);
-// for (String s : factory.getTransportIds())
-// {
-// registerTransport(factory, s);
-// }
}
/**
13 years
- 1
- 0
JBossWS SVN: r14183 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-04-21 22:27:35 -0400 (Thu, 21 Apr 2011)
New Revision: 14183
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
Log:
[JBWS-3277]:Use ByteArrayDataSource to create all DataHandlers
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2011-04-21 21:04:57 UTC (rev 14182)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2011-04-22 02:27:35 UTC (rev 14183)
@@ -102,20 +102,11 @@
public String addMtomAttachment(byte[] data, int offset, int length,
String mimeType, String elementNamespace, String elementLocalName)
{
-
- DataHandler dh = null;
- String contentType = "application/octet-stream";
- if (mimeType.contains("xml") || mimeType.contains("text") || mimeType.contains("html"))
- {
- contentType = mimeType;
- ByteArrayDataSource ds = new ByteArrayDataSource(data, offset, length);
- ds.setContentType(contentType);
- dh = new DataHandler(ds);
- } else {
- dh = new DataHandler(data, contentType);
- }
-
-
+
+ String contentType = mimeType == null ? "application/octet-stream" : mimeType;
+ ByteArrayDataSource ds = new ByteArrayDataSource(data, offset, length);
+ ds.setContentType(contentType);
+ DataHandler dh = new DataHandler(ds);
return addMtomAttachment(dh, elementNamespace, elementLocalName);
}
13 years
- 1
- 0
JBossWS SVN: r14182 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365: modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2011-04-21 17:04:57 -0400 (Thu, 21 Apr 2011)
New Revision: 14182
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml
Removed:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-6365] Adding in MTOM 'null' code fix
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/trunk:14157,14160
+ /stack/native/trunk:14157,14160,14181
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -102,12 +102,20 @@
public String addMtomAttachment(byte[] data, int offset, int length,
String mimeType, String elementNamespace, String elementLocalName)
{
+
+ DataHandler dh = null;
+ String contentType = "application/octet-stream";
+ if (mimeType.contains("xml") || mimeType.contains("text") || mimeType.contains("html"))
+ {
+ contentType = mimeType;
+ ByteArrayDataSource ds = new ByteArrayDataSource(data, offset, length);
+ ds.setContentType(contentType);
+ dh = new DataHandler(ds);
+ } else {
+ dh = new DataHandler(data, contentType);
+ }
+
- if(true)
- mimeType = null; // ignore the mime type. otherwise the content handlers will fail
-
- String contentType = mimeType != null ? mimeType : "application/octet-stream";
- DataHandler dh = new DataHandler(data, contentType);
return addMtomAttachment(dh, elementNamespace, elementLocalName);
}
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java (from rev 14181, stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,55 @@
+package org.jboss.ws.extensions.xop.jaxws;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.activation.DataSource;
+
+public class ByteArrayDataSource implements DataSource {
+ private String contentType;
+ private String name;
+ private byte[] data;
+ private int offset;
+ private int length;
+
+ public ByteArrayDataSource(byte[] data) {
+ this(data, 0, data.length);
+ }
+ public ByteArrayDataSource(byte[] data, String contentType) {
+ this(data, 0, data.length);
+ this.contentType = contentType;
+ }
+
+ public ByteArrayDataSource(byte[] data, int offset, int length) {
+ this.data = data;
+ this.offset = offset;
+ this.length = length;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ public InputStream getInputStream() throws IOException {
+ return new ByteArrayInputStream(data, offset, length);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public OutputStream getOutputStream() throws IOException {
+ return null;
+ }
+
+}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,15 +1,11 @@
<?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. -->
<!-- ============================================================ -->
-
<project>
-
<description>JBossWS test archive builder</description>
-
<!-- ============================================================================== -->
<!-- Building -->
<!-- -->
@@ -17,11 +13,8 @@
<!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
<!-- -->
<!-- ============================================================================== -->
-
<target name="build-jars-jaxws" description="Build the deployments.">
-
<mkdir dir="${tests.output.dir}/test-libs"/>
-
<!-- jaxws-benchmark-doclit -->
<war warfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -32,7 +25,6 @@
<include name="wsdl/**"/>
</webinf>
</war>
-
<war warfile="${tests.output.dir}/test-libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
@@ -45,7 +37,6 @@
<include name="sun-jaxws.xml"/>
</webinf>
</war>
-
<!-- esb adoption -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.esb">
<metainf dir="${tests.output.dir}/test-resources/benchmark/jaxws/esb/META-INF">
@@ -58,7 +49,6 @@
<include name="*.xml"/>
</fileset>
</jar>
-
<!-- jaxws-enventry -->
<war warfile="${tests.output.dir}/test-libs/jaxws-enventry-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/jse-web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -72,7 +62,6 @@
<include name="org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.class"/>
</classes>
</war>
-
<!-- jaxws-endpoint-servlet -->
<war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -84,7 +73,6 @@
<include name="wsdl/**"/>
</webinf>
</war>
-
<!-- jaxws-epr -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -92,14 +80,12 @@
<exclude name="org/jboss/test/ws/jaxws/epr/*TestCase.class"/>
</fileset>
</jar>
-
<!-- jaxws-fastinfoset -->
<war warfile="${tests.output.dir}/test-libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/test-resources/jaxws/fastinfoset/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class"/>
</classes>
</war>
-
<!-- jaxws-handlerlifecycle -->
<war warfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -116,32 +102,27 @@
<include name="jaxws-endpoint-config.xml"/>
</webinf>
</war>
-
<jar jarfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/META-INF">
<include name="*.xml"/>
</metainf>
</jar>
-
<!-- jaxws-json -->
<war warfile="${tests.output.dir}/test-libs/jaxws-json.war" webxml="${tests.output.dir}/test-resources/jaxws/json/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/json/JsonEndpoint.class"/>
</classes>
</war>
-
<!-- jaxws-jaxbintros -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jaxbintros/**/*.class"/>
</classes>
-
<webinf dir="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF">
<include name="*.xml"/>
<include name="**/*.wsdl"/>
</webinf>
</war>
-
<!-- jaxws-jbws771 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws771.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -149,7 +130,6 @@
<exclude name="org/jboss/test/ws/jaxws/jbws771/*TestCase.class"/>
</fileset>
</jar>
-
<!-- jaxws-jbws871 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -170,7 +150,6 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
<!-- jaxws-jbws1172 -->
<war destfile="${tests.output.dir}/test-libs/jaxws-jbws1172.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1172/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -182,7 +161,6 @@
<include name="wsdl/**"/>
</webinf>
</war>
-
<!-- jaxws-jbws1309-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1309.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -195,7 +173,7 @@
</metainf>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1309/">
<include name="wsse.truststore"/>
- <include name="wsse.keystore"/>
+ <include name="wsse.keystore"/>
</metainf>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1309-client.jar">
@@ -204,7 +182,6 @@
<include name="wsse.keystore"/>
</metainf>
</jar>
-
<!-- jaxws-jbws1582 -->
<war destfile="${tests.output.dir}/test-libs/jaxws-jbws1582.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -224,14 +201,12 @@
<include name="wsdl/attack-service.wsdl"/>
</webinf>
</war>
-
<!-- jaxws-jbws1666 -->
<war destfile="${tests.output.dir}/test-libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1666/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/>
</classes>
</war>
-
<!-- jaxws-jbws1809 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -240,7 +215,6 @@
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF"/>
</jar>
-
<!-- jaxws-jbws1814 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws1814.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1814/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -250,14 +224,12 @@
<include name="*"/>
</webinf>
</war>
-
<!-- jaxws-jbws1850 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1850.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.class"/>
</fileset>
</jar>
-
<!-- jaxws-jbws1909 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1909.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -265,7 +237,6 @@
<exclude name="org/jboss/test/ws/jaxws/jbws1909/*TestCase.class"/>
</fileset>
</jar>
-
<!-- jaxws-jbws1988 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1988.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -285,7 +256,6 @@
<include name="jbossws-roles.properties"/>
</metainf>
</jar>
-
<!-- jaxws-jbws1991 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1991.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -297,7 +267,6 @@
<include name="jboss.xml"/>
</metainf>
</jar>
-
<!-- jaxws-jbws1999 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws1999.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1999/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -308,7 +277,6 @@
<include name="*"/>
</webinf>
</war>
-
<!-- jaxws-jbws2011-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2011.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -320,7 +288,7 @@
</metainf>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2011/">
<include name="wsse.truststore"/>
- <include name="wsse.keystore"/>
+ <include name="wsse.keystore"/>
</metainf>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2011-client.jar">
@@ -329,8 +297,7 @@
<include name="wsse.keystore"/>
</metainf>
</jar>
-
- <!-- jaxws-jbws2014-->
+ <!-- jaxws-jbws2014-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2014-sign.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2014/*.class"/>
@@ -339,11 +306,11 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/sign/META-INF">
<include name="jboss-wsse-server.xml"/>
</metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/">
<include name="wsse.*"/>
</metainf>
</jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2014-encrypt.jar">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2014-encrypt.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2014/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws2014/*TestCase.class"/>
@@ -351,12 +318,11 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/encrypt/META-INF">
<include name="jboss-wsse-server.xml"/>
</metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/">
<include name="wsse.*"/>
</metainf>
</jar>
-
- <!-- jaxws-jbws2116-->
+ <!-- jaxws-jbws2116-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2116.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2116/*.class"/>
@@ -364,14 +330,14 @@
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2116/META-INF">
<include name="jboss-wsse-server.xml"/>
- <include name="jboss.xml"/>
+ <include name="jboss.xml"/>
</metainf>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2116/">
<include name="wsse10.truststore"/>
- <include name="bob-sign.jks"/>
+ <include name="bob-sign.jks"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2116.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2116.sar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2116/META-INF">
<include name="jboss-service.xml"/>
<include name="login-config.xml"/>
@@ -379,7 +345,6 @@
<include name="jbossws-roles.properties"/>
</metainf>
</jar>
-
<!-- jaxws-jbws2166-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-A.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -394,7 +359,6 @@
<include name="org/jboss/test/ws/jaxws/jbws2166/EndpointImplB.class"/>
</fileset>
</jar>
-
<!-- jaxws-jbws2182-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2182.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -406,7 +370,7 @@
</metainf>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2182/">
<include name="wsse.truststore"/>
- <include name="wsse.keystore"/>
+ <include name="wsse.keystore"/>
</metainf>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2182-client.jar">
@@ -415,7 +379,6 @@
<include name="wsse.keystore"/>
</metainf>
</jar>
-
<!-- jaxws-jbws2187 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2187.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -426,7 +389,6 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
-
<!-- jaxws-jbws2221 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2221.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -437,7 +399,6 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
<!-- jaxws-jbws2234 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2234.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2234/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -448,8 +409,7 @@
<include name="jboss-web.xml"/>
<include name="wsdl/*"/>
</webinf>
- </war>
-
+ </war>
<!-- jaxws-jbws2248 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2248.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2248/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -460,7 +420,6 @@
<include name="wsdl/*"/>
</webinf>
</war>
-
<!-- jaxws-jbws2259 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2259.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -472,8 +431,7 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF">
<include name="jaxws-endpoint-config.xml"/>
</webinf>
- </war>
-
+ </war>
<!-- jaxws-jbws2268 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2268.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2268/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -481,7 +439,6 @@
<exclude name="org/jboss/test/ws/jaxws/jbws2268/*TestCase.class"/>
</classes>
</war>
-
<!-- jaxws-jbws2285 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2285.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -492,8 +449,7 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
- </war>
-
+ </war>
<!-- jaxws-jbws2319 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2319.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2319/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -505,7 +461,6 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
-
<!-- jaxws-jbws2437 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2437.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -513,15 +468,13 @@
<exclude name="org/jboss/test/ws/jaxws/jbws2437/*TestCase.class"/>
</fileset>
</jar>
-
<!-- jaxws-jbws2486 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2486.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2486/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2486/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws2486/*TestCase.class"/>
</classes>
- </war>
-
+ </war>
<!-- jaxws-jbws2565 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -551,15 +504,13 @@
<include name="jboss-app.xml"/>
</metainf>
</jar>
-
<!-- jaxws-jbws2682 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2682.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2682/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2682/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.class"/>
</classes>
- </war>
-
+ </war>
<!-- jaxws-jbws2698 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2698.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2698/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -570,9 +521,15 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2698/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
- </war>
-
- <!-- jaxws-webserviceref -->
+ </war>
+ <!-- jaxws-jbws3277 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3277.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3277/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3277/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3277/*TestCase*.class" />
+ </classes>
+ </war>
+ <!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
@@ -593,8 +550,7 @@
<attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
</manifest>
</jar>
- <war destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-servlet-client.war"
- webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF-client/web.xml">
+ <war destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF-client/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
@@ -660,7 +616,6 @@
<attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/>
</manifest>
</jar>
-
<!-- jaxws-webserviceref-secure -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-secure.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -697,7 +652,6 @@
<attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/>
</manifest>
</jar>
-
<!-- jaxws-wsdd -->
<war warfile="${tests.output.dir}/test-libs/jaxws-wsdd.war" webxml="${tests.output.dir}/test-resources/jaxws/wsdd/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -707,7 +661,6 @@
<include name="webservices.xml"/>
</webinf>
</war>
-
<!-- jaxws-wsaddressing-action -->
<war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -715,10 +668,8 @@
<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
</classes>
</war>
-
<!-- jaxws-wsaddressing-replyto -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial.war"
- webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
@@ -739,8 +690,7 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war"
- webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
@@ -761,17 +711,13 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war"
- webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
</classes>
</war>
-
<!-- Please add alphabetically -->
-
</target>
-
</project>
Deleted: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws3277;
-
-import javax.jws.WebService;
-
-@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3277")
-
-public interface Endpoint
-{
- public MTOMResponse echo(MTOMRequest message);
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java (from rev 14181, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.jws.WebService;
+
+@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3277")
+
+public interface Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message);
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws3277;
-
-import javax.jws.WebService;
-import javax.xml.ws.BindingType;
-
-
-@WebService(
- name = "TestEndpoint",
- targetNamespace = "http://ws.jboss.org/jbws3277",
- serviceName = "TestEndpointService",
- endpointInterface = "org.jboss.test.ws.jaxws.jbws3277.Endpoint")
-@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
-
-public class EndpointImpl implements Endpoint
-{
- public MTOMResponse echo(MTOMRequest message) {
- MTOMResponse response = new MTOMResponse();
- response.setResponseXML(message.getRequestXML());
- response.setResponse("text/xml mtom response");
- return response;
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java (from rev 14181, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.jws.WebService;
+import javax.xml.ws.BindingType;
+
+
+@WebService(
+ name = "TestEndpoint",
+ targetNamespace = "http://ws.jboss.org/jbws3277",
+ serviceName = "TestEndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3277.Endpoint")
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+
+public class EndpointImpl implements Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message) {
+ MTOMResponse response = new MTOMResponse();
+ response.setResponseXML(message.getRequestXML());
+ response.setResponse("text/xml mtom response");
+ return response;
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws3277;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestSetup;
-import org.w3c.dom.Document;
-
-public class JBWS3277TestCase extends JBossWSTest
-{
- private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3277";
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS3277TestCase.class, "jaxws-jbws3277.war");
- }
-
- public void testMtomSawpFile() throws Exception
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName serviceName = new QName("http://ws.jboss.org/jbws3277", "TestEndpointService");
- Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
- SOAPBinding binding = (SOAPBinding) ((BindingProvider) port).getBinding();
- binding.setMTOMEnabled(true);
- File file = JBossWSTestHelper.getResourceFile("jaxws/jbws3277/test-message.xml");
-
- DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
- Document doc = docBuilder.parse(file);
- Source source = new DOMSource(doc);
-
- MTOMRequest request = new MTOMRequest();
- request.setRequestXML(source);
- request.setId("text/xml mtom request");
- MTOMResponse mtomResponse = port.echo(request);
- Assert.assertEquals("text/xml mtom response", mtomResponse.getResponse());
- source = mtomResponse.getResponseXML();
-
- Transformer t = javax.xml.transform.TransformerFactory.newInstance().newTransformer();
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- Result result = new StreamResult(os);
- t.transform(source, result);
- assertEquals(375, os.toByteArray().length);
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java (from rev 14181, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Document;
+
+public class JBWS3277TestCase extends JBossWSTest
+{
+ private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3277";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3277TestCase.class, "jaxws-jbws3277.war");
+ }
+
+ public void testMtomSawpFile() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws3277", "TestEndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ SOAPBinding binding = (SOAPBinding) ((BindingProvider) port).getBinding();
+ binding.setMTOMEnabled(true);
+ File file = JBossWSTestHelper.getResourceFile("jaxws/jbws3277/test-message.xml");
+
+ DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+ Document doc = docBuilder.parse(file);
+ Source source = new DOMSource(doc);
+
+ MTOMRequest request = new MTOMRequest();
+ request.setRequestXML(source);
+ request.setId("text/xml mtom request");
+ MTOMResponse mtomResponse = port.echo(request);
+ Assert.assertEquals("text/xml mtom response", mtomResponse.getResponse());
+ source = mtomResponse.getResponseXML();
+
+ Transformer t = javax.xml.transform.TransformerFactory.newInstance().newTransformer();
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ Result result = new StreamResult(os);
+ t.transform(source, result);
+ assertEquals(375, os.toByteArray().length);
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws3277;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.transform.Source;
-
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "id",
- "requestXML"
-})
-@XmlRootElement(name = "MTOMRequest")
-public class MTOMRequest
-{
- @XmlElement(name = "Id", required = true)
- protected String id;
- @XmlElement(name = "RequestXML", required = true)
- @XmlMimeType("text/xml")
- protected Source requestXML;
-
- public Source getRequestXML() {
- return requestXML;
- }
-
- public void setRequestXML(Source value)
- {
- this.requestXML = value;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
-}
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java (from rev 14181, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.transform.Source;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "id",
+ "requestXML"
+})
+@XmlRootElement(name = "MTOMRequest")
+public class MTOMRequest
+{
+ @XmlElement(name = "Id", required = true)
+ protected String id;
+ @XmlElement(name = "RequestXML", required = true)
+ @XmlMimeType("text/xml")
+ protected Source requestXML;
+
+ public Source getRequestXML() {
+ return requestXML;
+ }
+
+ public void setRequestXML(Source value)
+ {
+ this.requestXML = value;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws3277;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.transform.Source;
-
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "response",
- "responseXML"
-})
-@XmlRootElement(name = "MTOMResponse")
-public class MTOMResponse
-{
- @XmlElement(name = "Reponse", required = true)
- protected String response;
- @XmlElement(name = "ResponseXML", required = true)
- @XmlMimeType("text/xml")
- protected Source responseXML;
-
-
- public Source getResponseXML() {
- return responseXML;
- }
-
- public void setResponseXML(Source value)
- {
- this.responseXML = value;
- }
- public String getResponse()
- {
- return response;
- }
-
- public void setResponse(String value)
- {
- this.response = value;
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java (from rev 14181, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.transform.Source;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "response",
+ "responseXML"
+})
+@XmlRootElement(name = "MTOMResponse")
+public class MTOMResponse
+{
+ @XmlElement(name = "Reponse", required = true)
+ protected String response;
+ @XmlElement(name = "ResponseXML", required = true)
+ @XmlMimeType("text/xml")
+ protected Source responseXML;
+
+
+ public Source getResponseXML() {
+ return responseXML;
+ }
+
+ public void setResponseXML(Source value)
+ {
+ this.responseXML = value;
+ }
+ public String getResponse()
+ {
+ return response;
+ }
+
+ public void setResponse(String value)
+ {
+ this.response = value;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws3277.EndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml (from rev 14181, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3277.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Deleted: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml 2011-04-21 16:28:57 UTC (rev 14181)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml 2011-04-21 21:04:57 UTC (rev 14182)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
-<env:Header>
-<wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>
-</wsse:Security>
-</env:Header>
-<env:Body>
-<Foo xmlns='http://www.jboss.org/jbossws'>
-<Body>
- jbossws
-</Body>
-</Foo>
-</env:Body>
-</env:Envelope>
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml (from rev 14181, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml 2011-04-21 21:04:57 UTC (rev 14182)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+<env:Header>
+<wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>
+</wsse:Security>
+</env:Header>
+<env:Body>
+<Foo xmlns='http://www.jboss.org/jbossws'>
+<Body>
+ jbossws
+</Body>
+</Foo>
+</env:Body>
+</env:Envelope>
13 years
- 1
- 0
JBossWS SVN: r14181 - in stack/native/trunk/modules: testsuite/native-tests/scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-04-21 12:28:57 -0400 (Thu, 21 Apr 2011)
New Revision: 14181
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
JBWS-3277:Fix unexpected bytes are serialized in MTOM attachment when the mime type is text/xml
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2011-04-21 10:54:46 UTC (rev 14180)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2011-04-21 16:28:57 UTC (rev 14181)
@@ -102,12 +102,20 @@
public String addMtomAttachment(byte[] data, int offset, int length,
String mimeType, String elementNamespace, String elementLocalName)
{
+
+ DataHandler dh = null;
+ String contentType = "application/octet-stream";
+ if (mimeType.contains("xml") || mimeType.contains("text") || mimeType.contains("html"))
+ {
+ contentType = mimeType;
+ ByteArrayDataSource ds = new ByteArrayDataSource(data, offset, length);
+ ds.setContentType(contentType);
+ dh = new DataHandler(ds);
+ } else {
+ dh = new DataHandler(data, contentType);
+ }
+
- if(true)
- mimeType = null; // ignore the mime type. otherwise the content handlers will fail
-
- String contentType = mimeType != null ? mimeType : "application/octet-stream";
- DataHandler dh = new DataHandler(data, contentType);
return addMtomAttachment(dh, elementNamespace, elementLocalName);
}
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ByteArrayDataSource.java 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,55 @@
+package org.jboss.ws.extensions.xop.jaxws;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.activation.DataSource;
+
+public class ByteArrayDataSource implements DataSource {
+ private String contentType;
+ private String name;
+ private byte[] data;
+ private int offset;
+ private int length;
+
+ public ByteArrayDataSource(byte[] data) {
+ this(data, 0, data.length);
+ }
+ public ByteArrayDataSource(byte[] data, String contentType) {
+ this(data, 0, data.length);
+ this.contentType = contentType;
+ }
+
+ public ByteArrayDataSource(byte[] data, int offset, int length) {
+ this.data = data;
+ this.offset = offset;
+ this.length = length;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ public InputStream getInputStream() throws IOException {
+ return new ByteArrayInputStream(data, offset, length);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public OutputStream getOutputStream() throws IOException {
+ return null;
+ }
+
+}
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-21 10:54:46 UTC (rev 14180)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-21 16:28:57 UTC (rev 14181)
@@ -704,14 +704,22 @@
</metainf>
</jar>
- <!-- jaxws-jbws3250 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" />
- </classes>
- </war>
+ <!-- jaxws-jbws3250 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" />
+ </classes>
+ </war>
+ <!-- jaxws-jbws3277 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3277.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3277/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3277/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3277/*TestCase*.class" />
+ </classes>
+ </war>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/Endpoint.java 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.jws.WebService;
+
+@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3277")
+
+public interface Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message);
+
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/EndpointImpl.java 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.jws.WebService;
+import javax.xml.ws.BindingType;
+
+
+@WebService(
+ name = "TestEndpoint",
+ targetNamespace = "http://ws.jboss.org/jbws3277",
+ serviceName = "TestEndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3277.Endpoint")
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+
+public class EndpointImpl implements Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message) {
+ MTOMResponse response = new MTOMResponse();
+ response.setResponseXML(message.getRequestXML());
+ response.setResponse("text/xml mtom response");
+ return response;
+ }
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Document;
+
+public class JBWS3277TestCase extends JBossWSTest
+{
+ private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3277";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3277TestCase.class, "jaxws-jbws3277.war");
+ }
+
+ public void testMtomSawpFile() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws3277", "TestEndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ SOAPBinding binding = (SOAPBinding) ((BindingProvider) port).getBinding();
+ binding.setMTOMEnabled(true);
+ File file = JBossWSTestHelper.getResourceFile("jaxws/jbws3277/test-message.xml");
+
+ DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+ Document doc = docBuilder.parse(file);
+ Source source = new DOMSource(doc);
+
+ MTOMRequest request = new MTOMRequest();
+ request.setRequestXML(source);
+ request.setId("text/xml mtom request");
+ MTOMResponse mtomResponse = port.echo(request);
+ Assert.assertEquals("text/xml mtom response", mtomResponse.getResponse());
+ source = mtomResponse.getResponseXML();
+
+ Transformer t = javax.xml.transform.TransformerFactory.newInstance().newTransformer();
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ Result result = new StreamResult(os);
+ t.transform(source, result);
+ assertEquals(375, os.toByteArray().length);
+ }
+
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMRequest.java 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.transform.Source;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "id",
+ "requestXML"
+})
+@XmlRootElement(name = "MTOMRequest")
+public class MTOMRequest
+{
+ @XmlElement(name = "Id", required = true)
+ protected String id;
+ @XmlElement(name = "RequestXML", required = true)
+ @XmlMimeType("text/xml")
+ protected Source requestXML;
+
+ public Source getRequestXML() {
+ return requestXML;
+ }
+
+ public void setRequestXML(Source value)
+ {
+ this.requestXML = value;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+}
\ No newline at end of file
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/MTOMResponse.java 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3277;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.transform.Source;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "response",
+ "responseXML"
+})
+@XmlRootElement(name = "MTOMResponse")
+public class MTOMResponse
+{
+ @XmlElement(name = "Reponse", required = true)
+ protected String response;
+ @XmlElement(name = "ResponseXML", required = true)
+ @XmlMimeType("text/xml")
+ protected Source responseXML;
+
+
+ public Source getResponseXML() {
+ return responseXML;
+ }
+
+ public void setResponseXML(Source value)
+ {
+ this.responseXML = value;
+ }
+ public String getResponse()
+ {
+ return response;
+ }
+
+ public void setResponse(String value)
+ {
+ this.response = value;
+ }
+
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/WEB-INF/web.xml 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3277.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/test-message.xml 2011-04-21 16:28:57 UTC (rev 14181)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+<env:Header>
+<wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>
+</wsse:Security>
+</env:Header>
+<env:Body>
+<Foo xmlns='http://www.jboss.org/jbossws'>
+<Body>
+ jbossws
+</Body>
+</Foo>
+</env:Body>
+</env:Envelope>
13 years
- 1
- 0
JBossWS SVN: r14180 - stack/cxf/trunk/modules/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-21 06:54:46 -0400 (Thu, 21 Apr 2011)
New Revision: 14180
Modified:
stack/cxf/trunk/modules/client/pom.xml
Log:
adding jbossws-common-tools.jar to classpath - TCK6 ANT tasks CP setup relies on this MANIFEST.MF entry
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2011-04-21 08:50:38 UTC (rev 14179)
+++ stack/cxf/trunk/modules/client/pom.xml 2011-04-21 10:54:46 UTC (rev 14180)
@@ -282,7 +282,7 @@
<customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
</manifest>
<manifestEntries>
- <Class-Path>jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
+ <Class-Path>jbossws-common-tools.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
13 years
- 1
- 0
JBossWS SVN: r14179 - stack/cxf/branches/cxf24.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-21 04:50:38 -0400 (Thu, 21 Apr 2011)
New Revision: 14179
Modified:
stack/cxf/branches/cxf24/pom.xml
Log:
Excluding some unwanted transitive dependencies and moving back to FastInfoset 1.2.7
Modified: stack/cxf/branches/cxf24/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/pom.xml 2011-04-21 08:49:50 UTC (rev 14178)
+++ stack/cxf/branches/cxf24/pom.xml 2011-04-21 08:50:38 UTC (rev 14179)
@@ -60,7 +60,7 @@
<cxf.version>2.4.0</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
- <fastinfoset.api.version>1.2.9</fastinfoset.api.version>
+ <fastinfoset.api.version>1.2.7</fastinfoset.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jboss.logging.version>3.0.0.Beta3</jboss.logging.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
@@ -81,6 +81,7 @@
<commons.logging.version>1.1.1</commons.logging.version>
<log4j.version>1.2.14</log4j.version>
<mail.version>1.4.2</mail.version>
+ <neethi.version>3.0.0</neethi.version>
<saaj.api.version>1.0.0.Final</saaj.api.version>
<stax.api.version>1.0-2</stax.api.version>
<jms.api.version>1.0.0.Final</jms.api.version>
@@ -176,6 +177,10 @@
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1102,6 +1107,17 @@
<version>${mail.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.xml.bind</groupId>
<artifactId>jboss-jaxb-api_2.2_spec</artifactId>
<version>${jaxb.api.version}</version>
13 years
- 1
- 0
JBossWS SVN: r14178 - stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/etc.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-21 04:49:50 -0400 (Thu, 21 Apr 2011)
New Revision: 14178
Modified:
stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/etc/log4j.xml
Log:
[CXF-3466] Set log level to INFO to prevent empty messages being sent
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2011-04-21 08:16:06 UTC (rev 14177)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2011-04-21 08:49:50 UTC (rev 14178)
@@ -60,7 +60,7 @@
</category>
<category name="org.apache.cxf">
- <priority value="DEBUG"/>
+ <priority value="INFO"/>
</category>
<category name="org.springframework">
13 years
- 1
- 0
JBossWS SVN: r14177 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-21 04:16:06 -0400 (Thu, 21 Apr 2011)
New Revision: 14177
Modified:
hudson/trunk/ant.properties.example
Log:
AS7 builds to Beta4 SNAPSHOT
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2011-04-20 11:58:11 UTC (rev 14176)
+++ hudson/trunk/ant.properties.example 2011-04-21 08:16:06 UTC (rev 14177)
@@ -26,7 +26,7 @@
hudson.jboss600.rev=HEAD
hudson.jboss700.url=https://github.com/jbossas/jboss-as
-hudson.jboss700.build=jboss-7.0.0.Beta3-SNAPSHOT
+hudson.jboss700.build=jboss-7.0.0.Beta4-SNAPSHOT
hudson.jboss700.rev=master
hudson.mail.recipients=
13 years
- 1
- 0
JBossWS SVN: r14176 - common-tools/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-20 07:58:11 -0400 (Wed, 20 Apr 2011)
New Revision: 14176
Modified:
common-tools/trunk/pom.xml
Log:
prepare for next dev. cycle
Modified: common-tools/trunk/pom.xml
===================================================================
--- common-tools/trunk/pom.xml 2011-04-20 11:57:11 UTC (rev 14175)
+++ common-tools/trunk/pom.xml 2011-04-20 11:58:11 UTC (rev 14176)
@@ -9,22 +9,22 @@
<packaging>jar</packaging>
<description>JBossWS Common Tools</description>
- <version>1.0.0.Alpha1</version>
+ <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10.Alpha1</version>
+ <version>1.0.10-SNAPSHOT</version>
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common-tools/tags/jbossws-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common-tools/tags/jbossws-com...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/common-tools/tags/jbossws-common...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common-tools/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common-tools/trunk</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/common-tools/trunk</url>
</scm>
<properties>
- <jbossws.spi.version>2.0.0.Alpha3</jbossws.spi.version>
+ <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
<ant.version>1.7.1</ant.version>
<getopt.version>1.0.13</getopt.version>
<junit.version>3.8.2</junit.version>
13 years
- 1
- 0