[jbossws-commits] JBossWS SVN: r13912 - stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.
Author: alessio.soldano(a)jboss.com
Date: 2011-03-22 06:28:39 -0400 (Tue, 22 Mar 2011)
New Revision: 13912
Modified:
stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
Log:
Restore previous TCCL configuration in BusDeploymentAspect, AS7 integration takes care of
making the jbossws/cxf stuff available in the runtimeclassloader
Modified:
stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
---
stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-03-21
19:55:21 UTC (rev 13911)
+++
stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-03-22
10:28:39 UTC (rev 13912)
@@ -71,16 +71,10 @@
String jbosswsCxfXml = contextParams == null ? null :
contextParams.get(BusHolder.PARAM_CXF_BEANS_URL);
BusHolder holder = null;
+ //set the runtime classloader (pointing to the deployment unit) to allow CXF
accessing to the classes
+ SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
if (jbosswsCxfXml != null) // Spring available
{
- //set the runtime classloader (pointing to the deployment unit) to allow CXF
accessing to the classes
- ClassLoader loader = dep.getRuntimeClassLoader();
- if (true) //can't load jbossws/cxf classes
- {
- loader = new DelegateClassLoader(origClassLoader, loader);
- }
- SecurityActions.setContextClassLoader(loader);
-
URL cxfServletURL = null;
try
{
@@ -105,8 +99,6 @@
else
//Spring not available
{
- //set the runtime classloader (pointing to the deployment unit) to allow CXF
accessing to the classes
- SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
DDBeans metadata = dep.getAttachment(DDBeans.class);
holder = new NonSpringBusHolder(metadata);
Configurer configurer =
holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),