You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2007/02/10 22:01:37 UTC
svn commit: r505764 - in /incubator/woden/branches/M7/src/org/apache/woden:
ant/CmWriter.java internal/wsdl20/InterfaceFaultImpl.java
wsdl20/InterfaceFault.java
Author: jkaputin
Date: Sat Feb 10 13:01:36 2007
New Revision: 505764
URL: http://svn.apache.org/viewvc?view=rev&rev=505764
Log:
WODEN-145 Added {message content model} property
to InterfaceFault as per spec issue CR138
Modified:
incubator/woden/branches/M7/src/org/apache/woden/ant/CmWriter.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/InterfaceFault.java
Modified: incubator/woden/branches/M7/src/org/apache/woden/ant/CmWriter.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/ant/CmWriter.java?view=diff&rev=505764&r1=505763&r2=505764
==============================================================================
--- incubator/woden/branches/M7/src/org/apache/woden/ant/CmWriter.java (original)
+++ incubator/woden/branches/M7/src/org/apache/woden/ant/CmWriter.java Sat Feb 10 13:01:36 2007
@@ -226,6 +226,7 @@
.idAttribute(component));
cmbase.write("name", component.getName());
+ out.write("messageContentModel", component.getMessageContentModel());
cmbase.writeOptionalRef("elementDeclaration", component
.getElementDeclaration());
cmbase.parent(component.getParent());
Modified: incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java?view=diff&rev=505764&r1=505763&r2=505764
==============================================================================
--- incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java (original)
+++ incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java Sat Feb 10 13:01:36 2007
@@ -41,10 +41,10 @@
{
//WSDL Component model data
private NCName fName = null;
- private ElementDeclaration fElementDeclaration = null;
//XML Element model data
- private QName fElementName = null;
+ private String fElementAttr = null; //value of the 'element' attribute info item
+ private QName fElementName = null; //present if 'element' value is of type xs:QName
/* ************************************************************
* InterfaceFault methods (i.e. WSDL Component model)
@@ -62,6 +62,32 @@
name = new QName(tns, fName.toString());
}
return name;
+ }
+
+ /*
+ * @see org.apache.woden.wsdl20.InterfaceFault#getMessageContentModel()
+ */
+ public String getMessageContentModel() {
+
+ //this property is derived from the 'element' attribute info item
+ String messageContentModel = null;
+
+ if(fElementName != null) {
+ //the 'element' attribute contains an xs:QName
+ messageContentModel = Constants.NMTOKEN_ELEMENT;
+ }
+ else if(Constants.NMTOKEN_ANY.equals(fElementAttr) ||
+ Constants.NMTOKEN_NONE.equals(fElementAttr) ||
+ Constants.NMTOKEN_OTHER.equals(fElementAttr) ) {
+ messageContentModel = fElementAttr;
+ }
+ else {
+ //'element' does not contain #any, #none, #other or an xs:QNname
+ //so it defaults to #other
+ messageContentModel = Constants.NMTOKEN_OTHER;
+ }
+
+ return messageContentModel;
}
/*
Modified: incubator/woden/branches/M7/src/org/apache/woden/wsdl20/InterfaceFault.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/InterfaceFault.java?view=diff&rev=505764&r1=505763&r2=505764
==============================================================================
--- incubator/woden/branches/M7/src/org/apache/woden/wsdl20/InterfaceFault.java (original)
+++ incubator/woden/branches/M7/src/org/apache/woden/wsdl20/InterfaceFault.java Sat Feb 10 13:01:36 2007
@@ -36,6 +36,19 @@
public QName getName();
/**
+ * Returns a String representing the {message content model} property of this
+ * InterfaceFault. This specifies a token indicating the type of message content.
+ * '#any' means any single element, '#none' means no message content,
+ * '#other' means non-XML extension type system and '#element' means
+ * XML Schema global element definition.
+ *
+ * TODO CR138 adds this property, so check Spec when its updated to ensure javadoc is accurate
+ *
+ * @return String representing the type of message content
+ */
+ public String getMessageContentModel();
+
+ /**
* Returns the ElementDeclaration representing the {element declaration} property
* of this InterfaceFault. This describes the content or "payload" of the fault.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org