Author: jkaputin
Date: Tue Jan 8 06:08:20 2008
New Revision: 609994
URL: http://svn.apache.org/viewvc?rev=609994&view=rev
Log:
Commit static constant changes merged from trunk into woden47 branch.
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/OMWSDLReader.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/DOMSchemaResolverAdapter.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/OMSchemaResolverAdapter.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/schema/SchemaConstants.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java?rev=609994&r1=609993&r2=609994&view=diff
==============================================================================
---
webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
(original)
+++
webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
Tue Jan 8 06:08:20 2008
@@ -564,11 +564,11 @@
{
parseDocumentation(tempEl, desc, types);
}
- else if (SchemaConstants.XSD_IMPORT_QNAME_LIST.contains(tempElQN))
+ else if (SchemaConstants.Q_ELEM_SCHEMA_IMPORT.equals(tempElQN))
{
types.addSchema(parseSchemaImport(tempEl, desc));
}
- else if (SchemaConstants.XSD_SCHEMA_QNAME_LIST.contains(tempElQN))
+ else if (SchemaConstants.Q_ELEM_SCHEMA.equals(tempElQN))
{
types.addSchema(parseSchemaInline(tempEl, desc));
}
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java?rev=609994&r1=609993&r2=609994&view=diff
==============================================================================
---
webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++
webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
Tue Jan 8 06:08:20 2008
@@ -27,10 +27,8 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.woden.ErrorHandler;
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
import org.apache.woden.WSDLSource;
import org.apache.woden.XMLElement;
@@ -282,9 +280,9 @@
InlinedSchemaImpl schema = new InlinedSchemaImpl();
schema.setXMLElement(schemaEl);
- schema.setId(schemaEl.getAttributeValue(Constants.ATTR_ID));
+ schema.setId(schemaEl.getAttributeValue(SchemaConstants.ATTR_ID));
- String tns =
schemaEl.getAttributeValue(Constants.ATTR_TARGET_NAMESPACE);
+ String tns =
schemaEl.getAttributeValue(SchemaConstants.ATTR_TARGET_NAMESPACE);
if(tns != null) {
schema.setNamespace(getURI(tns));
}
@@ -352,7 +350,7 @@
ImportedSchemaImpl schema = new ImportedSchemaImpl();
schema.setXMLElement(importEl);
- String importNS = importEl.getAttributeValue(Constants.ATTR_NAMESPACE);
+ String importNS =
importEl.getAttributeValue(SchemaConstants.ATTR_NAMESPACE);
if(importNS != null) {
schema.setNamespace(getURI(importNS));
}
@@ -554,9 +552,10 @@
try
{
Document schemaDoc =
DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Element schemaElem =
schemaDoc.createElementNS("http://www.w3.org/2001/XMLSchema";, "import");
- schemaElem.setAttribute("namespace",
"http://www.w3.org/2001/XMLSchema";);
- schemaElem.setAttribute("schemaLocation",
resolveURI("http://www.w3.org/2001/XMLSchema.xsd";));
+ Element schemaElem = schemaDoc.
+ createElementNS(SchemaConstants.NS_STRING_SCHEMA,
SchemaConstants.ELEM_IMPORT);
+ schemaElem.setAttribute(SchemaConstants.ATTR_NAMESPACE,
SchemaConstants.NS_STRING_SCHEMA);
+ schemaElem.setAttribute(SchemaConstants.ATTR_SCHEMA_LOCATION,
resolveURI("http://www.w3.org/2001/XMLSchema.xsd";));
XMLElement xmlEl = createXMLElement(schemaElem);
desc.getTypesElement().addSchema(parseSchemaImport(xmlEl, desc));
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/OMWSDLReader.java?rev=609994&r1=609993&r2=609994&view=diff
==============================================================================
---
webservices/woden/branches/woden47/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
webservices/woden/branches/woden47/src/org/apache/woden/internal/OMWSDLReader.java
Tue Jan 8 06:08:20 2008
@@ -161,7 +161,7 @@
ImportedSchemaImpl schema = new ImportedSchemaImpl();
- String ns = importEl.getAttributeValue(Constants.ATTR_NAMESPACE);
+ String ns = importEl.getAttributeValue(SchemaConstants.ATTR_NAMESPACE);
if(ns != null) {
schema.setNamespace(getURI(ns));
@@ -317,8 +317,8 @@
throws WSDLException{
InlinedSchemaImpl schema = new InlinedSchemaImpl();
- schema.setId(schemaElement.getAttributeValue(Constants.ATTR_ID));
- String tns =
schemaElement.getAttributeValue(Constants.ATTR_TARGET_NAMESPACE);
+ schema.setId(schemaElement.getAttributeValue(SchemaConstants.ATTR_ID));
+ String tns =
schemaElement.getAttributeValue(SchemaConstants.ATTR_TARGET_NAMESPACE);
if(tns != null) {
schema.setNamespace(getURI(tns));
}
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/DOMSchemaResolverAdapter.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/DOMSchemaResolverAdapter.java?rev=609994&r1=609993&r2=609994&view=diff
==============================================================================
---
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/DOMSchemaResolverAdapter.java
(original)
+++
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/DOMSchemaResolverAdapter.java
Tue Jan 8 06:08:20 2008
@@ -22,6 +22,8 @@
import java.io.InputStream;
import org.apache.woden.XMLElement;
+import org.apache.woden.internal.schema.SchemaConstants;
+import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.resolver.URIResolver;
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
@@ -57,7 +59,7 @@
}
String localName = schemaEl.getLocalName();
- if(!localName.equals("schema")) {
+ if(!localName.equals(SchemaConstants.ELEM_SCHEMA)) {
//the fragid does not point to a schema element
//TODO suitable error message
return null;
@@ -67,7 +69,7 @@
if(prefix != null) {
//check if we need to add a schema NS declaration
String nsUri = schemaEl.getNamespaceURI();
- String schemaNSDecl = "xmlns:" + prefix;
+ String schemaNSDecl = Constants.ATTR_XMLNS + prefix;
boolean isSchemaNSDeclared = schemaEl.hasAttribute(schemaNSDecl);
if(!isSchemaNSDeclared) {
schemaEl.setAttribute(schemaNSDecl, nsUri);
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/OMSchemaResolverAdapter.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/OMSchemaResolverAdapter.java?rev=609994&r1=609993&r2=609994&view=diff
==============================================================================
---
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/OMSchemaResolverAdapter.java
(original)
+++
webservices/woden/branches/woden47/src/org/apache/woden/internal/resolver/OMSchemaResolverAdapter.java
Tue Jan 8 06:08:20 2008
@@ -50,7 +50,7 @@
OMElement contextEl = (OMElement)fContextElement.getSource();
OMElement typesEl = (OMElement)contextEl.getParent();
Iterator inlineSchemas = typesEl.
- getChildrenWithName(SchemaConstants.Q_ELEM_XSD_2001);
+ getChildrenWithName(SchemaConstants.Q_ELEM_SCHEMA);
OMElement identifiedSchema = null;
String schemaId;
while(inlineSchemas.hasNext()) {
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/schema/SchemaConstants.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/schema/SchemaConstants.java?rev=609994&r1=609993&r2=609994&view=diff
==============================================================================
---
webservices/woden/branches/woden47/src/org/apache/woden/internal/schema/SchemaConstants.java
(original)
+++
webservices/woden/branches/woden47/src/org/apache/woden/internal/schema/SchemaConstants.java
Tue Jan 8 06:08:20 2008
@@ -16,6 +16,7 @@
*/
package org.apache.woden.internal.schema;
+import java.net.URI;
import java.util.Arrays;
import java.util.List;
import javax.xml.namespace.QName;
@@ -29,112 +30,74 @@
//Schema attribute names
public static final String ATTR_ID = "id";
+ public static final String ATTR_TARGET_NAMESPACE = "targetNamespace";
+ public static final String ATTR_NAMESPACE = "namespace";
public static final String ATTR_SCHEMA_LOCATION = "schemaLocation";
//Schema element names
public static final String ELEM_SCHEMA = "schema";
- public static final String ELEM_SCHEMA_IMPORT = "import";
- public static final String ELEM_SCHEMA_INCLUDE = "include";
- public static final String ELEM_SCHEMA_REDEFINE = "redefine";
+ public static final String ELEM_IMPORT = "import";
- //Schema uri
- public static final String NS_URI_XSD_1999 =
- "http://www.w3.org/1999/XMLSchema";;
- public static final String NS_URI_XSD_2000 =
- "http://www.w3.org/2000/10/XMLSchema";;
- public static final String NS_URI_XSD_2001 =
+ //Schema namespace string
+ public static final String NS_STRING_SCHEMA =
"http://www.w3.org/2001/XMLSchema";;
+ //Schema namespace uri
+ public static final URI NS_URI_SCHEMA = URI.create(NS_STRING_SCHEMA);
+
//Schema attribute qnames
public static final QName Q_ATTR_ID = new QName(ATTR_ID);
- //<xs:schema> qnames
- public static final QName Q_ELEM_XSD_1999 =
- new QName(NS_URI_XSD_1999, ELEM_SCHEMA);
- public static final QName Q_ELEM_XSD_2000 =
- new QName(NS_URI_XSD_2000, ELEM_SCHEMA);
- public static final QName Q_ELEM_XSD_2001 =
- new QName(NS_URI_XSD_2001, ELEM_SCHEMA);
- public static final List XSD_SCHEMA_QNAME_LIST = Arrays.asList(new QName[]
- {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001});
-
- //<xs:import> qnames
- public static final QName Q_ELEM_IMPORT_XSD_1999 = new QName(
- NS_URI_XSD_1999, ELEM_SCHEMA_IMPORT);
- public static final QName Q_ELEM_IMPORT_XSD_2000 = new QName(
- NS_URI_XSD_2000, ELEM_SCHEMA_IMPORT);
- public static final QName Q_ELEM_IMPORT_XSD_2001 = new QName(
- NS_URI_XSD_2001, ELEM_SCHEMA_IMPORT);
- public static final List XSD_IMPORT_QNAME_LIST = Arrays.asList(new QName[]
- { Q_ELEM_IMPORT_XSD_1999, Q_ELEM_IMPORT_XSD_2000,
Q_ELEM_IMPORT_XSD_2001 });
-
- //TODO remove <include> if not used in Woden
- //<xs:include> qnames
- public static final QName Q_ELEM_INCLUDE_XSD_1999 = new QName(
- NS_URI_XSD_1999, ELEM_SCHEMA_INCLUDE);
- public static final QName Q_ELEM_INCLUDE_XSD_2000 = new QName(
- NS_URI_XSD_2000, ELEM_SCHEMA_INCLUDE);
- public static final QName Q_ELEM_INCLUDE_XSD_2001 = new QName(
- NS_URI_XSD_2001, ELEM_SCHEMA_INCLUDE);
- public static final List XSD_INCLUDE_QNAME_LIST = Arrays.asList(new QName[]
- { Q_ELEM_INCLUDE_XSD_1999, Q_ELEM_INCLUDE_XSD_2000,
Q_ELEM_INCLUDE_XSD_2001 });
-
- //TODO remove <redefine> if not used in Woden
- //<xs:redefine> qnames
- public static final QName Q_ELEM_REDEFINE_XSD_1999 = new QName(
- NS_URI_XSD_1999, ELEM_SCHEMA_REDEFINE);
- public static final QName Q_ELEM_REDEFINE_XSD_2000 = new QName(
- NS_URI_XSD_2000, ELEM_SCHEMA_REDEFINE);
- public static final QName Q_ELEM_REDEFINE_XSD_2001 = new QName(
- NS_URI_XSD_2001, ELEM_SCHEMA_REDEFINE);
- public static final List XSD_REDEFINE_QNAME_LIST = Arrays.asList(new
QName[]
- { Q_ELEM_REDEFINE_XSD_1999, Q_ELEM_REDEFINE_XSD_2000,
Q_ELEM_REDEFINE_XSD_2001 });
-
+ //Schema element qnames
+ public static final QName Q_ELEM_SCHEMA =
+ new QName(NS_STRING_SCHEMA, ELEM_SCHEMA);
+ public static final QName Q_ELEM_SCHEMA_IMPORT =
+ new QName(NS_STRING_SCHEMA, ELEM_IMPORT);
//Built-in XML Schema types. 19 primitive and 25 derived.
public static final List LIST_Q_BUILT_IN_TYPES = Arrays.asList(new QName[]
- { new QName(NS_URI_XSD_2001, "string"),
- new QName(NS_URI_XSD_2001, "boolean"),
- new QName(NS_URI_XSD_2001, "decimal"),
- new QName(NS_URI_XSD_2001, "float"),
- new QName(NS_URI_XSD_2001, "double"),
- new QName(NS_URI_XSD_2001, "duration"),
- new QName(NS_URI_XSD_2001, "dateTime"),
- new QName(NS_URI_XSD_2001, "time"),
- new QName(NS_URI_XSD_2001, "date"),
- new QName(NS_URI_XSD_2001, "gYearMonth"),
- new QName(NS_URI_XSD_2001, "gYear"),
- new QName(NS_URI_XSD_2001, "gMonthDay"),
- new QName(NS_URI_XSD_2001, "gDay"),
- new QName(NS_URI_XSD_2001, "gMonth"),
- new QName(NS_URI_XSD_2001, "hexBinary"),
- new QName(NS_URI_XSD_2001, "base64Binary"),
- new QName(NS_URI_XSD_2001, "anyURI"),
- new QName(NS_URI_XSD_2001, "QName"),
- new QName(NS_URI_XSD_2001, "NOTATION"),
- new QName(NS_URI_XSD_2001, "normalizedString"),
- new QName(NS_URI_XSD_2001, "token"),
- new QName(NS_URI_XSD_2001, "language"),
- new QName(NS_URI_XSD_2001, "NMTOKEN"),
- new QName(NS_URI_XSD_2001, "NMTOKENS"),
- new QName(NS_URI_XSD_2001, "Name"),
- new QName(NS_URI_XSD_2001, "NCName"),
- new QName(NS_URI_XSD_2001, "ID"),
- new QName(NS_URI_XSD_2001, "IDREF"),
- new QName(NS_URI_XSD_2001, "IDREFS"),
- new QName(NS_URI_XSD_2001, "ENTITY"),
- new QName(NS_URI_XSD_2001, "ENTITIES"),
- new QName(NS_URI_XSD_2001, "integer"),
- new QName(NS_URI_XSD_2001, "nonPositiveInteger"),
- new QName(NS_URI_XSD_2001, "negativeInteger"),
- new QName(NS_URI_XSD_2001, "long"),
- new QName(NS_URI_XSD_2001, "int"),
- new QName(NS_URI_XSD_2001, "short"),
- new QName(NS_URI_XSD_2001, "byte"),
- new QName(NS_URI_XSD_2001, "nonNegativeInteger"),
- new QName(NS_URI_XSD_2001, "unsignedLong"),
- new QName(NS_URI_XSD_2001, "unsignedInt"),
- new QName(NS_URI_XSD_2001, "unsignedShort"),
- new QName(NS_URI_XSD_2001, "unsignedByte"),
- new QName(NS_URI_XSD_2001, "positiveInteger") });
+ { new QName(NS_STRING_SCHEMA, "string"),
+ new QName(NS_STRING_SCHEMA, "boolean"),
+ new QName(NS_STRING_SCHEMA, "decimal"),
+ new QName(NS_STRING_SCHEMA, "float"),
+ new QName(NS_STRING_SCHEMA, "double"),
+ new QName(NS_STRING_SCHEMA, "duration"),
+ new QName(NS_STRING_SCHEMA, "dateTime"),
+ new QName(NS_STRING_SCHEMA, "time"),
+ new QName(NS_STRING_SCHEMA, "date"),
+ new QName(NS_STRING_SCHEMA, "gYearMonth"),
+ new QName(NS_STRING_SCHEMA, "gYear"),
+ new QName(NS_STRING_SCHEMA, "gMonthDay"),
+ new QName(NS_STRING_SCHEMA, "gDay"),
+ new QName(NS_STRING_SCHEMA, "gMonth"),
+ new QName(NS_STRING_SCHEMA, "hexBinary"),
+ new QName(NS_STRING_SCHEMA, "base64Binary"),
+ new QName(NS_STRING_SCHEMA, "anyURI"),
+ new QName(NS_STRING_SCHEMA, "QName"),
+ new QName(NS_STRING_SCHEMA, "NOTATION"),
+ new QName(NS_STRING_SCHEMA, "normalizedString"),
+ new QName(NS_STRING_SCHEMA, "token"),
+ new QName(NS_STRING_SCHEMA, "language"),
+ new QName(NS_STRING_SCHEMA, "NMTOKEN"),
+ new QName(NS_STRING_SCHEMA, "NMTOKENS"),
+ new QName(NS_STRING_SCHEMA, "Name"),
+ new QName(NS_STRING_SCHEMA, "NCName"),
+ new QName(NS_STRING_SCHEMA, "ID"),
+ new QName(NS_STRING_SCHEMA, "IDREF"),
+ new QName(NS_STRING_SCHEMA, "IDREFS"),
+ new QName(NS_STRING_SCHEMA, "ENTITY"),
+ new QName(NS_STRING_SCHEMA, "ENTITIES"),
+ new QName(NS_STRING_SCHEMA, "integer"),
+ new QName(NS_STRING_SCHEMA, "nonPositiveInteger"),
+ new QName(NS_STRING_SCHEMA, "negativeInteger"),
+ new QName(NS_STRING_SCHEMA, "long"),
+ new QName(NS_STRING_SCHEMA, "int"),
+ new QName(NS_STRING_SCHEMA, "short"),
+ new QName(NS_STRING_SCHEMA, "byte"),
+ new QName(NS_STRING_SCHEMA, "nonNegativeInteger"),
+ new QName(NS_STRING_SCHEMA, "unsignedLong"),
+ new QName(NS_STRING_SCHEMA, "unsignedInt"),
+ new QName(NS_STRING_SCHEMA, "unsignedShort"),
+ new QName(NS_STRING_SCHEMA, "unsignedByte"),
+ new QName(NS_STRING_SCHEMA, "positiveInteger") });
}
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java?rev=609994&r1=609993&r2=609994&view=diff
==============================================================================
---
webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
(original)
+++
webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
Tue Jan 8 06:08:20 2008
@@ -210,7 +210,7 @@
//process elements and types declared directly in this schema
-
if(!SchemaConstants.NS_URI_XSD_2001.equals(schemaDef.getTargetNamespace())) {
+
if(!SchemaConstants.NS_STRING_SCHEMA.equals(schemaDef.getTargetNamespace())) {
//XML Schema namespace is implicitly imported to get built-in
types...we don't want the elements.
//TODO detect if the XML Schema NS has been explicitly imported
(if so, we do want the elements)
buildElementDeclarations(schemaDef, schemaTns, typeSystemURI);
@@ -295,7 +295,7 @@
while (qnames.hasNext()) {
QName xstQN = (QName) qnames.next();
- if(SchemaConstants.NS_URI_XSD_2001.equals(schemaTns) &&
+ if(SchemaConstants.NS_STRING_SCHEMA.equals(schemaTns) &&
!SchemaConstants.LIST_Q_BUILT_IN_TYPES.contains(xstQN)) {
//XML Schema namespace is implicitly imported to get built-in
types...we don't want non-built-in types.
//TODO detect if the XML Schema NS has been explicitly
imported (if so, we want ALL type defs)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
