Author: svkrish
Date: Wed Nov 8 01:07:21 2006
New Revision: 472430
URL: http://svn.apache.org/viewvc?view=rev&rev=472430
Log:
Fixed to sync up with updates to current release of Axis2
Modified:
incubator/tuscany/branches/sca-java-M2/sca/tools/pom.xml
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
Modified: incubator/tuscany/branches/sca-java-M2/sca/tools/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/sca/tools/pom.xml?view=diff&rev=472430&r1=472429&r2=472430
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/sca/tools/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/sca/tools/pom.xml Wed Nov 8
01:07:21 2006
@@ -78,19 +78,17 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
<scope>compile</scope>
</dependency>
Modified:
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java?view=diff&rev=472430&r1=472429&r2=472430
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
Wed Nov 8 01:07:21 2006
@@ -24,10 +24,10 @@
import java.util.Map;
import java.util.Vector;
-import org.apache.axis2.wsdl.util.CommandLineOption;
-import org.apache.axis2.wsdl.util.CommandLineOptionParser;
-import org.apache.axis2.wsdl.util.Java2WSDLOptionsValidator;
import org.apache.ws.java2wsdl.Java2WSDL;
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
+import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
/**
* This is an implementation of the Java2WSDLGenerator facade. This
@@ -52,7 +52,7 @@
{
private List<WSDLGenListener> genPhaseListeners = new
Vector<WSDLGenListener>();
private GenerationParameters genParams = null;
- private Map<String, CommandLineOption> commandLineOptions = null;
+ private Map<String, Java2WSDLCommandLineOption> commandLineOptions =
null;
private TuscanyJava2WSDLBuilder java2WsdlBuilder;
private OutputStream outputStream = null;
@@ -78,7 +78,7 @@
protected boolean validateInputArgs(String[] args)
{
boolean isValid = true;
- CommandLineOptionParser parser = new
CommandLineOptionParser(args);
+ Java2WSDLCommandLineOptionParser parser = new
Java2WSDLCommandLineOptionParser(args);
if (parser.getAllOptions().size() == 0) {
Java2WSDL.printUsage();
isValid = false;
Modified:
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java?view=diff&rev=472430&r1=472429&r2=472430
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
Wed Nov 8 01:07:21 2006
@@ -20,8 +20,6 @@
import java.io.StringReader;
import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -33,32 +31,21 @@
import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaAny;
-import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
-import org.apache.ws.commons.schema.XmlSchemaChoice;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexContent;
-import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaContentProcessing;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaForm;
import org.apache.ws.commons.schema.XmlSchemaGroupBase;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObject;
import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
import org.apache.ws.commons.schema.XmlSchemaType;
import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.apache.ws.commons.schema.utils.NamespacePrefixList;
import org.apache.ws.java2wsdl.Java2WSDLUtils;
import org.codehaus.jam.JClass;
import org.codehaus.jam.JProperty;
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.XSDHelper;
@@ -159,13 +146,14 @@
}
protected QName buildSchema_JavaType(JClass javaType) throws Exception {
- QName schemaTypeName = typeTable.getComplexSchemaTypeName(javaType);
+ QName schemaTypeName = typeTable.getComplexSchemaTypeName(javaType,
this.classLoader);
if (schemaTypeName == null) {
- String simpleName = javaType.getSimpleName();
+ String simpleName = javaType.getSimpleName();
String packageName =
javaType.getContainingPackage().getQualifiedName();
- String targetNameSpace =
Java2WSDLUtils.schemaNamespaceFromPackageName(packageName)
+ String targetNameSpace =
+
Java2WSDLUtils.schemaNamespaceFromClassName(javaType.getQualifiedName(),
this.classLoader)
.toString();
XmlSchema xmlSchema = getXmlSchema(targetNameSpace);
Modified:
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java?view=diff&rev=472430&r1=472429&r2=472430
==============================================================================
---
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
(original)
+++
incubator/tuscany/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
Wed Nov 8 01:07:21 2006
@@ -30,7 +30,6 @@
import org.apache.ws.java2wsdl.Java2WSDLUtils;
import org.codehaus.jam.JClass;
-
public class TuscanyTypeTable
{
public static final String XML_SCHEMA_URI =
"http://www.w3.org/2001/XMLSchema";;
@@ -175,10 +174,10 @@
return (QName) complexXSDTypes.get(asQualifiedName(sdoURI,
sdoTypeName));
}
- public QName getComplexSchemaTypeName(JClass javaClass) throws Exception
+ public QName getComplexSchemaTypeName(JClass javaClass, ClassLoader cl)
throws Exception
{
- String namespace =
-
Java2WSDLUtils.schemaNamespaceFromPackageName(javaClass.getContainingPackage().getQualifiedName()).toString();
+ String namespace = Java2WSDLUtils.schemaNamespaceFromClassName(
+ javaClass.getQualifiedName(), cl).toString();
return (QName) complexXSDTypes.get(asQualifiedName(namespace,
javaClass.getSimpleName()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
