[jbossws-commits] JBossWS SVN: r11424 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: metadata/builder/jaxws and 1 other directories.
Author: richard.opalka(a)jboss.com
Date: 2010-01-15 11:26:15 -0500 (Fri, 15 Jan 2010)
New Revision: 11424
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
Log:
[JBWS-2810] rollback UnifiedMetaData uses thread context loader fix
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-15
16:10:16 UTC (rev 11423)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-15
16:26:15 UTC (rev 11424)
@@ -147,7 +147,7 @@
}
else
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot,
serviceClass.getClassLoader());
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
}
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-01-15
16:10:16 UTC (rev 11423)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-01-15
16:26:15 UTC (rev 11424)
@@ -66,13 +66,9 @@
*/
public class JAXWSClientMetaDataBuilder extends JAXWSMetaDataBuilder
{
+
public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL,
UnifiedVirtualFile vfsRoot)
{
- return this.buildMetaData(serviceName, wsdlURL, vfsRoot, null);
- }
-
- public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL,
UnifiedVirtualFile vfsRoot, ClassLoader classLoader)
- {
if (wsdlURL == null)
throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL);
@@ -80,7 +76,7 @@
log.debug("START buildMetaData: [service=" + serviceName +
"]");
try
{
- UnifiedMetaData wsMetaData = classLoader != null ? new UnifiedMetaData(vfsRoot,
classLoader) : new UnifiedMetaData(vfsRoot);
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-15
16:10:16 UTC (rev 11423)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-15
16:26:15 UTC (rev 11424)
@@ -78,16 +78,11 @@
public UnifiedMetaData(UnifiedVirtualFile vfsRoot)
{
- this(vfsRoot, SecurityActions.getContextClassLoader());
- }
-
- public UnifiedMetaData(UnifiedVirtualFile vfsRoot, ClassLoader classLoader)
- {
if (vfsRoot == null)
throw new IllegalArgumentException("VFS root cannot be null");
this.vfsRoot = vfsRoot;
- this.classLoader = classLoader;
+ this.classLoader = SecurityActions.getContextClassLoader();
}
public ClassLoader getClassLoader()