Author: jboynes
Date: Tue Sep 12 10:25:53 2006
New Revision: 442648
URL: http://svn.apache.org/viewvc?view=rev&rev=442648
Log:
commit patch from Venkat for TUSCANY-715
Modified:
incubator/tuscany/java/sca/tools/pom.xml
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
Modified: incubator/tuscany/java/sca/tools/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/pom.xml?view=diff&rev=442648&r1=442647&r2=442648
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Tue Sep 12 10:25:53 2006
@@ -173,100 +173,6 @@
<version>2.1.0</version>
<scope>compile</scope>
</dependency>
-
- <!-- -->
-
- <!--
- <dependency>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-model</artifactId>
- <version>incubating-M1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>codegen</artifactId>
- <version>2.2.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>codegen</artifactId>
- <version>2.2.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>codegen-ecore</artifactId>
- <version>2.2.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
-
-
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.5.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>policy</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>2.9.3</version>
- <scope>compile</scope>
- </dependency>
-
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.1.0</version>
- <scope>compile</scope>
- </dependency>
- -->
</dependencies>
</project>
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java?view=diff&rev=442648&r1=442647&r2=442648
==============================================================================
---
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
(original)
+++
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
Tue Sep 12 10:25:53 2006
@@ -33,6 +33,8 @@
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;
@@ -42,32 +44,39 @@
import commonj.sdo.Type;
import commonj.sdo.helper.XSDHelper;
-public class SchemaBuilder implements TuscanyJava2WSDLConstants
-{
- public static final String NAME_SPACE_PREFIX = "stn_";
- private static int prefixCount = 1;
-
+public class SchemaBuilder implements TuscanyJava2WSDLConstants {
+ public static final String NAME_SPACE_PREFIX = "stn_";
+
+ private static int prefixCount = 1;
+
public static final String MIXED = "mixed";
+
public static final String GROUP = "group";
-
+
protected String attrFormDefault = null;
+
protected String elementFormDefault = null;
+
protected XmlSchemaCollection xmlSchemaCollection = new
XmlSchemaCollection();
+
private Hashtable schemaMap = new Hashtable();
+
protected Hashtable targetNamespacePrefixMap = new Hashtable();
+
protected TuscanyTypeTable typeTable = new TuscanyTypeTable();
+
protected Map schemaLocationMap = null;
+
private ClassLoader classLoader;
-
+
protected SchemaBuilder(XmlSchemaCollection schemaCollection,
- Hashtable schemaMap,
- Hashtable nsPrefixMap,
- TuscanyTypeTable typeTable,
- String attrFormDef,
- String eleFormDef,
- Map schemaLocMap,
- ClassLoader classLoader)
- {
+ Hashtable schemaMap,
+ Hashtable nsPrefixMap,
+ TuscanyTypeTable typeTable,
+ String attrFormDef,
+ String eleFormDef,
+ Map schemaLocMap,
+ ClassLoader classLoader) {
this.schemaMap = schemaMap;
this.xmlSchemaCollection = schemaCollection;
this.targetNamespacePrefixMap = nsPrefixMap;
@@ -77,304 +86,283 @@
this.attrFormDefault = attrFormDef;
this.elementFormDefault = eleFormDef;
}
-
-
- private boolean isSDO(JClass javaType) throws Exception
- {
- Class sdoClass = Class.forName(javaType.getQualifiedName(), true,
classLoader);
+
+ private boolean isSDO(JClass javaType) throws Exception {
+ Class sdoClass = Class.forName(javaType.getQualifiedName(),
+ true,
+ classLoader);
return DataObject.class.isAssignableFrom(sdoClass);
}
-
- private void buildComplexTypeContents_JavaType(JClass javaType,
- XmlSchemaComplexType
complexType,
- XmlSchema xmlSchema )
throws Exception
- {
- JProperty [] properties = javaType.getDeclaredProperties();
-
- for (int i = 0; i < properties.length; i++)
- {
+
+ private void buildComplexTypeContents_JavaType(JClass javaType,
+ XmlSchemaComplexType
complexType,
+ XmlSchema xmlSchema) throws
Exception {
+ JProperty[] properties = javaType.getDeclaredProperties();
+
+ for (int i = 0; i < properties.length; i++) {
JProperty property = properties[i];
String propertyName = property.getType().getQualifiedName();
boolean isArryType = property.getType().isArrayType();
- if (isArryType)
- {
+ if (isArryType) {
propertyName =
property.getType().getArrayComponentType().getQualifiedName();
}
-
- if (typeTable.isSimpleType(propertyName))
- {
+
+ if (typeTable.isSimpleType(propertyName)) {
XmlSchemaElement elt1 = new XmlSchemaElement();
elt1.setName(getCorrectName(property.getSimpleName()));
elt1.setSchemaTypeName(typeTable.getSimpleSchemaTypeName(propertyName));
-
((XmlSchemaGroupBase)complexType.getParticle()).getItems().add(elt1);
- if (isArryType)
- {
+ ((XmlSchemaGroupBase)
complexType.getParticle()).getItems().add(elt1);
+ if (isArryType) {
elt1.setMaxOccurs(Long.MAX_VALUE);
elt1.setMinOccurs(0);
}
- }
- else
- {
+ } else {
QName schemaTypeName = null;
- if (isArryType)
- {
+ if (isArryType) {
schemaTypeName =
generateSchema(property.getType().getArrayComponentType());
- }
- else
- {
+ } else {
schemaTypeName = generateSchema(property.getType());
}
-
+
XmlSchemaElement elt1 = new XmlSchemaElement();
elt1.setName(getCorrectName(property.getSimpleName()));
elt1.setSchemaTypeName(schemaTypeName);
-
((XmlSchemaGroupBase)complexType.getParticle()).getItems().add(elt1);
-
- if (isArryType)
- {
+ ((XmlSchemaGroupBase)
complexType.getParticle()).getItems().add(elt1);
+
+ if (isArryType) {
elt1.setMaxOccurs(Long.MAX_VALUE);
elt1.setMinOccurs(0);
}
-
- addImports(xmlSchema, schemaTypeName);
+
+ addImports(xmlSchema,
+ schemaTypeName);
}
- }
+ }
}
-
- protected QName buildSchema_JavaType(JClass javaType) throws Exception
- {
+
+ protected QName buildSchema_JavaType(JClass javaType) throws Exception {
QName schemaTypeName = typeTable.getComplexSchemaTypeName(javaType);
- if ( schemaTypeName == null )
- {
+ if (schemaTypeName == null) {
String simpleName = javaType.getSimpleName();
-
+
String packageName =
javaType.getContainingPackage().getQualifiedName();
-
- String targetNameSpace =
Java2WSDLUtils.schemaNamespaceFromPackageName(packageName).toString();
-
+
+ String targetNameSpace =
Java2WSDLUtils.schemaNamespaceFromPackageName(packageName)
+ .toString();
+
XmlSchema xmlSchema = getXmlSchema(targetNameSpace);
String targetNamespacePrefix = (String)
targetNamespacePrefixMap.get(targetNameSpace);
-
+
schemaTypeName = new QName(targetNameSpace, simpleName,
targetNamespacePrefix);
XmlSchemaComplexType complexType = new
XmlSchemaComplexType(xmlSchema);
complexType.setName(simpleName);
-
+
XmlSchemaSequence sequence = new XmlSchemaSequence();
complexType.setParticle(sequence);
-
- createGlobalElement(xmlSchema, complexType, schemaTypeName);
+
+ createGlobalElement(xmlSchema,
+ complexType,
+ schemaTypeName);
xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
-
- //adding this type to the table
- //typeTable.addComplexScheam(name, complexType.getQName());
- typeTable.addComplexSchemaType(targetNameSpace, simpleName,
schemaTypeName);
- buildComplexTypeContents_JavaType(javaType, complexType,
xmlSchema);
+ xmlSchema.getSchemaTypes().add(schemaTypeName,
+ complexType);
+
+ // adding this type to the table
+ // typeTable.addComplexScheam(name, complexType.getQName());
+ typeTable.addComplexSchemaType(targetNameSpace,
+ simpleName,
+ schemaTypeName);
+ buildComplexTypeContents_JavaType(javaType,
+ complexType,
+ xmlSchema);
}
return schemaTypeName;
}
-
-
- protected QName buildSchema_SDO(Type dataType) //throws Exception
+
+ protected QName buildSchema_SDO(Type dataType) // throws Exception
{
- QName schemaTypeName =
typeTable.getComplexSchemaTypeName(dataType.getURI(), dataType.getName());
-
- if ( schemaTypeName == null )
- {
- //invoke XSDHelper to generate schema for this sdo type
+ QName schemaTypeName =
typeTable.getComplexSchemaTypeName(dataType.getURI(),
+
dataType.getName());
+
+ if (schemaTypeName == null) {
+ // invoke XSDHelper to generate schema for this sdo type
XSDHelper xsdHelper =
SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
- //it is better to check if XSDHelper can generate the schema
- if ( xsdHelper.isXSD(dataType) )
- {
- //if schemalocations for xsd has been specified, include them
+ // it is better to check if XSDHelper can generate the schema
+ if (xsdHelper.isXSD(dataType)) {
+ // if schemalocations for xsd has been specified, include them
includeExtXSD(dataType);
- }
- else
- {
+ } else {
List typeList = new Vector();
typeList.add(dataType);
-
- //the xsdhelper returns a string that contains the schemas for
this type
- String schemaDefns = xsdHelper.generate(typeList,
schemaLocationMap);
-
- //extract the schema elements and store them in the schema map
+
+ // the xsdhelper returns a string that contains the schemas
for this type
+ String schemaDefns = xsdHelper.generate(typeList,
+ schemaLocationMap);
+
+ // extract the schema elements and store them in the schema map
extractSchemas(schemaDefns);
}
- //since the XSDHelper will not return the type name, create it and
store it in typetable
- schemaTypeName = new QName(dataType.getURI(),
- dataType.getName(),
- generatePrefix());
+ // since the XSDHelper will not return the type name, create it
and store it in typetable
+ schemaTypeName = new QName(dataType.getURI(), dataType.getName(),
generatePrefix());
typeTable.addComplexSchemaType(dataType.getURI(),
- dataType.getName(),
- schemaTypeName);
+ dataType.getName(),
+ schemaTypeName);
}
return schemaTypeName;
}
-
-
- public QName generateSchema(JClass javaType) throws Exception
- {
- if ( isSDO(javaType) )
- {
+
+ public QName generateSchema(JClass javaType) throws Exception {
+ if (isSDO(javaType)) {
Type dataType = createDataObject(javaType).getType();
return buildSchema_SDO(dataType);
- }
- else
- {
+ } else {
return buildSchema_JavaType(javaType);
}
}
-
- private XmlSchema getXmlSchema(String targetNamespace)
- {
- XmlSchema xmlSchema;
-
- if ((xmlSchema = (XmlSchema) schemaMap.get(targetNamespace)) == null)
- {
+
+ private XmlSchema getXmlSchema(String targetNamespace) {
+ XmlSchema xmlSchema;
+
+ if ((xmlSchema = (XmlSchema) schemaMap.get(targetNamespace)) == null) {
String targetNamespacePrefix = generatePrefix();
-
+
xmlSchema = new XmlSchema(targetNamespace, xmlSchemaCollection);
xmlSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
xmlSchema.setElementFormDefault(getElementFormDefaultSetting());
-
- targetNamespacePrefixMap.put(targetNamespace,
targetNamespacePrefix);
- schemaMap.put(targetNamespace, xmlSchema);
-
- Hashtable prefixmap = new Hashtable();
- prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX,
TuscanyTypeTable.XML_SCHEMA_URI);
- prefixmap.put(targetNamespacePrefix, targetNamespace);
- xmlSchema.setPrefixToNamespaceMap(prefixmap);
+
+ targetNamespacePrefixMap.put(targetNamespace,
+ targetNamespacePrefix);
+ schemaMap.put(targetNamespace,
+ xmlSchema);
+
+ NamespaceMap prefixmap = new NamespaceMap();
+ prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX,
+ TuscanyTypeTable.XML_SCHEMA_URI);
+ prefixmap.put(targetNamespacePrefix,
+ targetNamespace);
+ xmlSchema.setNamespaceContext(prefixmap);
}
return xmlSchema;
}
-
-
+
/**
- * JAM convert first name of an attribute into UpperCase as an example if
- * there is a instance variable called foo in a bean , then Jam give that
as
- * Foo so this method is to correct that error
- *
+ * JAM convert first name of an attribute into UpperCase as an example if
there is a instance variable called foo in a bean , then Jam give that
+ * as Foo so this method is to correct that error
+ *
* @param wrongName
* @return the right name, using english as the locale for case conversion
*/
- public static String getCorrectName(String wrongName)
- {
+ public static String getCorrectName(String wrongName) {
if (wrongName.length() > 1) {
- return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH)
- + wrongName.substring(1, wrongName.length());
+ return wrongName.substring(0,
+ 1).toLowerCase(Locale.ENGLISH)
+ + wrongName.substring(1,
+ wrongName.length());
} else {
- return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH);
+ return wrongName.substring(0,
+ 1).toLowerCase(Locale.ENGLISH);
}
}
-
- private String addImports(XmlSchema xmlSchema, QName schemaTypeName)
- {
+
+ private String addImports(XmlSchema xmlSchema, QName schemaTypeName) {
String prefix = null;
- Enumeration enumeration = xmlSchema.getPrefixToNamespaceMap().keys();
- while ( enumeration.hasMoreElements() )
- {
- prefix = (String)enumeration.nextElement();
- if ( schemaTypeName.getNamespaceURI().equals(
- xmlSchema.getPrefixToNamespaceMap().get(prefix)) )
- {
- return prefix;
+ String[] prefixes =
xmlSchema.getNamespaceContext().getDeclaredPrefixes();
+ for (int count = 0; count < prefixes.length; ++count) {
+ if (schemaTypeName.getNamespaceURI().
+
equals(xmlSchema.getNamespaceContext().getNamespaceURI(prefixes[count])) ) {
+ return prefixes[count];
}
}
-
- //the following lines are executed only if a prefix was not found
which implies that the
- //schemaTypeName was not imported earlier and also it does not belong
to the targetnamespace
+
+ // the following lines are executed only if a prefix was not found
which implies that the
+ // schemaTypeName was not imported earlier and also it does not belong
to the targetnamespace
String schemaLocation = null;
XmlSchemaImport importElement = new XmlSchemaImport();
importElement.setNamespace(schemaTypeName.getNamespaceURI());
xmlSchema.getItems().add(importElement);
prefix = generatePrefix();
- xmlSchema.getPrefixToNamespaceMap().put(prefix,
schemaTypeName.getNamespaceURI());
+ //it is safe to cast like this since it was this class that
instantiated the
+ //NamespaceContext and assigned it to an instance of a NamespaceMap
(see method getXmlSchema)
+ ((NamespaceMap)xmlSchema.getNamespaceContext()).put(prefix,
+
schemaTypeName.getNamespaceURI());
return prefix;
}
-
-
-
- private String formGlobalElementName(String typeName)
- {
- String firstChar = typeName.substring(0,1);
- return typeName.replaceFirst(firstChar, firstChar.toLowerCase());
+
+ private String formGlobalElementName(String typeName) {
+ String firstChar = typeName.substring(0,
+ 1);
+ return typeName.replaceFirst(firstChar,
+ firstChar.toLowerCase());
}
-
- private void createGlobalElement(XmlSchema xmlSchema, XmlSchemaComplexType
complexType, QName elementName )
- {
+
+ private void createGlobalElement(XmlSchema xmlSchema,
+ XmlSchemaComplexType complexType,
+ QName elementName) {
XmlSchemaElement globalElement = new XmlSchemaElement();
globalElement.setSchemaTypeName(complexType.getQName());
globalElement.setName(formGlobalElementName(complexType.getName()));
globalElement.setQName(elementName);
-
+
xmlSchema.getItems().add(globalElement);
- xmlSchema.getElements().add(elementName, globalElement);
+ xmlSchema.getElements().add(elementName,
+ globalElement);
}
-
- private DataObject createDataObject(JClass sdoClass) throws Exception
- {
- Class sdoType = Class.forName(sdoClass.getQualifiedName(), true,
classLoader);
-
+
+ private DataObject createDataObject(JClass sdoClass) throws Exception {
+ Class sdoType = Class.forName(sdoClass.getQualifiedName(),
+ true,
+ classLoader);
+
Constructor constructor = sdoType.getDeclaredConstructor(new Class[0]);
constructor.setAccessible(true);
Object instance = constructor.newInstance(new Object[0]);
- return (DataObject)instance;
+ return (DataObject) instance;
}
-
-
- private String generatePrefix()
- {
+
+ private String generatePrefix() {
return NAME_SPACE_PREFIX + prefixCount++;
}
-
- private void includeExtXSD(Type dataType)
- {
- //now we know there is a type for which the xsd must come from outside
- //create a schema for the namespace of this type and add an include in
it for
- //the xsd that is defined externally
+
+ private void includeExtXSD(Type dataType) {
+ // now we know there is a type for which the xsd must come from outside
+ // create a schema for the namespace of this type and add an include
in it for
+ // the xsd that is defined externally
XmlSchema xmlSchema = getXmlSchema(dataType.getURI());
-
- //ideally there could be more than one external schema defintions for
a namespace
- //and hence schemalocations will be a list of locations
- //List schemaLocations =
(List)schemaLocationMap.get(dataType.getURI());
-
- //since as per the specs the input to XSDHelper is a map of <String,
String> allowing
- //only one schemalocation for a namespace. So for now this single
location will be
- //picked up and put into a list
+
+ // ideally there could be more than one external schema defintions for
a namespace
+ // and hence schemalocations will be a list of locations
+ // List schemaLocations =
(List)schemaLocationMap.get(dataType.getURI());
+
+ // since as per the specs the input to XSDHelper is a map of <String,
String> allowing
+ // only one schemalocation for a namespace. So for now this single
location will be
+ // picked up and put into a list
List schemaLocations = new Vector();
-
- if ( schemaLocationMap.get(dataType.getURI()) != null )
- {
+
+ if (schemaLocationMap.get(dataType.getURI()) != null) {
schemaLocations.add(schemaLocationMap.get(dataType.getURI()));
}
-
- if ( schemaLocations.size() <= 0 )
- {
+
+ if (schemaLocations.size() <= 0) {
schemaLocations.add(DEFAULT_SCHEMA_LOCATION);
}
-
+
Iterator includesIterator = xmlSchema.getIncludes().getIterator();
Iterator schemaLocIterator = schemaLocations.iterator();
String aSchemaLocation = null;
boolean includeExists = false;
- //include all external schema locations
- while ( schemaLocIterator.hasNext() )
- {
- aSchemaLocation = (String)schemaLocIterator.next();
- while ( includesIterator.hasNext() )
- {
- if ( !includeExists && aSchemaLocation.equals(
-
((XmlSchemaInclude)includesIterator.next()).getSchemaLocation()
- ))
- {
+ // include all external schema locations
+ while (schemaLocIterator.hasNext()) {
+ aSchemaLocation = (String) schemaLocIterator.next();
+ while (includesIterator.hasNext()) {
+ if (!includeExists
+ && aSchemaLocation.equals(((XmlSchemaInclude)
includesIterator.next()).getSchemaLocation())) {
includeExists = true;
}
}
-
- if ( !includeExists )
- {
+
+ if (!includeExists) {
XmlSchemaInclude includeElement = new XmlSchemaInclude();
includeElement.setSchemaLocation(aSchemaLocation);
xmlSchema.getIncludes().add(includeElement);
@@ -383,57 +371,56 @@
}
}
-
- private void extractSchemas(String schemaDefns)
- {
- //load each schema element and add it to the schema map
+
+ private void extractSchemas(String schemaDefns) {
+ // load each schema element and add it to the schema map
String token = getToken(schemaDefns);
int curIndex = schemaDefns.indexOf(token);
- int nextIndex = schemaDefns.indexOf(token, curIndex + token.length());
-
- while ( curIndex != -1 )
- {
- StringReader sr = null;
- if ( nextIndex != -1 )
- sr = new StringReader(schemaDefns.substring(curIndex,
nextIndex));
+ int nextIndex = schemaDefns.indexOf(token,
+ curIndex + token.length());
+
+ while (curIndex != -1) {
+ StringReader sr = null;
+ if (nextIndex != -1)
+ sr = new StringReader(schemaDefns.substring(curIndex,
+ nextIndex));
else
sr = new StringReader(schemaDefns.substring(curIndex));
-
+
XmlSchemaCollection collection = new XmlSchemaCollection();
- XmlSchema aSchema = collection.read(sr, null);
+ XmlSchema aSchema = collection.read(sr,
+ null);
addSchemaToMap(aSchema);
-
+
curIndex = nextIndex;
- nextIndex = schemaDefns.indexOf(token, curIndex + token.length());
+ nextIndex = schemaDefns.indexOf(token,
+ curIndex + token.length());
}
}
-
- private void addSchemaToMap(XmlSchema extractedSchema)
- {
- //check if a Schema object already exists in schema map for
targetNamespace of this schema element
- //if it does then copy the contents of this schema element to the
existing one, ensuring that
- //duplicate elements are not created. i.e. before adding some child
element like 'include' or 'import'
- //check if it already exists, if it does don't add this
- XmlSchema existingSchema =
(XmlSchema)schemaMap.get(extractedSchema.getTargetNamespace());
-
- if ( existingSchema == null )
- {
+
+ private void addSchemaToMap(XmlSchema extractedSchema) {
+ // check if a Schema object already exists in schema map for
targetNamespace of this schema element
+ // if it does then copy the contents of this schema element to the
existing one, ensuring that
+ // duplicate elements are not created. i.e. before adding some child
element like 'include' or 'import'
+ // check if it already exists, if it does don't add this
+ XmlSchema existingSchema = (XmlSchema)
schemaMap.get(extractedSchema.getTargetNamespace());
+
+ if (existingSchema == null) {
extractedSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
extractedSchema.setElementFormDefault(getElementFormDefaultSetting());
- schemaMap.put(extractedSchema.getTargetNamespace(),
extractedSchema);
-
- }
- else
- {
- copySchemaItems(existingSchema, extractedSchema);
+ schemaMap.put(extractedSchema.getTargetNamespace(),
+ extractedSchema);
+
+ } else {
+ copySchemaItems(existingSchema,
+ extractedSchema);
}
}
-
- private void copySchemaItems(XmlSchema existingSchema, XmlSchema aSchema)
- {
- //items to copy are imports, includes, elements, types ...
- //each item is checked if it is a duplicate entry and copied only if
it isn't
+
+ private void copySchemaItems(XmlSchema existingSchema, XmlSchema aSchema) {
+ // items to copy are imports, includes, elements, types ...
+ // each item is checked if it is a duplicate entry and copied only if
it isn't
Iterator itemsIterator = aSchema.getItems().getIterator();
Object schemaObject = null;
XmlSchemaElement schemaElement = null;
@@ -441,108 +428,89 @@
XmlSchemaInclude schemaInclude = null;
QName qName = null;
List existingIncludes = getExistingIncludes(existingSchema);
-
- while ( itemsIterator.hasNext() )
- {
+
+ while (itemsIterator.hasNext()) {
schemaObject = itemsIterator.next();
- if ( schemaObject instanceof XmlSchemaElement )
- {
- schemaElement = (XmlSchemaElement)schemaObject;
+ if (schemaObject instanceof XmlSchemaElement) {
+ schemaElement = (XmlSchemaElement) schemaObject;
qName = schemaElement.getQName();
- //if the element does not exist in the existing schema
- if ( existingSchema.getElementByName(qName) == null )
- {
- //add it to the existing schema
- existingSchema.getElements().add(qName, schemaElement);
+ // if the element does not exist in the existing schema
+ if (existingSchema.getElementByName(qName) == null) {
+ // add it to the existing schema
+ existingSchema.getElements().add(qName,
+ schemaElement);
existingSchema.getItems().add(schemaElement);
}
- }
- else if ( schemaObject instanceof XmlSchemaType )
- {
- schemaType = (XmlSchemaType)itemsIterator.next();
+ } else if (schemaObject instanceof XmlSchemaType) {
+ schemaType = (XmlSchemaType) itemsIterator.next();
qName = schemaType.getQName();
- //if the element does not exist in the existing schema
- if ( existingSchema.getElementByName(qName) == null )
- {
- //add it to the existing schema
- existingSchema.getSchemaTypes().add(qName, schemaType);
+ // if the element does not exist in the existing schema
+ if (existingSchema.getElementByName(qName) == null) {
+ // add it to the existing schema
+ existingSchema.getSchemaTypes().add(qName,
+ schemaType);
existingSchema.getItems().add(schemaType);
- //add imports
- addImports(existingSchema, qName);
+ // add imports
+ addImports(existingSchema,
+ qName);
}
- }
- else if ( schemaObject instanceof XmlSchemaInclude )
- {
- schemaInclude = (XmlSchemaInclude)itemsIterator.next();
- if (
!existingIncludes.contains(schemaInclude.getSchemaLocation()) )
- {
+ } else if (schemaObject instanceof XmlSchemaInclude) {
+ schemaInclude = (XmlSchemaInclude) itemsIterator.next();
+ if
(!existingIncludes.contains(schemaInclude.getSchemaLocation())) {
existingSchema.getIncludes().add(schemaInclude);
existingSchema.getItems().add(schemaInclude);
}
}
}
}
-
- private List getExistingIncludes(XmlSchema xmlSchema)
- {
+
+ private List getExistingIncludes(XmlSchema xmlSchema) {
List includeSchemaLocations = new Vector();
Iterator iterator = xmlSchema.getIncludes().getIterator();
-
- while ( iterator.hasNext() )
- {
-
includeSchemaLocations.add(((XmlSchemaInclude)iterator.next()).getSchemaLocation());
+
+ while (iterator.hasNext()) {
+ includeSchemaLocations.add(((XmlSchemaInclude)
iterator.next()).getSchemaLocation());
}
return includeSchemaLocations;
}
-
- private XmlSchemaForm getAttrFormDefaultSetting()
- {
- if ( FORM_DEFAULT_UNQUALIFIED.equals(getAttrFormDefault()) )
- {
+
+ private XmlSchemaForm getAttrFormDefaultSetting() {
+ if (FORM_DEFAULT_UNQUALIFIED.equals(getAttrFormDefault())) {
return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
- }
- else
- {
+ } else {
return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
}
}
-
- private XmlSchemaForm getElementFormDefaultSetting()
- {
- if ( FORM_DEFAULT_UNQUALIFIED.equals(getElementFormDefault()) )
- {
+
+ private XmlSchemaForm getElementFormDefaultSetting() {
+ if (FORM_DEFAULT_UNQUALIFIED.equals(getElementFormDefault())) {
return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
- }
- else
- {
+ } else {
return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
}
}
-
- private String getToken(String s)
- {
- //get the schema element name eg. <xs:schema or <xsd:schema. We only
know that 'schema' will be used
- //but not sure what suffix is used. Hence this method to get the
actual element name used
+
+ private String getToken(String s) {
+ // get the schema element name eg. <xs:schema or <xsd:schema. We only
know that 'schema' will be used
+ // but not sure what suffix is used. Hence this method to get the
actual element name used
int i = s.indexOf(SCHEMA_ELEMENT_NAME);
- int j = s.substring(0, i).lastIndexOf("<");
- return s.substring(j, i + SCHEMA_ELEMENT_NAME.length());
+ int j = s.substring(0,
+ i).lastIndexOf("<");
+ return s.substring(j,
+ i + SCHEMA_ELEMENT_NAME.length());
}
-
public String getAttrFormDefault() {
return attrFormDefault;
}
-
public void setAttrFormDefault(String attrFormDefault) {
this.attrFormDefault = attrFormDefault;
}
-
public String getElementFormDefault() {
return elementFormDefault;
}
-
public void setElementFormDefault(String elementFormDefault) {
this.elementFormDefault = elementFormDefault;
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java?view=diff&rev=442648&r1=442647&r2=442648
==============================================================================
---
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
(original)
+++
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
Tue Sep 12 10:25:53 2006
@@ -19,6 +19,7 @@
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.apache.ws.java2wsdl.Java2WSDLConstants;
import org.apache.ws.java2wsdl.SchemaGenerator;
import org.apache.ws.java2wsdl.bytecode.MethodTable;
@@ -292,10 +293,10 @@
schemaMap.put(targetNamespace, xmlSchema);
- Hashtable prefixmap = new Hashtable();
+ NamespaceMap prefixmap = new NamespaceMap();
prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX,
TuscanyTypeTable.XML_SCHEMA_URI);
prefixmap.put(targetNamespacePrefix, targetNamespace);
- xmlSchema.setPrefixToNamespaceMap(prefixmap);
+ xmlSchema.setNamespaceContext(prefixmap);
}
private void setFormDefaults()
@@ -337,13 +338,13 @@
}
else
{
- if (!xmlSchema.getPrefixToNamespaceMap().values().
+ if (!((NamespaceMap)xmlSchema.getNamespaceContext()).values().
contains(schemaTypeName.getNamespaceURI()))
{
XmlSchemaImport importElement = new XmlSchemaImport();
importElement.setNamespace(schemaTypeName.getNamespaceURI());
xmlSchema.getItems().add(importElement);
- xmlSchema.getPrefixToNamespaceMap().
+ ((NamespaceMap)xmlSchema.getNamespaceContext()).
put(generatePrefix(),
schemaTypeName.getNamespaceURI());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
