Author: mmerz
Date: Fri Apr 29 13:58:18 2005
New Revision: 165337
URL: http://svn.apache.org/viewcvs?rev=165337&view=rev
Log:
Fixes the Wsdl2AJava dependency to the Axis.
Contributor: Daryoush Mehrtash
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
- copied, changed from r165335,
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java
Removed:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java?rev=165337&r1=165336&r2=165337&view=diff
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java
Fri Apr 29 13:58:18 2005
@@ -44,6 +44,7 @@
import org.apache.axis.description.ParameterDesc;
import org.apache.axis.description.ServiceDesc;
import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
+import org.apache.beehive.wsm.axis.tools.Wsdl2AJava;
import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
@@ -51,7 +52,6 @@
import org.apache.beehive.wsm.model.jsr181.Jsr181ParameterMetadataImpl;
//import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
-import org.apache.beehive.wsm.wsdl.Wsdl2AJava;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java?rev=165337&r1=165336&r2=165337&view=diff
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
Fri Apr 29 13:58:18 2005
@@ -23,7 +23,7 @@
import java.io.File;
-import org.apache.beehive.wsm.wsdl.Wsdl2AJava;
+
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Java;
@@ -70,7 +70,7 @@
public void execute() throws BuildException {
try {
-
setClassname("org.apache.beehive.wsm.jsr181.wsdl.Wsdl2AJava");
+
setClassname("org.apache.beehive.wsm.axis.tools.Wsdl2AJava");
setArgs(mWSDL.getCanonicalPath());
setArgs(mOutDir.getCanonicalPath());
super.execute();
Copied:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
(from r165335,
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java&r1=165335&r2=165337&rev=165337&view=diff
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
Fri Apr 29 13:58:18 2005
@@ -1,5 +1,5 @@
/*
- * Wsld2AJava.java
+ * AbstractWsdl2AJava.java
*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
+import java.net.MalformedURLException;
import java.util.Properties;
@@ -36,21 +37,26 @@
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.apache.xmlbeans.XmlException;
/**
* @author dmehrtas
*
*/
-public class Wsdl2AJava {
+public abstract class AbstractWsdl2AJava {
VelocityEngine ve = null;
Template template = null;
+
+ protected abstract BeehiveWsTypeMetadata getWSObjectModel(InputStream
wsdl) throws Exception;
+
+
/**
* @throws Exception
*
*/
- public Wsdl2AJava() throws Exception {
+ public AbstractWsdl2AJava() throws Exception {
super();
}
@@ -98,17 +104,9 @@
public void generateAnnotatedJavaFromWSDL(String wsdlFileName,
String baseSrcDir) throws Exception {
- InputStream wsdl = new FileInputStream(wsdlFileName);
- XmlBeanWSDLProcessor processor = new XmlBeanWSDLProcessor(wsdl);
-
-
- BeehiveWsTypeMetadata om = null;
-
- //TODO: Move this class to the axis package and uncomment the
following two lines.
- //SystemTypeLookupService lookupService = new
SystemTypeLookupService();
- //processor.getObjectModel(lookupService);
-
-
+ InputStream wsdl = new FileInputStream(wsdlFileName);
+ BeehiveWsTypeMetadata om = getWSObjectModel(wsdl);
+
String className = om.getWsName();
String packageName = "web"; // Later see if the target name
service is
// better option
@@ -133,13 +131,11 @@
generateAnnotatedJavaFromOM(om, w);
}
+
public void generateAnnotatedJavaFromWSDL(InputStream wsdl, Writer w)
throws Exception {
- XmlBeanWSDLProcessor processor = new XmlBeanWSDLProcessor(wsdl);
- BeehiveWsTypeMetadata om = null;
-// TODO THIS NEED TO BE FIXED. THE PROBLEM IS THAT THE LOOK UP NEED
-// AXISLOOK UP AND THIS PACKAGE INS IN NON_AXIS! om =
processor.getObjectModel();
+ BeehiveWsTypeMetadata om = getWSObjectModel(wsdl);
generateAnnotatedJavaFromOM(om, w);
}
@@ -161,17 +157,6 @@
w.close();
}
- public static int main(String args[]) throws Exception {
- if (args.length < 2) {
- System.out
- .println("Usage: Wsdl2AJava
<wsdlFileName> <base source dir>");
- return (-1);
- }
- Wsdl2AJava processor = new Wsdl2AJava();
- processor.init();
- processor.generateAnnotatedJavaFromWSDL(args[0], args[1]);
- return 0;
- }
}
