[jboss-cvs] JBossAS SVN: r59336 - branches/Branch_4_2/server/src/main/org/jboss/webservice

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-01-04 06:03:47 -0500 (Thu, 04 Jan 2007)
New Revision: 59336

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/webservice/WebServiceClientHandler.java
Log:
Remove ws4ee handling

Modified: branches/Branch_4_2/server/src/main/org/jboss/webservice/WebServiceClientHandler.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/webservice/WebServiceClientHandler.java	2007-01-04 11:00:36 UTC (rev 59335)
+++ branches/Branch_4_2/server/src/main/org/jboss/webservice/WebServiceClientHandler.java	2007-01-04 11:03:47 UTC (rev 59336)
@@ -37,7 +37,7 @@
 import org.jboss.mx.util.ObjectNameFactory;
 
 /**
- * Abstract differences in JBoss-WS4EE and JBossWS client deployment 
+ * JBossWS client deployment over JMX 
  * 
  * @author Thomas.Diesler at jboss.org
  * @since 05-May-2004
@@ -62,23 +62,15 @@
          return;
 
       MBeanServer server = MBeanServerLocator.locateJBoss();
-      ObjectName ws4eeObjectName = ObjectNameFactory.create("jboss.ws4ee:service=ServiceClientDeployer");
-      ObjectName jbosswsObjectName = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer");
 
-      ObjectName objectName = null;
+      ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer");;
       WebServiceClientDeployment wsClientDeployment;
       try
       {
-         if (server.isRegistered(ws4eeObjectName))
+         if (server.isRegistered(objectName))
          {
-            objectName = ws4eeObjectName;
-            wsClientDeployment = (WebServiceClientDeployment)MBeanProxyExt.create(WebServiceClientDeployment.class, ws4eeObjectName, server);
+            wsClientDeployment = (WebServiceClientDeployment)MBeanProxyExt.create(WebServiceClientDeployment.class, objectName, server);
          }
-         else if (server.isRegistered(jbosswsObjectName))
-         {
-            objectName = jbosswsObjectName;
-            wsClientDeployment = (WebServiceClientDeployment)MBeanProxyExt.create(WebServiceClientDeployment.class, jbosswsObjectName, server);
-         }
          else
          {
             log.warn("No web service client deployer registered");