[jboss-cvs] JBossAS SVN: r60595 - in branches/Branch_4_2: server/src/main/org/jboss/webservice/metadata and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2007-02-17 10:00:34 -0500 (Sat, 17 Feb 2007)
New Revision: 60595

Removed:
   branches/Branch_4_2/server/src/main/org/jboss/webservice/metadata/jaxrpcmapping/
   branches/Branch_4_2/server/src/main/org/jboss/webservice/metadata/wsdl/
Modified:
   branches/Branch_4_2/build/build-thirdparty.xml
   branches/Branch_4_2/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
Log:
wsdl4j-1.6.2, jbossws-1.2.0.CR3

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-02-17 03:51:25 UTC (rev 60594)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-02-17 15:00:34 UTC (rev 60595)
@@ -78,7 +78,7 @@
     <componentref name="hibernate-annotations" version="3.2.1.GA"/>
     <componentref name="hibernate-entitymanager" version="3.2.1.GA"/>
     <componentref name="hsqldb" version="1.8.0.2"/>
-    <componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
+    <componentref name="ibm-wsdl4j" version="1.6.2"/>
     <componentref name="jacorb" version="2.2.4jboss.patch1"/>
     <componentref name="javassist" version="3.5.0.CR1"/>
     <componentref name="jaxen" version="1.1-beta-9"/>
@@ -88,8 +88,8 @@
     <componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
     <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jbossts14" version="snapshot"/>
-    <componentref name="jboss/jbossws" version="1.2.0.CR2"/>
-    <componentref name="jboss/jbossxb" version="1.0.0.CR8"/>
+    <componentref name="jboss/jbossws" version="1.2.0.CR3"/>
+    <componentref name="jboss/jbossxb" version="snapshot"/>
     <componentref name="jboss/microcontainer" version="1.0.2"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
     <componentref name="jboss/remoting" version="2.0.0.GA"/>

Modified: branches/Branch_4_2/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java	2007-02-17 03:51:25 UTC (rev 60594)
+++ branches/Branch_4_2/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java	2007-02-17 15:00:34 UTC (rev 60595)
@@ -32,16 +32,10 @@
 import java.util.LinkedHashMap;
 import java.util.Properties;
 
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
 import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
 
 import org.jboss.deployment.DeploymentException;
 import org.jboss.metadata.MetaData;
-import org.jboss.webservice.metadata.jaxrpcmapping.JavaWsdlMapping;
-import org.jboss.webservice.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
-import org.jboss.webservice.metadata.wsdl.WSDL11DefinitionFactory;
 import org.jboss.xb.QNameBuilder;
 import org.w3c.dom.Element;
 
@@ -136,34 +130,12 @@
       return mappingURL;
    }
 
-   public JavaWsdlMapping getJavaWsdlMapping()
+   public Object getJavaWsdlMapping()
    {
-      if (javaWsdlMapping == null)
-      {
-         URL mappingURL = getJavaWsdlMappingURL();
-         if (mappingURL != null)
-         {
-            try
-            {
-               // setup the XML binding Unmarshaller
-               JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance();
-               javaWsdlMapping = mappingFactory.parse(mappingURL);
-            }
-            catch (Exception e)
-            {
-               throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + jaxrpcMappingFile, e);
-            }
-         }
-      }
-      return (JavaWsdlMapping)javaWsdlMapping;
-   }
-
-   public Object getUntypedJavaWsdlMapping()
-   {
       return javaWsdlMapping;
    }
 
-   public void setUntypedJavaWsdlMapping(Object javaWsdlMapping)
+   public void setJavaWsdlMapping(Object javaWsdlMapping)
    {
       this.javaWsdlMapping = javaWsdlMapping;
    }
@@ -243,33 +215,12 @@
       return callProperties;
    }
 
-   public Definition getWsdlDefinition()
+   public Object getWsdlDefinition()
    {
-      if (wsdlDefinition == null)
-      {
-         URL wsdlURL = getWsdlURL();
-         if (wsdlURL != null)
-         {
-            try
-            {
-               WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance();
-               wsdlDefinition = factory.parse(wsdlURL);
-            }
-            catch (WSDLException e)
-            {
-               throw new IllegalStateException("Cannot unmarshall wsdl, cause: " + e.toString());
-            }
-         }
-      }
-      return (Definition)wsdlDefinition;
-   }
-
-   public Object getUntypedWsdlDefinition()
-   {
       return wsdlDefinition;
    }
 
-   public void setUntypedWsdlDefinition(Object wsdlDefinition)
+   public void setWsdlDefinition(Object wsdlDefinition)
    {
       this.wsdlDefinition = wsdlDefinition;
    }