[jboss-cvs] JBossAS SVN: r61166 - branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref.

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

Author: thomas.diesler at jboss.com
Date: 2007-03-06 17:47:20 -0500 (Tue, 06 Mar 2007)
New Revision: 61166

Modified:
   branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java
Log:


Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java	2007-03-06 22:29:45 UTC (rev 61165)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java	2007-03-06 22:47:20 UTC (rev 61166)
@@ -31,7 +31,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -80,7 +79,7 @@
    // The optional JBossWS config-file
    private String configFile;
    // The optional URL of the actual WSDL to use, <wsdl-override> 
-   private URL wsdlOverride;
+   private String wsdlOverride;
    // Arbitrary proxy properties given by <call-property> 
    private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>();
 
@@ -230,21 +229,14 @@
       this.configName = configName;
    }
 
-   public URL getWsdlOverride()
+   public String getWsdlOverride()
    {
       return wsdlOverride;
    }
 
    public void setWsdlOverride(String wsdlOverride)
    {
-      try
-      {
-         this.wsdlOverride = new URL(wsdlOverride);
-      }
-      catch (MalformedURLException e)
-      {
-         throw new IllegalArgumentException("Invalid wsdl-override: " + wsdlOverride);
-      }
+      this.wsdlOverride = wsdlOverride;
    }
 
    public List<CallPropertyMetaData> getCallProperties()
@@ -271,7 +263,7 @@
    {
       this.handlerChains = handlerChains;
    }
-   
+
    public String getHandlerChain()
    {
       return handlerChain;
@@ -324,16 +316,7 @@
       configName = MetaData.getOptionalChildContent(element, "config-name");
 
       configFile = MetaData.getOptionalChildContent(element, "config-file");
-      String wsdlOverrideOption = MetaData.getOptionalChildContent(element, "wsdl-override");
-      try
-      {
-         if (wsdlOverrideOption != null)
-            wsdlOverride = new URL(wsdlOverrideOption);
-      }
-      catch (MalformedURLException e)
-      {
-         throw new IllegalStateException("Invalid WSDL override: " + wsdlOverrideOption);
-      }
+      wsdlOverride = MetaData.getOptionalChildContent(element, "wsdl-override");
 
       // Parse the port-component-ref elements
       Iterator iterator = MetaData.getChildrenByTagName(element, "port-component-ref");
@@ -366,7 +349,7 @@
          callProperties.add(new CallPropertyMetaData(name, value));
       }
    }
-   
+
    public static boolean isJ2EE14Descriptor(org.w3c.dom.Element element)
    {
       // Verify J2EE-1.4
@@ -392,7 +375,7 @@
       }
       return isValid;
    }
-   
+
    public String toXMLFragmet()
    {
       Document document = DocumentHelper.createDocument();
@@ -414,22 +397,22 @@
          root.add(handler.toXMLFragment());
       if (handlerChains != null)
          root.add(handlerChains.toXMLFragment());
-      
+      if (handlerChain != null)
+         root.addElement("handler-chain").addText(handlerChain);
+
       for (CallPropertyMetaData prop : getCallProperties())
       {
          Element propEl = root.addElement("call-property");
          propEl.addElement("prop-name").addText(prop.getPropName());
          propEl.addElement("prop-value").addText(prop.getPropValue());
       }
-      
+
       if (configName != null)
          root.addElement("config-name").addText(configName);
       if (configFile != null)
          root.addElement("config-file").addText(configFile);
-      if (handlerChain != null)
-         root.addElement("handler-chain").addText(handlerChain);
       if (wsdlOverride != null)
-         root.addElement("wsdl-override").addText(wsdlOverride.toExternalForm());
+         root.addElement("wsdl-override").addText(wsdlOverride);
       return root.asXML();
    }
 }