[jboss-cvs] JBossAS SVN: r60596 - in branches/Branch_4_0: jaxrpc/src/main/org and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Feb 17 10:57:40 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-17 10:57:40 -0500 (Sat, 17 Feb 2007)
New Revision: 60596
Removed:
branches/Branch_4_0/jaxrpc/src/main/org/jboss/
branches/Branch_4_0/server/src/main/org/jboss/webservice/metadata/jaxrpcmapping/
branches/Branch_4_0/server/src/main/org/jboss/webservice/metadata/wsdl/
Modified:
branches/Branch_4_0/build/build-distr.xml
branches/Branch_4_0/build/build-thirdparty.xml
branches/Branch_4_0/build/build.xml
branches/Branch_4_0/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
Log:
wsdl4j-1.6.2,jbossws-1.2.0.CR3
Modified: branches/Branch_4_0/build/build-distr.xml
===================================================================
--- branches/Branch_4_0/build/build-distr.xml 2007-02-17 15:00:34 UTC (rev 60595)
+++ branches/Branch_4_0/build/build-distr.xml 2007-02-17 15:57:40 UTC (rev 60596)
@@ -1468,9 +1468,9 @@
</unjar>
<!-- create deployments from thirdparty items -->
- <!-- copy the jbossws14.sar -->
+ <!-- install the jbossws14.sar -->
<mkdir dir="${install.all.deploy}/jbossws14.sar"/>
- <unjar dest="${install.all.deploy}/jbossws14.sar" src="${jboss.jbossws14.lib}/jbossws14.sar"/>
+ <unjar dest="${install.all.deploy}/jbossws14.sar" src="${jboss.jbossws14.lib}/jbossws40-jdk14.sar"/>
</target>
@@ -1595,7 +1595,7 @@
<!-- unjar the jbossws.sar -->
<mkdir dir="${install.ejb3.root}/server/default/deploy/jbossws.sar"/>
- <unjar dest="${install.ejb3.root}/server/default/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws.sar"/>
+ <unjar dest="${install.ejb3.root}/server/default/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws40.sar"/>
<delete includeEmptyDirs="true">
<fileset dir="${install.ejb3.root}/server/all/deploy">
@@ -1616,7 +1616,7 @@
<!-- unjar the jbossws.sar -->
<mkdir dir="${install.ejb3.root}/server/all/deploy/jbossws.sar"/>
- <unjar dest="${install.ejb3.root}/server/all/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws.sar"/>
+ <unjar dest="${install.ejb3.root}/server/all/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws40.sar"/>
</target>
</project>
Modified: branches/Branch_4_0/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_0/build/build-thirdparty.xml 2007-02-17 15:00:34 UTC (rev 60595)
+++ branches/Branch_4_0/build/build-thirdparty.xml 2007-02-17 15:57:40 UTC (rev 60596)
@@ -81,7 +81,7 @@
<componentref name="hibernate-annotations" version="3.2.0.GA"/>
<componentref name="hibernate-entitymanager" version="3.2.0.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"/>
@@ -92,10 +92,9 @@
<componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
<componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
- <componentref name="jboss/jbossws" version="1.0.3.SP1"/>
- <componentref name="jboss/jbossws14" version="1.0.3.SP1"/>
- <componentref name="jboss/jboss-ws4ee" version="4.0.4.SP1"/>
- <componentref name="jboss/jbossxb" version="1.0.0.CR6"/>
+ <componentref name="jboss/jbossws" version="1.2.0.CR3"/>
+ <componentref name="jboss/jbossws14" version="1.2.0.CR3"/>
+ <componentref name="jboss/jbossxb" version="1.0.0.CR9"/>
<componentref name="jboss/microcontainer" version="1.0.2"/>
<componentref name="jboss/remoting" version="1.4.3.GA"/>
<componentref name="jboss/serialization" version="1.0.3.GA"/>
@@ -119,7 +118,6 @@
<componentref name="wutka-dtdparser" version="1.2.1"/>
<componentref name="xdoclet" version="1.2b3"/>
<componentref name="xml-sax" version="2.0.x"/>
-
</build>
<synchronizeinfo/>
Modified: branches/Branch_4_0/build/build.xml
===================================================================
--- branches/Branch_4_0/build/build.xml 2007-02-17 15:00:34 UTC (rev 60595)
+++ branches/Branch_4_0/build/build.xml 2007-02-17 15:57:40 UTC (rev 60596)
@@ -715,9 +715,7 @@
<include name="hibernate-annotations.jar"/>
<include name="jboss-deployment.jar" />
<include name="jboss-j2ee.jar"/>
- <include name="jboss-jaxrpc.jar"/>
<include name="jboss-remoting.jar"/>
- <include name="jboss-saaj.jar"/>
<include name="jboss-serialization.jar"/>
<include name="jboss-xml-binding.jar"/>
<include name="jbossmqha.jar"/>
@@ -747,13 +745,13 @@
<include name="hibernate-annotations.jar"/>
<include name="jboss-deployment.jar" />
<include name="jboss-j2ee.jar"/>
- <include name="jboss-jaxrpc.jar"/>
<include name="jboss-remoting.jar"/>
- <include name="jboss-saaj.jar"/>
<include name="jboss-serialization.jar"/>
- <!-- Do not include jboss-xml-binding. Otherwise jbossws cannot be a drop in replacement.
+ <!-- Do not include, otherwise jbossws cannot be a drop in replacement.
<include name="jboss-xml-binding.jar"/>
- -->
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ -->
<include name="jbossmqha.jar"/>
<include name="jmx-connector-client-factory.jar"/>
<include name="namespace.jar"/>
Modified: branches/Branch_4_0/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java 2007-02-17 15:00:34 UTC (rev 60595)
+++ branches/Branch_4_0/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java 2007-02-17 15:57:40 UTC (rev 60596)
@@ -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;
}
More information about the jboss-cvs-commits
mailing list