[jboss-svn-commits] JBossWS SVN: r598 - in branches/jbossws-1.0/src/main/java/org/jboss/ws: deployment integration/jboss metadata/config metadata/j2ee metadata/jsr109 metadata/jsr181

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

Author: heiko.braun at jboss.com
Date: 2006-07-13 08:33:18 -0400 (Thu, 13 Jul 2006)
New Revision: 598

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr181/HandlerConfigFactory.java
Log:
FIX JBWS-1073

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java	2006-07-13 11:26:52 UTC (rev 597)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java	2006-07-13 12:33:18 UTC (rev 598)
@@ -625,7 +625,7 @@
       {
          UnifiedHandlerMetaData handlerMetaData = new UnifiedHandlerMetaData();
          handlerMetaData.setHandlerName(handler.name());
-         handlerMetaData.setHandlerClass(handler.className());
+         handlerMetaData.setHandlerClass(handler.className());         
          for (InitParam initParam : handler.initParams())
          {
             UnifiedInitParamMetaData initParamMetaData = new UnifiedInitParamMetaData();

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java	2006-07-13 11:26:52 UTC (rev 597)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java	2006-07-13 12:33:18 UTC (rev 598)
@@ -70,6 +70,11 @@
          uhmd.setHandlerName(hmd.getHandlerName());
          uhmd.setHandlerClass(hmd.getHandlerClass());
 
+         for(String portName : hmd.getPortNames())
+         {
+            uhmd.addPortName(portName);   
+         }
+
          for (InitParamMetaData ipmd : hmd.getInitParams())
          {
             UnifiedInitParamMetaData uipmd = new UnifiedInitParamMetaData();

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java	2006-07-13 11:26:52 UTC (rev 597)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java	2006-07-13 12:33:18 UTC (rev 598)
@@ -201,6 +201,8 @@
          handler.addSoapHeader(navigator.resolveQName(value));
       else if (localName.equals("soap-role"))
          handler.addSoapRole(value);
+      else if(localName.equals("port-name"))
+         handler.addPortName(value);
    }
 
    /**

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java	2006-07-13 11:26:52 UTC (rev 597)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java	2006-07-13 12:33:18 UTC (rev 598)
@@ -113,6 +113,12 @@
       return array;
    }
 
+   public void addPortName(String portName)
+   {
+      if(portName != null)
+         portNames.add(portName);
+   }
+
    public String[] getPortNames()
    {
       String[] array = new String[portNames.size()];
@@ -120,6 +126,16 @@
       return array;
    }
 
+   public boolean matchesPort(String portName)
+   {
+      boolean matches = false;
+
+      if(portNames.size()>0 && portNames.contains(portName))
+         matches = true;
+
+      return matches;
+   }
+
    public String toString()
    {
       StringBuffer buffer = new StringBuffer("\nHandlerMetaData:");

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java	2006-07-13 11:26:52 UTC (rev 597)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java	2006-07-13 12:33:18 UTC (rev 598)
@@ -208,6 +208,8 @@
          handler.addSoapHeader(navigator.resolveQName(value));
       else if (localName.equals("soap-role"))
          handler.addSoapRole(value);
+      else if (localName.equals("port-name"))
+         handler.addPortName("port-name");
    }
 
    /**

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr181/HandlerConfigFactory.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr181/HandlerConfigFactory.java	2006-07-13 11:26:52 UTC (rev 597)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/jsr181/HandlerConfigFactory.java	2006-07-13 12:33:18 UTC (rev 598)
@@ -151,6 +151,8 @@
          handler.addSoapHeader(navigator.resolveQName(value));
       else if (localName.equals("soap-role"))
          handler.addSoapRole(value);
+      else if (localName.equals("port-name"))
+         handler.addPortName(value);
    }
 
    /**