[jbossws-commits] JBossWS SVN: r13956 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-03-29 12:58:17 -0400 (Tue, 29 Mar 2011)
New Revision: 13956

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
Log:
[JBWS-3247] Fixing testcase to run on AS7 (due to JBWS-3223)


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java	2011-03-29 16:12:23 UTC (rev 13955)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java	2011-03-29 16:58:17 UTC (rev 13956)
@@ -23,29 +23,29 @@
 
 import javax.jws.WebService;
 
-
- at WebService
-(
-   serviceName = "HelloWorldService",
-   endpointInterface = "org.jboss.test.ws.jaxws.cxf.endpoint.HelloWorld",
-   targetNamespace = "http://org.jboss.ws/jaxws/cxf/endpoint"
-)
+ at WebService(serviceName = "HelloWorldService", endpointInterface = "org.jboss.test.ws.jaxws.cxf.endpoint.HelloWorld", targetNamespace = "http://org.jboss.ws/jaxws/cxf/endpoint")
 public class HelloWorldImpl implements HelloWorld
 {
-    private ClassLoader _deploymentClassLoader;
+   private ClassLoader _deploymentClassLoader;
 
-    public HelloWorldImpl(ClassLoader classloader)
-    {
-        _deploymentClassLoader = classloader;
-    }
+   public HelloWorldImpl(ClassLoader classloader)
+   {
+      _deploymentClassLoader = classloader;
+   }
 
-    public String getClassLoader()
-    {
-        return Thread.currentThread().getContextClassLoader().toString();
-    }
+   public String getClassLoader()
+   {
+      ClassLoader cl = Thread.currentThread().getContextClassLoader();
+      //JBWS-3223
+      //use check on class to avoid dependency declaration in MANIFEST for AS7
+      if (cl.getClass().getName().equals("org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader")) {
+         cl = cl.getParent();
+      }
+      return cl.toString() + cl.hashCode();
+   }
 
-    public String getDeploymentClassLoader()
-    {
-        return _deploymentClassLoader.toString();
-    }
+   public String getDeploymentClassLoader()
+   {
+      return _deploymentClassLoader.toString() + _deploymentClassLoader.hashCode();
+   }
 }