JBossWS SVN: r17797 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-07-18 01:50:16 -0400 (Thu, 18 Jul 2013)
New Revision: 17797
Modified:
stack/cxf/trunk/pom.xml
Log:
Update to cxf 2.7.6
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-07-17 16:05:58 UTC (rev 17796)
+++ stack/cxf/trunk/pom.xml 2013-07-18 05:50:16 UTC (rev 17797)
@@ -72,7 +72,7 @@
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Alpha3-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.7.6-SNAPSHOT</cxf.version>
+ <cxf.version>2.7.6</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
11 years, 5 months
JBossWS SVN: r17796 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-17 12:05:58 -0400 (Wed, 17 Jul 2013)
New Revision: 17796
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
Adding privileged block for getting TCCL
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2013-07-17 16:01:22 UTC (rev 17795)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2013-07-17 16:05:58 UTC (rev 17796)
@@ -26,6 +26,8 @@
import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -235,7 +237,7 @@
throw MESSAGES.cannotFindFile(e, mappingFile);
}
} else {
- mappingURL = Thread.currentThread().getContextClassLoader().getResource(mappingFile);
+ mappingURL = getContextClassLoader().getResource(mappingFile);
}
}
return mappingURL;
@@ -348,7 +350,7 @@
throw MESSAGES.cannotFindFile(e, wsdlOverride);
}
} else {
- wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlOverride);
+ wsdlLocation = getContextClassLoader().getResource(wsdlOverride);
}
}
}
@@ -371,7 +373,7 @@
throw MESSAGES.cannotFindFile(e, wsdlFile);
}
} else {
- wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlFile);
+ wsdlLocation = getContextClassLoader().getResource(wsdlFile);
}
}
}
@@ -428,6 +430,24 @@
this.handlerChain = handlerChain;
}
+ private 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();
+ }
+ });
+ }
+ }
+
public String toString()
{
StringBuilder str = new StringBuilder();
11 years, 5 months
JBossWS SVN: r17795 - common/trunk/src/main/java/org/jboss/ws/common.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-17 12:01:22 -0400 (Wed, 17 Jul 2013)
New Revision: 17795
Modified:
common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
Log:
Adding privileged block for getting TCCL
Modified: common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2013-07-17 15:58:01 UTC (rev 17794)
+++ common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2013-07-17 16:01:22 UTC (rev 17795)
@@ -31,6 +31,8 @@
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.HashMap;
import java.util.HashSet;
@@ -135,7 +137,7 @@
public static Class<?> loadJavaType(String typeName, ClassLoader classLoader) throws ClassNotFoundException
{
if (classLoader == null)
- classLoader = Thread.currentThread().getContextClassLoader();
+ classLoader = getContextClassLoader();
Class<?> javaType = primitiveNames.get(typeName);
if (javaType == null)
@@ -146,6 +148,24 @@
return javaType;
}
+
+ private 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();
+ }
+ });
+ }
+ }
/**
* True if the given type name is the source notation of a primitive or array of which.
11 years, 5 months
JBossWS SVN: r17794 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-17 11:58:01 -0400 (Wed, 17 Jul 2013)
New Revision: 17794
Added:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/SecurityActions.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/SecurityActions.java
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
Log:
Adding a bunch of privileged blocks for getting/setting TCCL
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2013-07-17 15:00:13 UTC (rev 17793)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2013-07-17 15:58:01 UTC (rev 17794)
@@ -47,7 +47,6 @@
* @since 19-Aug-2010
*
*/
-@SuppressWarnings("restriction")
public class HttpServerDestination extends JAXWSHttpSpiDestination
{
static final Logger LOG = LogUtils.getL7dLogger(HttpServerDestination.class);
@@ -121,7 +120,7 @@
{
throw new Fault(e);
}
- engine.addHandler(addr, new Handler(this, Thread.currentThread().getContextClassLoader()));
+ engine.addHandler(addr, new Handler(this, SecurityActions.getContextClassLoader()));
}
/**
@@ -147,10 +146,10 @@
@Override
public void handle(HttpExchange ex) throws IOException
{
- ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
try
{
- Thread.currentThread().setContextClassLoader(this.classLoader);
+ SecurityActions.setContextClassLoader(this.classLoader);
this.handle(new HttpExchangeDelegate(ex));
}
catch (Exception e)
@@ -167,7 +166,7 @@
}
finally
{
- Thread.currentThread().setContextClassLoader(origClassLoader);
+ SecurityActions.setContextClassLoader(origClassLoader);
}
}
}
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2013-07-17 15:00:13 UTC (rev 17793)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2013-07-17 15:58:01 UTC (rev 17794)
@@ -97,7 +97,9 @@
public synchronized HttpServerEngine createHttpServerEngine(String host, int port, String protocol)
throws IOException
{
- LOG.fine("Creating HttpServer Engine for port " + port + ".");
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Creating HttpServer Engine for port " + port + ".");
+ }
HttpServerEngine ref = null;
synchronized(portMap)
{
@@ -127,7 +129,9 @@
HttpServerEngine ref = portMap.remove(port);
if (ref != null)
{
- LOG.fine("Stopping HttpServer Engine on port " + port + ".");
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Stopping HttpServer Engine on port " + port + ".");
+ }
try
{
ref.stop();
Added: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/SecurityActions.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/SecurityActions.java (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/SecurityActions.java 2013-07-17 15:58:01 UTC (rev 17794)
@@ -0,0 +1,82 @@
+/*
+ * 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.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 22-Feb-2011
+ *
+ */
+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: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2013-07-17 15:00:13 UTC (rev 17793)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2013-07-17 15:58:01 UTC (rev 17794)
@@ -120,18 +120,18 @@
}
catch (BeansException ex)
{
- ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader contextLoader = SecurityActions.getContextClassLoader();
if (contextLoader != BusApplicationContext.class.getClassLoader())
{
Loggers.ROOT_LOGGER.appContextCreationFailedWillTryWithNewTCCL(contextLoader, BusApplicationContext.class.getClassLoader(), ex);
- Thread.currentThread().setContextClassLoader(BusApplicationContext.class.getClassLoader());
+ SecurityActions.setContextClassLoader(BusApplicationContext.class.getClassLoader());
try
{
return new BusApplicationContext(cfgFiles, includeDefaults, getApplicationContext());
}
finally
{
- Thread.currentThread().setContextClassLoader(contextLoader);
+ SecurityActions.setContextClassLoader(contextLoader);
}
}
else
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2013-07-17 15:00:13 UTC (rev 17793)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2013-07-17 15:58:01 UTC (rev 17794)
@@ -25,6 +25,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -121,11 +123,30 @@
{
if (className != null)
{
- return Thread.currentThread().getContextClassLoader().loadClass(className);
+ return getContextClassLoader().loadClass(className);
}
return null;
}
+
+ 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();
+ }
+ });
+ }
+ }
private String getServiceClassName(final UnifiedServiceRefMetaData serviceRefMD)
{
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2013-07-17 15:00:13 UTC (rev 17793)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2013-07-17 15:58:01 UTC (rev 17794)
@@ -118,10 +118,10 @@
{
// Swap the context classloader
// The '--classpath' switch might provide an URLClassLoader
- ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader oldLoader = SecurityActions.getContextClassLoader();
if (loader != null)
- Thread.currentThread().setContextClassLoader(loader);
+ SecurityActions.setContextClassLoader(loader);
try
{
@@ -213,7 +213,7 @@
}
finally
{
- Thread.currentThread().setContextClassLoader(oldLoader);
+ SecurityActions.setContextClassLoader(oldLoader);
}
}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/SecurityActions.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/SecurityActions.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/SecurityActions.java 2013-07-17 15:58:01 UTC (rev 17794)
@@ -0,0 +1,82 @@
+/*
+ * 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.tools;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 22-Feb-2011
+ *
+ */
+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;
+ }
+ });
+ }
+ }
+
+}
11 years, 5 months
JBossWS SVN: r17793 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-17 11:00:13 -0400 (Wed, 17 Jul 2013)
New Revision: 17793
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Enabling CXF-5116 test which should be passing with 2.7.6
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-17 14:57:53 UTC (rev 17792)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-17 15:00:13 UTC (rev 17793)
@@ -660,9 +660,6 @@
<!--# [JBWS-3560] fastinfoset module is required in as712 -->
<exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
- <!--# [CXF-5116] DelegatingInputStream created in AbstractHTTPDestination is cached into wrong Message instance -->
- <exclude>org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase*</exclude>
-
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
@@ -730,9 +727,6 @@
<!--# [JBWS-3560] fastinfoset module is required in as713 -->
<exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
- <!--# [CXF-5116] DelegatingInputStream created in AbstractHTTPDestination is cached into wrong Message instance -->
- <exclude>org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase*</exclude>
-
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
@@ -797,9 +791,6 @@
<!--# [JBWS-3560] fastinfoset module is required in as720 -->
<exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
- <!--# [CXF-5116] DelegatingInputStream created in AbstractHTTPDestination is cached into wrong Message instance -->
- <exclude>org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase*</exclude>
-
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
11 years, 5 months
JBossWS SVN: r17792 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-17 10:57:53 -0400 (Wed, 17 Jul 2013)
New Revision: 17792
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3566] Moving to CXF 2.7.6-SNAPSHOT
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-07-17 09:25:43 UTC (rev 17791)
+++ stack/cxf/trunk/pom.xml 2013-07-17 14:57:53 UTC (rev 17792)
@@ -72,7 +72,7 @@
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Alpha3-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.7.5</cxf.version>
+ <cxf.version>2.7.6-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
@@ -104,7 +104,7 @@
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.5</xmlsec.version>
- <wss4j.version>1.6.10</wss4j.version>
+ <wss4j.version>1.6.11</wss4j.version>
<wstx.version>4.2.0</wstx.version>
<spring.version>3.0.7.RELEASE</spring.version>
</properties>
11 years, 5 months
JBossWS SVN: r17791 - thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-07-17 05:25:43 -0400 (Wed, 17 Jul 2013)
New Revision: 17791
Modified:
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
Log:
[BZ-984470] Also fixing JAXWS 2.2 HTTP SPI destination impl
Modified: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java 2013-07-16 14:18:05 UTC (rev 17790)
+++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java 2013-07-17 09:25:43 UTC (rev 17791)
@@ -135,12 +135,12 @@
LOG.fine("Service http request on thread: " + Thread.currentThread());
}
Message inMessage = new MessageImpl();
+ ExchangeImpl exchange = new ExchangeImpl();
+ exchange.setInMessage(inMessage);
setupMessage(inMessage, null, req, resp);
((MessageImpl)inMessage).setDestination(this);
- ExchangeImpl exchange = new ExchangeImpl();
- exchange.setInMessage(inMessage);
exchange.setSession(new HTTPSession(req));
try {
11 years, 5 months
JBossWS SVN: r17790 - container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/deployers.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-16 10:18:05 -0400 (Tue, 16 Jul 2013)
New Revision: 17790
Modified:
container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
Log:
[JBWS-3660] Always stop endpoint through lifecycle handler
Modified: container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
===================================================================
--- container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 14:17:41 UTC (rev 17789)
+++ container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 14:18:05 UTC (rev 17790)
@@ -55,16 +55,17 @@
@Override
public void stop(Deployment dep)
{
- if (stopServices) {
- final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class);
- for (final Endpoint ep : dep.getService().getEndpoints()) {
+ for (final Endpoint ep : dep.getService().getEndpoints()) {
+ if (ep.getLifecycleHandler() != null) {
+ ep.getLifecycleHandler().stop(ep);
+ }
+ if (stopServices) {
+ final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class);
LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false);
if (lifecycleHandler != null)
lifecycleHandler.stop(ep);
EndpointService.uninstall(ep, unit);
}
- } else {
- super.stop(dep);
}
}
11 years, 5 months
JBossWS SVN: r17789 - container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-16 10:17:41 -0400 (Tue, 16 Jul 2013)
New Revision: 17789
Modified:
container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
Log:
[JBWS-3659] Removing JBWS-3441 hack and setting InvocationHandler using an additional DA
Modified: container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
===================================================================
--- container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-07-16 14:13:42 UTC (rev 17788)
+++ container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-07-16 14:17:41 UTC (rev 17789)
@@ -52,6 +52,9 @@
import org.jboss.metadata.web.spec.ServletMappingMetaData;
import org.jboss.msc.service.ServiceTarget;
import org.jboss.ws.common.deployment.DeploymentAspectManagerImpl;
+import org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
+import org.jboss.ws.common.invocation.InvocationHandlerJAXWS;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -73,6 +76,7 @@
private Host host;
private boolean runningInService = false;
+ private static List<DeploymentAspect> publisherDepAspects = null;
private static List<DeploymentAspect> depAspects = null;
public EndpointPublisherImpl(Host host) {
@@ -241,28 +245,64 @@
}
private List<DeploymentAspect> getDeploymentAspects() {
- return runningInService ? DeploymentAspectsProvider.getSortedDeploymentAspects() : getPublisherDeploymentAspects();
+ return runningInService ? getReplacedDeploymentAspects() : getPublisherDeploymentAspects();
}
- private static synchronized List<DeploymentAspect> getPublisherDeploymentAspects() {
+ private static synchronized List<DeploymentAspect> getReplacedDeploymentAspects() {
if (depAspects == null) {
depAspects = new LinkedList<DeploymentAspect>();
- final List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects();
+ List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects();
+ for (DeploymentAspect aspect : serverAspects) {
+ if(aspect instanceof EndpointHandlerDeploymentAspect) {
+ depAspects.add(aspect);
+ //add another aspect to set InvocationHandlerJAXWS to each endpoint
+ ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect();
+ handlerAspect.setForJaxRpc(false);
+ depAspects.add(handlerAspect);
+ } else {
+ depAspects.add(aspect);
+ }
+ }
+ }
+ return depAspects;
+ }
+
+ private static synchronized List<DeploymentAspect> getPublisherDeploymentAspects() {
+ if (publisherDepAspects == null) {
+ publisherDepAspects = new LinkedList<DeploymentAspect>();
//copy to replace the EndpointServiceDeploymentAspect
+ List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects();
for (DeploymentAspect aspect : serverAspects) {
if (aspect instanceof EndpointServiceDeploymentAspect) {
final EndpointServiceDeploymentAspect a = (EndpointServiceDeploymentAspect)aspect;
EndpointServiceDeploymentAspect clone = (EndpointServiceDeploymentAspect)(a.clone());
clone.setStopServices(true);
- depAspects.add(clone);
+ publisherDepAspects.add(clone);
+ } else if(aspect instanceof EndpointHandlerDeploymentAspect) {
+ publisherDepAspects.add(aspect);
+ //add another aspect to set InvocationHandlerJAXWS to each endpoint
+ ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect();
+ handlerAspect.setForJaxRpc(false);
+ publisherDepAspects.add(handlerAspect);
} else {
- depAspects.add(aspect);
+ publisherDepAspects.add(aspect);
}
}
}
- return depAspects;
+ return publisherDepAspects;
}
+ static class ForceJAXWSInvocationHandlerDeploymentAspect extends AbstractDeploymentAspect {
+ public ForceJAXWSInvocationHandlerDeploymentAspect() {
+ }
+ @Override
+ public void start(final Deployment dep) {
+ for (final Endpoint ep : dep.getService().getEndpoints()) {
+ ep.setInvocationHandler(new InvocationHandlerJAXWS());
+ }
+ }
+ }
+
private static class LocalInstanceManager implements InstanceManager {
LocalInstanceManager() {
}
11 years, 5 months
JBossWS SVN: r17788 - container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-16 10:13:42 -0400 (Tue, 16 Jul 2013)
New Revision: 17788
Modified:
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
Log:
[JBWS-3660] Always stop endpoint through lifecycle handler
Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
===================================================================
--- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 14:13:22 UTC (rev 17787)
+++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 14:13:42 UTC (rev 17788)
@@ -55,16 +55,17 @@
@Override
public void stop(Deployment dep)
{
- if (stopServices) {
- final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class);
- for (final Endpoint ep : dep.getService().getEndpoints()) {
+ for (final Endpoint ep : dep.getService().getEndpoints()) {
+ if (ep.getLifecycleHandler() != null) {
+ ep.getLifecycleHandler().stop(ep);
+ }
+ if (stopServices) {
+ final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class);
LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false);
if (lifecycleHandler != null)
lifecycleHandler.stop(ep);
EndpointService.uninstall(ep, unit);
}
- } else {
- super.stop(dep);
}
}
11 years, 5 months