Author: hughesj
Date: Tue Jul 4 07:26:56 2006
New Revision: 419019
URL: http://svn.apache.org/viewvc?rev=419019&view=rev
Log:
Merged with trunk r419005
Added:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLFactory.java
- copied unchanged from r419005,
incubator/woden/java/src/org/apache/woden/internal/OMWSDLFactory.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
- copied, changed from r419005,
incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/
- copied from r419005,
incubator/woden/java/src/org/apache/woden/internal/util/om/
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/OMUtils.java
- copied unchanged from r419005,
incubator/woden/java/src/org/apache/woden/internal/util/om/OMUtils.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/QNameUtils.java
- copied unchanged from r419005,
incubator/woden/java/src/org/apache/woden/internal/util/om/QNameUtils.java
Modified:
incubator/woden/branches/WODEN-40/.classpath
incubator/woden/branches/WODEN-40/build.properties
incubator/woden/branches/WODEN-40/build.xml
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLFactory.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java
Modified: incubator/woden/branches/WODEN-40/.classpath
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/.classpath?rev=419019&r1=419018&r2=419019&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/.classpath (original)
+++ incubator/woden/branches/WODEN-40/.classpath Tue Jul 4 07:26:56 2006
@@ -10,5 +10,7 @@
<classpathentry kind="var"
path="ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ant.jar"/>
<classpathentry kind="lib" path="downloads/lib/XmlSchema-1.0.3.jar"/>
<classpathentry kind="lib" path="downloads/lib/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="downloads/lib/axiom-api-1.0.jar"/>
+ <classpathentry kind="lib" path="downloads/lib/stax-api-1.0.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: incubator/woden/branches/WODEN-40/build.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/build.properties?rev=419019&r1=419018&r2=419019&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/build.properties (original)
+++ incubator/woden/branches/WODEN-40/build.properties Tue Jul 4 07:26:56 2006
@@ -27,6 +27,11 @@
AntJar = ant.jar
WSDL4JURL =
http://superb-west.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.5.2.zip
WSDL4JFile = wsdl4j-bin-1.5.2.zip
+AxiomURL =
http://www.apache.org/dist/ws/commons/axiom/1_0/axiom-1.0-bin.zip
+AxiomFile = axiom-1.0-bin.zip
+AxiomJar = axiom-api-1.0.jar
+StaxURL =
http://www.ibiblio.org/maven/stax/jars/stax-api-1.0.1.jar
+StaxFile = stax-api-1.0.1.jar
! The location of the Woden build home
build.home = ${basedir}
Modified: incubator/woden/branches/WODEN-40/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/build.xml?rev=419019&r1=419018&r2=419019&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/build.xml (original)
+++ incubator/woden/branches/WODEN-40/build.xml Tue Jul 4 07:26:56 2006
@@ -71,6 +71,11 @@
<echo message="AntJar=${AntJar}" />
<echo message="WSDL4JURL=${WSDL4JURL}" />
<echo message="WSDL4JFile=${WSDL4JFile}" />
+ <echo message="AxiomURL=${AxiomURL}" />
+ <echo message="AxiomFile=${AxiomFile}" />
+ <echo message="AxiomJar=${AxiomJar}" />
+ <echo message="StaxURL=${StaxURL}" />
+ <echo message="StaxFile=${StaxFile}" />
<echo message="build.home=${build.home}" />
<echo message="version=${version}" />
<echo message="milestone=${milestone}" />
@@ -112,11 +117,17 @@
<available file="${downloads}/${XercesFile}"
property="Xerces.exists" />
<available file="${downloads}/${AntFile}" property="Ant.exists"
/>
<available file="${downloads}/${WSDL4JFile}"
property="WSDL4J.exists" />
+ <available file="${downloads}/${AxiomFile}"
property="Axiom.exists" />
+ <!-- The Stax 1.0.x API jar is only available in jar form, not
zip
+ so we download it straight into the libraryDir -->
+ <available file="${libraryDir}/${StaxFile}"
property="Stax.exists" />
<antcall target="getXmlSchema" />
<antcall target="getXerces" />
<antcall target="getAnt" />
<antcall target="getWSDL4J" />
+ <antcall target="getAxiom" />
+ <antcall target="getStax" />
<antcall target="extractXmlSchema" />
@@ -173,6 +184,22 @@
<include name="**/wsdl4j*.jar" />
</patternset>
</unzip>
+ </target>
+
+ <!-- Get the latest version of Axiom and unzip it -->
+ <target name="getAxiom" unless="Axiom.exists">
+ <get src="${AxiomURL}" dest="${downloads}/${AxiomFile}" />
+
+ <unzip src="${downloads}/${AxiomFile}" dest="${libraryDir}">
+ <patternset>
+ <include name="**/${AxiomJar}" />
+ </patternset>
+ </unzip>
+ </target>
+
+ <!-- Get the latest version of Stax API and unzip it -->
+ <target name="getStax" unless="Stax.exists">
+ <get src="${StaxURL}" dest="${libraryDir}/${StaxFile}" />
</target>
<!-- Copy the XmlSchema file to the lib dir -->
Modified:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLFactory.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLFactory.java?rev=419019&r1=419018&r2=419019&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLFactory.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLFactory.java
Tue Jul 4 07:26:56 2006
@@ -25,13 +25,13 @@
/**
- * @author [EMAIL PROTECTED]
+ * @author John Kaputin ([EMAIL PROTECTED])
*/
public class DOMWSDLFactory extends WSDLFactory {
public WSDLReader newWSDLReader() throws WSDLException {
- return (WSDLReader) new DOMWSDLReader();
+ return new DOMWSDLReader();
}
Modified:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java?rev=419019&r1=419018&r2=419019&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java
Tue Jul 4 07:26:56 2006
@@ -169,17 +169,21 @@
Object source = wsdlSource.getSource();
URI baseURI = wsdlSource.getBaseURI();
- URL url;
- try {
- url = StringUtils.getURL(null, baseURI.toString());
-
- } catch (MalformedURLException e) {
-
- String msg = getErrorReporter().getFormattedMessage(
- "WSDL502", new Object[] {null, baseURI.toString()});
- throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
+ String wsdlURL = null;
+ if(baseURI != null)
+ {
+ URL url;
+ try {
+ url = StringUtils.getURL(null, baseURI.toString());
+
+ } catch (MalformedURLException e) {
+
+ String msg = getErrorReporter().getFormattedMessage(
+ "WSDL502", new Object[] {null, baseURI.toString()});
+ throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
+ }
+ wsdlURL = url.toString();
}
- String wsdlURL = url.toString();
if(source instanceof Element) {
return readWSDL(wsdlURL, (Element)source);
Copied:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
(from r419005,
incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java)
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java?p2=incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java&p1=incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java&r1=419005&r2=419019&rev=419019&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
Tue Jul 4 07:26:56 2006
@@ -136,13 +136,13 @@
desc.setTypesElement(parseTypes(wsdlComponent, desc));
}
else if (QNameUtils.matches(Constants.Q_ELEM_INTERFACE,
wsdlComponent)){
- desc.addInterfaceElement(parseInterface(wsdlComponent, desc));
+ parseInterface(wsdlComponent, desc);
}
else if (QNameUtils.matches(Constants.Q_ELEM_BINDING,
wsdlComponent)){
- desc.addBindingElement(parseBinding(wsdlComponent, desc));
+ parseBinding(wsdlComponent, desc);
}
else if (QNameUtils.matches(Constants.Q_ELEM_SERVICE,
wsdlComponent)){
- desc.addServiceElement(parseService(wsdlComponent, desc));
+ parseService(wsdlComponent, desc);
}
//todo: Add parsing for includes & imports
else{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
