Author: jim.ma
Date: 2010-12-02 06:51:20 -0500 (Thu, 02 Dec 2010)
New Revision: 13380
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
Log:
[JBPAPP-5494]:Fixed CXF stack doesn't pick up cxf.xml in the classpath to create
spring bus
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-12-02
11:09:08 UTC (rev 13379)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-12-02
11:51:20 UTC (rev 13380)
@@ -66,16 +66,12 @@
@Override
public void create(Deployment dep)
{
- URL cxfURL = getCXFConfigFromClassLoader(dep);
- if (cxfURL == null)
- {
- cxfURL = getCXFConfigFromDeployment(dep);
- if (cxfURL == null)
- {
- cxfURL = generateCXFConfigFromDeployment(dep);
- }
- putCXFConfigToDeployment(dep, cxfURL);
- }
+ URL cxfURL = getCXFConfigFromDeployment(dep);
+ if (cxfURL == null) {
+ cxfURL = generateCXFConfigFromDeployment(dep);
+ }
+ putCXFConfigToDeployment(dep, cxfURL);
+
}
@Override
@@ -88,21 +84,6 @@
}
}
- /**
- * Looks for <b>cxf.xml</b> in classloader
- * @param dep deployment which initial classloader will be used
- * @return <b>cxf.xml URL</b> or <b>null</b> if not found
- */
- private URL getCXFConfigFromClassLoader(Deployment dep)
- {
- ClassLoader initCL = dep.getInitialClassLoader();
- URL cxfURL = initCL.getResource("cxf.xml");
- if (cxfURL != null)
- {
- log.info("CXF configuration found: " + cxfURL);
- }
- return cxfURL;
- }
/**
* Looks for <b>jbossws-cxf.xml</b> in:
Show replies by date