[jbossws-commits] JBossWS SVN: r4531 - in legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws: metadata/j2ee/serviceref and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-09-07 08:55:45 -0400 (Fri, 07 Sep 2007)
New Revision: 4531

Modified:
   legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
   legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
   legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
Log:
JBCTS-647: webservices handlerinfo test failures

Modified: legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
===================================================================
--- legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java	2007-09-07 12:54:25 UTC (rev 4530)
+++ legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java	2007-09-07 12:55:45 UTC (rev 4531)
@@ -24,12 +24,12 @@
 // $Id$
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 import javax.xml.rpc.handler.HandlerChain;
@@ -42,6 +42,7 @@
 import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
 import org.jboss.ws.metadata.umdm.ServiceMetaData;
 import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
 
 /** 
  * Provides support for the programmatic configuration of
@@ -115,7 +116,25 @@
          handler.setEndpointMetaData(epMetaData);
          handler.setHandlerClassName(info.getHandlerClass().getName());
          handler.setSoapRoles(roles);
-         
+
+         // pass the init parameters
+         ArrayList<UnifiedInitParamMetaData> params = new ArrayList<UnifiedInitParamMetaData>();
+         Iterator configkeys = info.getHandlerConfig().keySet().iterator();
+         while(configkeys.hasNext())
+         {
+            String name = (String)configkeys.next();
+            if(info.getHandlerConfig().get(name) instanceof String) // might be Object instances used internally 
+            {
+               String value = (String)info.getHandlerConfig().get(name);
+               UnifiedInitParamMetaData initParam = new UnifiedInitParamMetaData();
+               initParam.setParamName(name);
+               initParam.setParamValue(value);
+               params.add(initParam);
+            }
+         }
+
+         handler.setInitParams(params);
+
          Set<QName> headers = new HashSet<QName>();
          for (QName header : info.getHeaders())
             headers.add(header);

Modified: legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java	2007-09-07 12:54:25 UTC (rev 4530)
+++ legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java	2007-09-07 12:55:45 UTC (rev 4531)
@@ -132,7 +132,7 @@
       HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(type);
       hmd.setHandlerName(getHandlerName());
       hmd.setHandlerClassName(getHandlerClass());
-      hmd.seiInitParams(getInitParams());
+      hmd.setInitParams(getInitParams());
       hmd.setSoapHeaders(getSoapHeaders());
       hmd.setSoapRoles(getSoapRoles());
       hmd.setPortNames(getPortNames());
@@ -144,7 +144,7 @@
       HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(type);
       hmd.setHandlerName(getHandlerName());
       hmd.setHandlerClassName(getHandlerClass());
-      hmd.seiInitParams(getInitParams());
+      hmd.setInitParams(getInitParams());
       if (handlerChain != null)
       {
          hmd.setProtocolBindings(handlerChain.getProtocolBindings());

Modified: legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
===================================================================
--- legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java	2007-09-07 12:54:25 UTC (rev 4530)
+++ legacy/tags/jbossws-1.2.1.GA_CP01/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java	2007-09-07 12:55:45 UTC (rev 4531)
@@ -144,7 +144,7 @@
       return soapHeaders;
    }
 
-   public void seiInitParams(List<UnifiedInitParamMetaData> initParams)
+   public void setInitParams(List<UnifiedInitParamMetaData> initParams)
    {
       this.initParams = initParams;
    }