JBossWS SVN: r14024 - in spi/branches/asoldano/src/main/java/org/jboss/wsf/spi: classloading and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:12:36 -0400 (Thu, 07 Apr 2011)
New Revision: 14024
Added:
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SecurityActions.java
Modified:
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProvider.java
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
Log:
Adding default classloader provider and adding options for providing the classloader to be used for SPI resolution
Modified: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProvider.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProvider.java 2011-04-07 13:06:57 UTC (rev 14023)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProvider.java 2011-04-07 13:12:36 UTC (rev 14024)
@@ -29,8 +29,25 @@
*/
public abstract class SPIProvider
{
- /*
- * Gets the specified SPI.
- */
- public abstract <T> T getSPI(java.lang.Class<T> spiType);
+ /**
+ * Gets the specified SPI, using the current thread context classloader
+ *
+ * @param <T>
+ * @param spiType
+ * @return
+ */
+ public <T> T getSPI(Class<T> spiType)
+ {
+ return getSPI(spiType, SecurityActions.getContextClassLoader());
+ }
+
+ /**
+ * Gets the specified SPI, using the provided classloader
+ *
+ * @param <T>
+ * @param spiType
+ * @param loader
+ * @return
+ */
+ public abstract <T> T getSPI(Class<T> spiType, ClassLoader loader);
}
Modified: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java 2011-04-07 13:06:57 UTC (rev 14023)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java 2011-04-07 13:12:36 UTC (rev 14024)
@@ -32,13 +32,28 @@
public abstract class SPIProviderResolver
{
public final static String DEFAULT_SPI_PROVIDER_RESOLVER = "org.jboss.wsf.framework.DefaultSPIProviderResolver";
-
+
+ /**
+ * Get the SPIProviderResolver instance using the thread context classloader for lookup
+ *
+ * @return
+ */
public static SPIProviderResolver getInstance()
{
- SPIProviderResolver resolver = (SPIProviderResolver)ServiceLoader.loadService(SPIProviderResolver.class.getName(), DEFAULT_SPI_PROVIDER_RESOLVER);
+ return getInstance(SecurityActions.getContextClassLoader());
+ }
+
+ /**
+ * Get the SPIProviderResolver instance using the provided classloader for lookup
+ *
+ * @return
+ */
+ public static SPIProviderResolver getInstance(ClassLoader cl)
+ {
+ SPIProviderResolver resolver = (SPIProviderResolver)ServiceLoader.loadService(SPIProviderResolver.class.getName(), DEFAULT_SPI_PROVIDER_RESOLVER, cl);
return resolver;
}
public abstract SPIProvider getProvider();
-
+
}
Added: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SecurityActions.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SecurityActions.java (rev 0)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/SecurityActions.java 2011-04-07 13:12:36 UTC (rev 14024)
@@ -0,0 +1,69 @@
+/*
+ * 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.spi;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Security actions helper.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 17-Feb-2010
+ */
+class SecurityActions {
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null) {
+ return Thread.currentThread().getContextClassLoader();
+ } else {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader) {
+ if (System.getSecurityManager() == null) {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ } else {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+}
Modified: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-04-07 13:06:57 UTC (rev 14023)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-04-07 13:12:36 UTC (rev 14024)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.spi.classloading;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
/**
* SPI for getting AS classloaders
*
@@ -30,20 +33,60 @@
*/
public abstract class ClassLoaderProvider
{
- private static ClassLoaderProvider provider = null;
-
+ private static ClassLoaderProvider provider = new ClassLoaderProvider()
+ {
+ @Override
+ public ClassLoader getWebServiceSubsystemClassLoader()
+ {
+ return getContextClassLoader();
+ }
+
+ @Override
+ public ClassLoader getServerIntegrationClassLoader()
+ {
+ return getContextClassLoader();
+ }
+ };
+
public static void setDefaultProvider(ClassLoaderProvider p)
{
provider = p;
}
-
+
public static ClassLoaderProvider getDefaultProvider()
{
return provider;
}
-
+
+ /**
+ * Return the ClassLoader instance having visibility over the application server ws subsystem only
+ *
+ * @return
+ */
public abstract ClassLoader getWebServiceSubsystemClassLoader();
-
+
+ /**
+ * Return the ClassLoader instance having visibility over the all server side ws libraries
+ *
+ * @return
+ */
public abstract ClassLoader getServerIntegrationClassLoader();
-
+
+ static ClassLoader getContextClassLoader()
+ {
+ if (System.getSecurityManager() == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
}
Modified: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-04-07 13:06:57 UTC (rev 14023)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-04-07 13:12:36 UTC (rev 14024)
@@ -70,7 +70,7 @@
protected ServletDelegate getDelegate(ServletConfig servletConfig)
{
ClassLoaderProvider clProvider = ClassLoaderProvider.getDefaultProvider();
- ClassLoader cl = (clProvider != null) ? clProvider.getWebServiceSubsystemClassLoader() : getContextClassLoader();
+ ClassLoader cl = clProvider.getWebServiceSubsystemClassLoader();
ServiceLoader<ServletDelegateFactory> sl = ServiceLoader.load(ServletDelegateFactory.class, cl);
ServletDelegateFactory factory = sl.iterator().next();
return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS));
13 years
- 1
- 0
JBossWS SVN: r14023 - api/branches/asoldano/src/main/java/org/jboss/wsf/spi/util.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:06:57 -0400 (Thu, 07 Apr 2011)
New Revision: 14023
Modified:
api/branches/asoldano/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
Log:
Allowing for specifying the classloader to use for Service lookup by ServiceLoader
Modified: api/branches/asoldano/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
===================================================================
--- api/branches/asoldano/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2011-04-07 13:05:29 UTC (rev 14022)
+++ api/branches/asoldano/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2011-04-07 13:06:57 UTC (rev 14023)
@@ -64,28 +64,59 @@
* as the name of the implementation class.
*
* 4. Finally, a default implementation class name is used.
+ *
+ * @param propertyName The property name for the service to resolve
+ * @param defaultFactory Default factory class name to be used when not able to resolve anything
+ * @param cl The classLoader to be used for loading resolved service
+ * @return A new instance of the required service
*/
- public static Object loadService(String propertyName, String defaultFactory)
+ public static Object loadService(String propertyName, String defaultFactory, ClassLoader cl)
{
- Object factory = loadFromServices(propertyName, null);
+ Object factory = loadFromServices(propertyName, null, cl);
if (factory == null)
{
- factory = loadFromPropertiesFile(propertyName, null);
+ factory = loadFromPropertiesFile(propertyName, null, cl);
}
if (factory == null)
{
- factory = loadFromSystemProperty(propertyName, defaultFactory);
+ factory = loadFromSystemProperty(propertyName, defaultFactory, cl);
}
return factory;
}
+ /**
+ * This method uses the algorithm below using the JAXWS Provider as an example.
+ *
+ * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
+ * its first line, if present, is used as the UTF-8 encoded name of the implementation class.
+ *
+ * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the
+ * java.util.Properties.load(InputStream) method and it contains an entry whose key is
+ * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class.
+ *
+ * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used
+ * as the name of the implementation class.
+ *
+ * 4. Finally, a default implementation class name is used.
+ *
+ * This is equivalent to calling {@link loadService(String propertyName, String defaultFactory, ClassLoader cl)}
+ * passing in the Thread.currentThread().getContextClassLoader().
+ *
+ * @param propertyName The property name for the service to resolve
+ * @param defaultFactory Default factory class name to be used when not able to resolve anything
+ * @return A new instance of the required service
+ */
+ public static Object loadService(String propertyName, String defaultFactory)
+ {
+ return loadService(propertyName, defaultFactory, SecurityActions.getContextClassLoader());
+ }
+
/** Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
*/
- public static Object loadFromServices(String propertyName, String defaultFactory)
+ private static Object loadFromServices(String propertyName, String defaultFactory, ClassLoader loader)
{
Object factory = null;
String factoryName = null;
- ClassLoader loader = SecurityActions.getContextClassLoader();
// Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
String filename = "META-INF/services/" + propertyName;
@@ -107,7 +138,7 @@
// Use the default factory implementation class.
if (factory == null && defaultFactory != null)
{
- factory = loadDefault(defaultFactory);
+ factory = loadDefault(defaultFactory, loader);
}
return factory;
@@ -142,10 +173,9 @@
/** Use the system property
*/
- public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
+ private static Object loadFromSystemProperty(String propertyName, String defaultFactory, ClassLoader loader)
{
Object factory = null;
- ClassLoader loader = SecurityActions.getContextClassLoader();
PrivilegedAction action = new PropertyAccessAction(propertyName);
String factoryName = (String)AccessController.doPrivileged(action);
@@ -166,7 +196,7 @@
// Use the default factory implementation class.
if (factory == null && defaultFactory != null)
{
- factory = loadDefault(defaultFactory);
+ factory = loadDefault(defaultFactory, loader);
}
return factory;
@@ -177,11 +207,10 @@
* This configuration file is in standard java.util.Properties format and contains the
* fully qualified name of the implementation class with the key being the system property defined above.
*/
- public static Object loadFromPropertiesFile(String propertyName, String defaultFactory)
+ private static Object loadFromPropertiesFile(String propertyName, String defaultFactory, ClassLoader loader)
{
Object factory = null;
String factoryName = null;
- ClassLoader loader = SecurityActions.getContextClassLoader();
// Use the properties file "lib/jaxm.properties" in the JRE directory.
// This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
@@ -211,16 +240,15 @@
// Use the default factory implementation class.
if (factory == null && defaultFactory != null)
{
- factory = loadDefault(defaultFactory);
+ factory = loadDefault(defaultFactory, loader);
}
return factory;
}
- private static Object loadDefault(String defaultFactory)
+ private static Object loadDefault(String defaultFactory, ClassLoader loader)
{
Object factory = null;
- ClassLoader loader = SecurityActions.getContextClassLoader();
// Use the default factory implementation class.
if (defaultFactory != null)
13 years
- 1
- 0
JBossWS SVN: r14022 - api/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:05:29 -0400 (Thu, 07 Apr 2011)
New Revision: 14022
Added:
api/branches/asoldano/
Log:
Branching for working on classloading changes related to avoidind exposing ws implementation classes to user classpath on AS7
13 years
- 1
- 0
JBossWS SVN: r14021 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-07 08:40:41 -0400 (Thu, 07 Apr 2011)
New Revision: 14021
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-04-07 10:09:12 UTC (rev 14020)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-04-07 12:40:41 UTC (rev 14021)
@@ -772,9 +772,8 @@
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
<!-- EJB3 Ann driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> <!-- F VerifyError -->
<exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude> <!-- F Cannot find service endpoint target -->
- <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <!-- F java.lang.UnsupportedOperationException -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <!-- TODO: implement EJB security integration -->
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <!-- F Failed to determine resource binding value for BindingDescription -->
<!-- EAR deployment is freezing -->
@@ -784,6 +783,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
<!-- EJB3 support for @Remote views not yet implemented -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
13 years
- 1
- 0
JBossWS SVN: r14020 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-07 06:09:12 -0400 (Thu, 07 Apr 2011)
New Revision: 14020
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating EJB3 excludes - sync with AS7 upstream
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-04-07 05:04:30 UTC (rev 14019)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-04-07 10:09:12 UTC (rev 14020)
@@ -772,23 +772,17 @@
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
<!-- EJB3 Ann driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude> <!-- F ear deployment -->
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> <!-- F ear deployment -->
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> <!-- F ear deployment -->
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> <!-- F ear deployment -->
<exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> <!-- F VerifyError -->
- <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws2014/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> <!-- F cannot find WSDL -->
- <exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws2565/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <!-- F cannot find WSDL -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude> <!-- F Cannot find service endpoint target -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <!-- F java.lang.UnsupportedOperationException -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <!-- F Failed to determine resource binding value for BindingDescription -->
+ <!-- EAR deployment is freezing -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
<!-- EJB3 support for @Remote views not yet implemented -->
<exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
@@ -800,6 +794,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2182/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2937/**</exclude>
13 years
- 1
- 0
JBossWS SVN: r14019 - in stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests: scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-07 01:04:30 -0400 (Thu, 07 Apr 2011)
New Revision: 14019
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-6267] test case
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-07 05:02:25 UTC (rev 14018)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-07 05:04:30 UTC (rev 14019)
@@ -741,6 +741,14 @@
<include name="wsse.keystore" />
</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-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2011-04-06 08:36:00 UTC (rev 14013)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -1,31 +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.jbws3250;
-
-import javax.jws.WebService;
-
-@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3250")
-public interface Endpoint
-{
- public MTOMResponse echo(MTOMRequest message);
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java (from rev 14013, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -0,0 +1,31 @@
+/*
+ * 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.jbws3250;
+
+import javax.jws.WebService;
+
+@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3250")
+public interface Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message);
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2011-04-06 08:36:00 UTC (rev 14013)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -1,46 +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.jbws3250;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.BindingType;
-
-
-@WebService(
- name = "TestEndpoint",
- targetNamespace = "http://ws.jboss.org/jbws3250",
- serviceName = "TestEndpointService",
- endpointInterface = "org.jboss.test.ws.jaxws.jbws3250.Endpoint")
-@SOAPBinding(style = SOAPBinding.Style.RPC,
- use = SOAPBinding.Use.LITERAL)
-@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.setContent(message.getContent());
- response.setResponse("Response for requestID:" + message.getId());
- return response;
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java (from rev 14013, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -0,0 +1,46 @@
+/*
+ * 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.jbws3250;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+
+
+@WebService(
+ name = "TestEndpoint",
+ targetNamespace = "http://ws.jboss.org/jbws3250",
+ serviceName = "TestEndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3250.Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC,
+ use = SOAPBinding.Use.LITERAL)
+@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.setContent(message.getContent());
+ response.setResponse("Response for requestID:" + message.getId());
+ return response;
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2011-04-06 08:36:00 UTC (rev 14013)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -1,69 +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.jbws3250;
-
-import java.net.URL;
-
-import javax.activation.DataHandler;
-import javax.activation.URLDataSource;
-import javax.xml.namespace.QName;
-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.common.IOUtils;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-public class JBWS3250TestCase extends JBossWSTest
-{
- private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250";
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war");
- }
-
- public void testMtomSawpFile() throws Exception
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName serviceName = new QName("http://ws.jboss.org/jbws3250", "TestEndpointService");
- Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
- SOAPBinding binding =(SOAPBinding)((BindingProvider)port).getBinding();
- binding.setMTOMEnabled(true);
- URL url = JBossWSTestHelper.getResourceURL("jaxws/jbws3250/wsf.png");
- URLDataSource urlDatasource = new URLDataSource(url);
- javax.activation.DataHandler dh = new DataHandler(urlDatasource);
- MTOMRequest request = new MTOMRequest();
- request.setContent(dh);
- request.setId("largeSize_mtom_request");
- MTOMResponse mtomResponse = port.echo(request);
- Assert.assertEquals("Response for requestID:largeSize_mtom_request", mtomResponse.getResponse());
- byte[] responseBytes = IOUtils.convertToBytes(mtomResponse.getContent());
- Assert.assertTrue(responseBytes.length > 65536);
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java (from rev 14013, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -0,0 +1,69 @@
+/*
+ * 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.jbws3250;
+
+import java.net.URL;
+
+import javax.activation.DataHandler;
+import javax.activation.URLDataSource;
+import javax.xml.namespace.QName;
+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.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBWS3250TestCase extends JBossWSTest
+{
+ private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war");
+ }
+
+ public void testMtomSawpFile() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws3250", "TestEndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ SOAPBinding binding =(SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ URL url = JBossWSTestHelper.getResourceURL("jaxws/jbws3250/wsf.png");
+ URLDataSource urlDatasource = new URLDataSource(url);
+ javax.activation.DataHandler dh = new DataHandler(urlDatasource);
+ MTOMRequest request = new MTOMRequest();
+ request.setContent(dh);
+ request.setId("largeSize_mtom_request");
+ MTOMResponse mtomResponse = port.echo(request);
+ Assert.assertEquals("Response for requestID:largeSize_mtom_request", mtomResponse.getResponse());
+ byte[] responseBytes = IOUtils.convertToBytes(mtomResponse.getContent());
+ Assert.assertTrue(responseBytes.length > 65536);
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2011-04-06 08:36:00 UTC (rev 14013)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -1,54 +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.jbws3250;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlMimeType;
-
-public class MTOMRequest
-{
- private DataHandler content;
-
- private String id;
-
- @XmlMimeType("*/*")
- public DataHandler getContent()
- {
- return content;
- }
-
- public void setContent(DataHandler content)
- {
- this.content = content;
- }
-
- 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/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java (from rev 14013, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -0,0 +1,54 @@
+/*
+ * 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.jbws3250;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class MTOMRequest
+{
+ private DataHandler content;
+
+ private String id;
+
+ @XmlMimeType("*/*")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+
+ 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/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2011-04-06 08:36:00 UTC (rev 14013)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -1,53 +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.jbws3250;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlMimeType;
-
-public class MTOMResponse
-{
- private DataHandler content;
-
- private String response;
-
- @XmlMimeType("*/*")
- public DataHandler getContent()
- {
- return content;
- }
-
- public void setContent(DataHandler content)
- {
- this.content = content;
- }
-
- public String getResponse()
- {
- return response;
- }
-
- public void setResponse(String res)
- {
- this.response = res;
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java (from rev 14013, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2011-04-07 05:04:30 UTC (rev 14019)
@@ -0,0 +1,53 @@
+/*
+ * 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.jbws3250;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class MTOMResponse
+{
+ private DataHandler content;
+
+ private String response;
+
+ @XmlMimeType("*/*")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+
+ public String getResponse()
+ {
+ return response;
+ }
+
+ public void setResponse(String res)
+ {
+ this.response = res;
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2011-04-06 08:36:00 UTC (rev 14013)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2011-04-07 05:04:30 UTC (rev 14019)
@@ -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.jbws3250.EndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml (from rev 14013, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2011-04-07 05:04:30 UTC (rev 14019)
@@ -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.jbws3250.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
===================================================================
(Binary files differ)
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png (from rev 14013, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png)
===================================================================
(Binary files differ)
13 years
- 1
- 0
JBossWS SVN: r14018 - in stack/native/branches/jbossws-native-3.1.2/modules/core: src/main/java/org/jboss/ws/core/jaxrpc/handler and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-07 01:02:25 -0400 (Thu, 07 Apr 2011)
New Revision: 14018
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBPAPP-6267] Clean up swap file after response message is created
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/trunk/modules/core:12502,13992,14011
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-06 17:10:02 UTC (rev 14017)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-07 05:02:25 UTC (rev 14018)
@@ -85,7 +85,6 @@
public static CommonMessageContext processPivot(CommonMessageContext requestContext)
{
log.debug("Begin response processing");
- cleanupAttachments(requestContext);
return requestContext;
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-06 17:10:02 UTC (rev 14017)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-07 05:02:25 UTC (rev 14018)
@@ -207,8 +207,10 @@
HandlerType[] handlerType = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST };
HandlerType[] faultType = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST };
+
// Associate a message context with the current thread
CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
+ CommonMessageContext reqMsgContext = msgContext;
MessageContextAssociation.pushMessageContext(msgContext);
try
{
@@ -278,6 +280,8 @@
}
finally
{
+ //cleanup attachment if there is any
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
closeHandlerChain(portName, handlerType[2]);
closeHandlerChain(portName, handlerType[1]);
closeHandlerChain(portName, handlerType[0]);
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-06 17:10:02 UTC (rev 14017)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-07 05:02:25 UTC (rev 14018)
@@ -118,7 +118,6 @@
resContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.valueOf(!outbound));
MessageContextAssociation.pushMessageContext(resContext);
- cleanupAttachments(reqContext);
return resContext;
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-06 17:10:02 UTC (rev 14017)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-07 05:02:25 UTC (rev 14018)
@@ -292,7 +292,7 @@
{
msgContext.setEndpointMetaData(sepMetaData);
MessageAbstraction resMessage = processRequest(endpoint, headerSource, invContext, inStream);
-
+ CommonMessageContext reqMsgContext = msgContext;
// Replace the message context with the response context
msgContext = MessageContextAssociation.peekMessageContext();
@@ -325,6 +325,7 @@
}
sendResponse(endpoint, outStream, isFault);
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
}
catch (Exception ex)
{
13 years
- 1
- 0
JBossWS SVN: r14017 - in spi/branches/asoldano/src/main/java/org/jboss/wsf/spi: classloading and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-06 13:10:02 -0400 (Wed, 06 Apr 2011)
New Revision: 14017
Added:
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegate.java
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
Log:
Adding servlet delegation facilities
Added: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java (rev 0)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-04-06 17:10:02 UTC (rev 14017)
@@ -0,0 +1,49 @@
+/*
+ * 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.spi.classloading;
+
+/**
+ * SPI for getting AS classloaders
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Apr-2011
+ *
+ */
+public abstract class ClassLoaderProvider
+{
+ private static ClassLoaderProvider provider = null;
+
+ public static void setDefaultProvider(ClassLoaderProvider p)
+ {
+ provider = p;
+ }
+
+ public static ClassLoaderProvider getDefaultProvider()
+ {
+ return provider;
+ }
+
+ public abstract ClassLoader getWebServiceSubsystemClassLoader();
+
+ public abstract ClassLoader getServerIntegrationClassLoader();
+
+}
Added: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegate.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegate.java (rev 0)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegate.java 2011-04-06 17:10:02 UTC (rev 14017)
@@ -0,0 +1,59 @@
+/*
+ * 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.spi.deployment;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Apr-2011
+ *
+ */
+public interface ServletDelegate
+{
+ public void init(ServletConfig servletConfig) throws ServletException;
+
+ public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException;
+
+ public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException;
+
+ public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException;
+
+ public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException;
+
+ public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException;
+
+ public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException;
+}
Added: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java (rev 0)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2011-04-06 17:10:02 UTC (rev 14017)
@@ -0,0 +1,34 @@
+/*
+ * 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.spi.deployment;
+
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Apr-2011
+ *
+ */
+public interface ServletDelegateFactory
+{
+ public ServletDelegate newServletDelegate(String delegateClassName);
+}
Added: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java (rev 0)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-04-06 17:10:02 UTC (rev 14017)
@@ -0,0 +1,144 @@
+/*
+ * 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.spi.deployment;
+
+import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ServiceLoader;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Apr-2011
+ *
+ */
+public class WSFServlet extends HttpServlet
+{
+ public static final String STACK_SERVLET_DELEGATE_CLASS = "org.jboss.wsf.spi.deployment.stackServletDelegateClass";
+
+ private ServletDelegate delegate = null;
+
+ @Override
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ delegate = getDelegate(servletConfig);
+ if (delegate != null)
+ {
+ delegate.init(servletConfig);
+ }
+ }
+
+ /**
+ * Creates a ServletDelegate instance according to the STACK_SERVLET_DELEGATE_CLASS init parameter.
+ * The class is loaded through a ServletDelegateFactory that's retrieved as follows:
+ * - if a default ClassLoaderProvider is available, the webservice subsystem classloader from it
+ * is used to lookup the factory
+ * - otherwise the current thread context classloader is used to lookup the factory.
+ *
+ * @param servletConfig
+ * @return the servlet delegate
+ */
+ protected ServletDelegate getDelegate(ServletConfig servletConfig)
+ {
+ ClassLoaderProvider clProvider = ClassLoaderProvider.getDefaultProvider();
+ ClassLoader cl = (clProvider != null) ? clProvider.getWebServiceSubsystemClassLoader() : getContextClassLoader();
+ ServiceLoader<ServletDelegateFactory> sl = ServiceLoader.load(ServletDelegateFactory.class, cl);
+ ServletDelegateFactory factory = sl.iterator().next();
+ return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS));
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ if (delegate != null)
+ {
+ delegate.doPost(request, response, getServletContext());
+ }
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ if (delegate != null)
+ {
+ delegate.doGet(request, response, getServletContext());
+ }
+ }
+
+ @Override
+ protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ if (delegate != null)
+ {
+ delegate.doPut(request, response, getServletContext());
+ }
+ }
+
+ @Override
+ protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ if (delegate != null)
+ {
+ delegate.doDelete(request, response, getServletContext());
+ }
+ }
+
+ @Override
+ protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ if (delegate != null)
+ {
+ delegate.doHead(request, response, getServletContext());
+ }
+ }
+
+ @Override
+ public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ if (delegate != null)
+ {
+ delegate.service(request, response, getServletContext());
+ }
+ }
+
+ static ClassLoader getContextClassLoader() {
+ if (System.getSecurityManager() == null) {
+ return Thread.currentThread().getContextClassLoader();
+ } else {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+}
13 years
- 1
- 0
JBossWS SVN: r14016 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-06 13:06:53 -0400 (Wed, 06 Apr 2011)
New Revision: 14016
Added:
spi/branches/asoldano/
Log:
Branching for working on classloading changes related to avoidind exposing ws implementation classes to user classpath on AS7
13 years
- 1
- 0
JBossWS SVN: r14015 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules: core/src/main/java/org/jboss/ws/core/jaxws/client and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-04-06 07:20:38 -0400 (Wed, 06 Apr 2011)
New Revision: 14015
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-6228]:Clean up swap file after response message is generated
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-06 09:10:53 UTC (rev 14014)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -85,7 +85,6 @@
public static CommonMessageContext processPivot(CommonMessageContext requestContext)
{
log.debug("Begin response processing");
- cleanupAttachments(requestContext);
return requestContext;
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-06 09:10:53 UTC (rev 14014)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -209,6 +209,7 @@
// Associate a message context with the current thread
CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
+ CommonMessageContext reqMsgContext = msgContext;
MessageContextAssociation.pushMessageContext(msgContext);
try
{
@@ -224,6 +225,7 @@
msgContext.put(MessageContextJAXWS.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE);
QName portName = epMetaData.getPortName();
+
try
{
// Call the request handlers
@@ -278,6 +280,8 @@
}
finally
{
+ //cleanup attachment if there is any
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
closeHandlerChain(portName, handlerType[2]);
closeHandlerChain(portName, handlerType[1]);
closeHandlerChain(portName, handlerType[0]);
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-06 09:10:53 UTC (rev 14014)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -118,7 +118,6 @@
resContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.valueOf(!outbound));
MessageContextAssociation.pushMessageContext(resContext);
- cleanupAttachments(reqContext);
return resContext;
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-06 09:10:53 UTC (rev 14014)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -291,6 +291,8 @@
{
msgContext.setEndpointMetaData(sepMetaData);
MessageAbstraction resMessage = processRequest(endpoint, headerSource, invContext, inStream);
+
+ CommonMessageContext reqMsgContext = msgContext;
// Replace the message context with the response context
msgContext = MessageContextAssociation.peekMessageContext();
@@ -324,6 +326,8 @@
}
sendResponse(endpoint, outStream, isFault);
+
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
}
catch (Exception ex)
{
@@ -451,7 +455,7 @@
// Associate current message with message context
msgContext.setMessageAbstraction(reqMessage);
-
+
// debug the incomming message
MessageTrace.traceMessage("Incoming Request Message", reqMessage);
@@ -473,8 +477,7 @@
// Get the response message
MessageAbstraction resMessage = msgContext.getMessageAbstraction();
if (resMessage != null)
- postProcessResponse(headerSource, resMessage);
-
+ postProcessResponse(headerSource, resMessage);
return resMessage;
}
catch (Exception ex)
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-06 09:10:53 UTC (rev 14014)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-06 11:20:38 UTC (rev 14015)
@@ -570,9 +570,17 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2698/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
+ </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-webserviceref -->
+ <!-- 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"/>
Added: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -0,0 +1,31 @@
+/*
+ * 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.jbws3250;
+
+import javax.jws.WebService;
+
+@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3250")
+public interface Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message);
+
+}
Added: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -0,0 +1,46 @@
+/*
+ * 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.jbws3250;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+
+
+@WebService(
+ name = "TestEndpoint",
+ targetNamespace = "http://ws.jboss.org/jbws3250",
+ serviceName = "TestEndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3250.Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC,
+ use = SOAPBinding.Use.LITERAL)
+@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.setContent(message.getContent());
+ response.setResponse("Response for requestID:" + message.getId());
+ return response;
+ }
+}
Added: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -0,0 +1,69 @@
+/*
+ * 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.jbws3250;
+
+import java.net.URL;
+
+import javax.activation.DataHandler;
+import javax.activation.URLDataSource;
+import javax.xml.namespace.QName;
+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.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBWS3250TestCase extends JBossWSTest
+{
+ private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war");
+ }
+
+ public void testMtomSawpFile() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws3250", "TestEndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ SOAPBinding binding =(SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ URL url = new JBossWSTestHelper().getResourceURL("jaxws/jbws3250/wsf.png");
+ URLDataSource urlDatasource = new URLDataSource(url);
+ javax.activation.DataHandler dh = new DataHandler(urlDatasource);
+ MTOMRequest request = new MTOMRequest();
+ request.setContent(dh);
+ request.setId("largeSize_mtom_request");
+ MTOMResponse mtomResponse = port.echo(request);
+ Assert.assertEquals("Response for requestID:largeSize_mtom_request", mtomResponse.getResponse());
+ byte[] responseBytes = IOUtils.convertToBytes(mtomResponse.getContent());
+ Assert.assertTrue(responseBytes.length > 65536);
+ }
+
+}
Added: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -0,0 +1,54 @@
+/*
+ * 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.jbws3250;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class MTOMRequest
+{
+ private DataHandler content;
+
+ private String id;
+
+ @XmlMimeType("*/*")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+}
\ No newline at end of file
Added: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2011-04-06 11:20:38 UTC (rev 14015)
@@ -0,0 +1,53 @@
+/*
+ * 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.jbws3250;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class MTOMResponse
+{
+ private DataHandler content;
+
+ private String response;
+
+ @XmlMimeType("*/*")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+
+ public String getResponse()
+ {
+ return response;
+ }
+
+ public void setResponse(String res)
+ {
+ this.response = res;
+ }
+}
Added: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2011-04-06 11:20:38 UTC (rev 14015)
@@ -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.jbws3250.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
===================================================================
(Binary files differ)
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years
- 1
- 0