Author: jkaputin
Date: Tue Nov 22 05:20:19 2005
New Revision: 348169
URL: http://svn.apache.org/viewcvs?rev=348169&view=rev
Log:
Removed the methods getElementDeclaration(qname) and
getTypeDefinition(qname) from the TypesElement API
and made them non-API public methods on TypesImpl. These
are required internally by the implementation, but we
don't yet have specific use cases that require
them on the API. This may change later when we consider
the WSDL creation/editing use cases, so I have put some
TODO comments in the code.
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java?rev=348169&r1=348168&r2=348169&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
Tue Nov 22 05:20:19 2005
@@ -40,7 +40,7 @@
//XML Element model data
private QName fElementName = null;
- private TypesElement fTypes = null;
+ private TypesImpl fTypes = null;
/* ************************************************************
* InterfaceFault methods (i.e. WSDL Component model)
@@ -120,7 +120,7 @@
}
public void setTypes(TypesElement types) {
- fTypes = types;
+ fTypes = (TypesImpl)types;
}
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java?rev=348169&r1=348168&r2=348169&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
Tue Nov 22 05:20:19 2005
@@ -42,7 +42,7 @@
//XML Element model data
private QName fElementName = null;
- private TypesElement fTypes = null;
+ private TypesImpl fTypes = null;
/* ************************************************************
* InterfaceMessageReference methods (the WSDL Component model)
@@ -147,7 +147,7 @@
}
public void setTypes(TypesElement types) {
- fTypes = types;
+ fTypes = (TypesImpl)types;
}
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java?rev=348169&r1=348168&r2=348169&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
Tue Nov 22 05:20:19 2005
@@ -46,7 +46,7 @@
private QName fConstraintName = null;
private boolean fHasValueToken = false; //true if <constraint>='#value'
- private TypesElement fTypes = null;
+ private TypesImpl fTypes = null;
/* ************************************************************
* Property interface methods (the WSDL Component model)
@@ -170,6 +170,6 @@
}
public void setTypes(TypesElement types) {
- fTypes = types;
+ fTypes = (TypesImpl)types;
}
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java?rev=348169&r1=348168&r2=348169&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
Tue Nov 22 05:20:19 2005
@@ -115,8 +115,24 @@
return fSchemaMap;
}
- /*
- * @see
org.apache.woden.wsdl20.xml.TypesElement#getElementDeclaration(javax.xml.namespace.QName)
+ /* ************************************************************
+ * Non-API implementation methods
+ * ************************************************************/
+
+ /*
+ * TODO decide if this should be on the API or just left as a public impl
method.
+ *
+ * Returns the schema element declaration identified by the QName,
+ * providing the element declaration is referenceable to the
+ * WSDL description (i.e. visible). This means it must exist in a
+ * Schema that has been inlined or resolved from a schema import
+ * within the <.types>. element according to the schema
+ * referenceability rules in the WSDL 2.0 spec.
+ * If the element declaration is not referenceable, null is returned.
+ * If validation is disabled, the referenceability rules do not apply
+ * so all schemas are considered referenceable by the WSDL.
+ *
+ * TODO tbd - @see
org.apache.woden.wsdl20.xml.TypesElement#getElementDeclaration(javax.xml.namespace.QName)
*/
public XmlSchemaElement getElementDeclaration(QName qname)
{
@@ -139,7 +155,19 @@
}
/*
- * @see
org.apache.woden.wsdl20.xml.TypesElement#getTypeDefinition(javax.xml.namespace.QName)
+ * TODO decide if this should be on the API or just left as a public impl
method.
+ *
+ * Returns the schema type definition identified by the QName,
+ * providing the type definition is referenceable by the
+ * WSDL description (i.e. visible). This means it must exist in a
+ * Schema that has been inlined or resolved from a schema import
+ * within the <.types>. element according to the schema
+ * referenceability rules in the WSDL 2.0 spec.
+ * If the type definition is not referenceable, null is returned.
+ * If validation is disabled, the referenceability rules do not apply
+ * so all schemas are considered referenceable by the WSDL.
+ *
+ * TODO tbd - @see
org.apache.woden.wsdl20.xml.TypesElement#getTypeDefinition(javax.xml.namespace.QName)
*/
public XmlSchemaType getTypeDefinition(QName qname)
{
@@ -160,10 +188,6 @@
}
return xmlSchemaType;
}
-
- /* ************************************************************
- * Non-API implementation methods
- * ************************************************************/
/*
* Returns a List of XmlSchema objects for all schemas that are
referenceable
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java?rev=348169&r1=348168&r2=348169&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java Tue
Nov 22 05:20:19 2005
@@ -18,11 +18,7 @@
import java.net.URI;
import java.util.Map;
-import javax.xml.namespace.QName;
-
import org.apache.woden.schema.Schema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
/**
* This interface represents the <wsdl:types> element.
@@ -93,36 +89,6 @@
//public Schema[] getSchemas(String namespace);
//public void removeSchemas(String namespace);
- /**
- * Returns the schema element declaration identified by the QName,
- * providing the element declaration is referenceable to the
- * WSDL description (i.e. visible). This means it must exist in a
- * Schema that has been inlined or resolved from a schema import
- * within the <.types>. element according to the schema
- * referenceability rules in the WSDL 2.0 spec.
- * If the element declaration is not referenceable, null is returned.
- * If validation is disabled, the referenceability rules do not apply
- * so all schemas are considered referenceable by the WSDL.
- *
- * @return the XmlSchemaElement identified by the QName
- */
- public XmlSchemaElement getElementDeclaration(QName qname);
-
- /**
- * Returns the schema type definition identified by the QName,
- * providing the type definition is referenceable by the
- * WSDL description (i.e. visible). This means it must exist in a
- * Schema that has been inlined or resolved from a schema import
- * within the <.types>. element according to the schema
- * referenceability rules in the WSDL 2.0 spec.
- * If the type definition is not referenceable, null is returned.
- * If validation is disabled, the referenceability rules do not apply
- * so all schemas are considered referenceable by the WSDL.
- *
- * @return the XmlSchemaType identified by the QName
- */
- public XmlSchemaType getTypeDefinition(QName qname);
-
//TODO methods to add/get/remove extension elements ... i.e. for other
type systems
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
