Author: hughesj
Date: Thu Sep 28 04:59:15 2006
New Revision: 450818
URL: http://svn.apache.org/viewvc?view=rev&rev=450818
Log:
WODEN-8: {message label} now represented as an NCName rather than an enumeration
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultReferenceImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingMessageReferenceImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java
incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceFaultReference.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceMessageReference.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/enumeration/MessageLabel.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingFaultReferenceElement.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingMessageReferenceElement.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceFaultReferenceElement.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceMessageReferenceElement.java
incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTests.java
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
Thu Sep 28 04:59:15 2006
@@ -1005,14 +1005,7 @@
String msgLabel = DOMUtils.getAttribute(faultRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null)
{
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- faultRef.setMessageLabel(MessageLabel.IN);
- } else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- faultRef.setMessageLabel(MessageLabel.OUT);
- } else {
- //invalid value, but capture it anyway.
- faultRef.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ faultRef.setMessageLabel(new NCName(msgLabel));
}
parseExtensionAttributes(faultRefEl,
InterfaceFaultReferenceElement.class, faultRef, desc);
@@ -1064,14 +1057,7 @@
String msgLabel = DOMUtils.getAttribute(msgRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null)
{
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- message.setMessageLabel(MessageLabel.IN);
- } else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- message.setMessageLabel(MessageLabel.OUT);
- } else {
- //invalid value, but capture it anyway.
- message.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ message.setMessageLabel(new NCName(msgLabel));
}
else
{
@@ -1393,14 +1379,7 @@
String msgLabel = DOMUtils.getAttribute(faultRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null)
{
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- faultRef.setMessageLabel(MessageLabel.IN);
- } else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- faultRef.setMessageLabel(MessageLabel.OUT);
- } else {
- //invalid value, but capture it anyway.
- faultRef.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ faultRef.setMessageLabel(new NCName(msgLabel));
}
parseExtensionAttributes(faultRefEl,
BindingFaultReferenceElement.class, faultRef, desc);
@@ -1459,14 +1438,7 @@
String msgLabel = DOMUtils.getAttribute(msgRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null)
{
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- message.setMessageLabel(MessageLabel.IN);
- } else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- message.setMessageLabel(MessageLabel.OUT);
- } else {
- //invalid value, but capture it anyway.
- message.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ message.setMessageLabel(new NCName(msgLabel));
}
else
{
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
Thu Sep 28 04:59:15 2006
@@ -15,6 +15,20 @@
*/
package org.apache.woden.internal;
+import java.io.ByteArrayInputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.woden.ErrorHandler;
@@ -63,19 +77,6 @@
import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.xml.sax.InputSource;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayInputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* Implements WSDL reader behaviour for OM based parsing
*/
@@ -522,16 +523,7 @@
String msgLabel = OMUtils.getAttribute(faultRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null){
- if(msgLabel.equals(MessageLabel.IN.toString())){
- faultRef.setMessageLabel(MessageLabel.IN);
- }
- else if(msgLabel.equals(MessageLabel.OUT.toString())){
- faultRef.setMessageLabel(MessageLabel.OUT);
- }
- else {
- //invalid value, but capture it anyway.
- faultRef.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ faultRef.setMessageLabel(new NCName(msgLabel));
}
parseExtensionAttributes(faultRefEl,
BindingFaultReferenceElement.class, faultRef, desc);
@@ -575,16 +567,7 @@
String msgLabel = OMUtils.getAttribute(msgRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null){
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- message.setMessageLabel(MessageLabel.IN);
- }
- else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- message.setMessageLabel(MessageLabel.OUT);
- }
- else {
- //invalid value, but capture it anyway.
- message.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ message.setMessageLabel(new NCName(msgLabel));
}
else{
//TODO this is a temp fix, correct action to use MEP to determine
default
@@ -825,16 +808,7 @@
String msgLabel = OMUtils.getAttribute(faultRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null){
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- faultRef.setMessageLabel(MessageLabel.IN);
- }
- else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- faultRef.setMessageLabel(MessageLabel.OUT);
- }
- else {
- //invalid value, but capture it anyway.
- faultRef.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ faultRef.setMessageLabel(new NCName(msgLabel));
}
parseExtensionAttributes(faultRefEl,
InterfaceFaultReferenceElement.class, faultRef, desc);
@@ -879,16 +853,7 @@
String msgLabel = OMUtils.getAttribute(msgRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null){
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- message.setMessageLabel(MessageLabel.IN);
- }
- else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- message.setMessageLabel(MessageLabel.OUT);
- }
- else {
- //invalid value, but capture it anyway.
- message.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ message.setMessageLabel(new NCName(msgLabel));
}
else{
//TODO this is a temp fix, correct action to use MEP to determine
default
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultReferenceImpl.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultReferenceImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultReferenceImpl.java
Thu Sep 28 04:59:15 2006
@@ -17,13 +17,13 @@
import javax.xml.namespace.QName;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.BindingFaultReference;
import org.apache.woden.wsdl20.BindingOperation;
import org.apache.woden.wsdl20.InterfaceFault;
import org.apache.woden.wsdl20.InterfaceFaultReference;
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.xml.BindingFaultReferenceElement;
import org.apache.woden.wsdl20.xml.BindingOperationElement;
import org.apache.woden.wsdl20.xml.InterfaceFaultReferenceElement;
@@ -41,7 +41,7 @@
{
private QName fRef = null;
private Direction fDirection = null;
- private MessageLabel fMessageLabel = null;
+ private NCName fMessageLabel = null;
/* ************************************************************
* BindingFaultReference interface methods (i.e. WSDL Component model)
@@ -77,7 +77,7 @@
if(intOp != null)
{
//Determine the "effective" msg label for this binding fault
ref.
- MessageLabel effectiveMsgLabel = null;
+ NCName effectiveMsgLabel = null;
if(fMessageLabel != null)
{
effectiveMsgLabel = fMessageLabel;
@@ -171,14 +171,14 @@
/* (non-Javadoc)
* @see
org.apache.woden.wsdl20.xml.BindingFaultReferenceElement#setMessageLabel(org.apache.woden.wsdl20.enumeration.MessageLabel)
*/
- public void setMessageLabel(MessageLabel msgLabel) {
+ public void setMessageLabel(NCName msgLabel) {
fMessageLabel = msgLabel;
}
/* (non-Javadoc)
* @see
org.apache.woden.wsdl20.xml.BindingFaultReferenceElement#getMessageLabel()
*/
- public MessageLabel getMessageLabel() {
+ public NCName getMessageLabel() {
return fMessageLabel;
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingMessageReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingMessageReferenceImpl.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingMessageReferenceImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingMessageReferenceImpl.java
Thu Sep 28 04:59:15 2006
@@ -15,12 +15,12 @@
*/
package org.apache.woden.internal.wsdl20;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.BindingMessageReference;
import org.apache.woden.wsdl20.BindingOperation;
import org.apache.woden.wsdl20.InterfaceMessageReference;
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.xml.BindingMessageReferenceElement;
/**
@@ -35,7 +35,7 @@
BindingMessageReferenceElement
{
private Direction fDirection = null;
- private MessageLabel fMessageLabel = null;
+ private NCName fMessageLabel = null;
/* ************************************************************
* BindingMessageReference interface methods (i.e. WSDL Component model)
@@ -67,7 +67,7 @@
if(intOp != null)
{
//Determine the "effective" msg label for this binding msg ref.
- MessageLabel effectiveMsgLabel = null;
+ NCName effectiveMsgLabel = null;
if(fMessageLabel != null)
{
effectiveMsgLabel = fMessageLabel;
@@ -122,14 +122,14 @@
/* (non-Javadoc)
* @see
org.apache.woden.wsdl20.xml.BindingMessageReferenceElement#setMessageLabel(org.apache.woden.wsdl20.enumeration.MessageLabel)
*/
- public void setMessageLabel(MessageLabel msgLabel) {
+ public void setMessageLabel(NCName msgLabel) {
fMessageLabel = msgLabel;
}
/* (non-Javadoc)
* @see
org.apache.woden.wsdl20.xml.BindingMessageReferenceElement#getMessageLabel()
*/
- public MessageLabel getMessageLabel() {
+ public NCName getMessageLabel() {
return fMessageLabel;
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
Thu Sep 28 04:59:15 2006
@@ -17,12 +17,12 @@
import javax.xml.namespace.QName;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.InterfaceFault;
import org.apache.woden.wsdl20.InterfaceFaultReference;
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.xml.InterfaceElement;
import org.apache.woden.wsdl20.xml.InterfaceFaultElement;
import org.apache.woden.wsdl20.xml.InterfaceFaultReferenceElement;
@@ -39,7 +39,7 @@
implements InterfaceFaultReference,
InterfaceFaultReferenceElement
{
- private MessageLabel fMessageLabel = null;
+ private NCName fMessageLabel = null;
private Direction fDirection = null;
private QName fRef = null;
@@ -62,7 +62,7 @@
* @see org.apache.woden.wsdl20.InterfaceFaultReference#getMessageLabel()
* @see
org.apache.woden.wsdl20.xml.InterfaceFaultReferenceElement#getMessageLabel()
*/
- public MessageLabel getMessageLabel() {
+ public NCName getMessageLabel() {
return fMessageLabel;
}
@@ -112,7 +112,7 @@
/* (non-Javadoc)
* @see
org.apache.woden.wsdl20.xml.FaultReferenceElement#setMessageLabel(org.apache.woden.wsdl20.enumeration.MessageLabel)
*/
- public void setMessageLabel(MessageLabel msgLabel) {
+ public void setMessageLabel(NCName msgLabel) {
fMessageLabel = msgLabel;
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
Thu Sep 28 04:59:15 2006
@@ -17,13 +17,13 @@
import javax.xml.namespace.QName;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.ElementDeclaration;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.InterfaceMessageReference;
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.apache.woden.wsdl20.xml.InterfaceElement;
import org.apache.woden.wsdl20.xml.InterfaceMessageReferenceElement;
@@ -42,7 +42,7 @@
InterfaceMessageReferenceElement
{
//WSDL Component model data
- private MessageLabel fMessageLabel = null;
+ private NCName fMessageLabel = null;
private Direction fDirection = null;
private String fMessageContentModel = null;
@@ -58,7 +58,7 @@
* @see org.apache.woden.wsdl20.InterfaceMessageReference#getMessageLabel()
* @see
org.apache.woden.wsdl20.xml.InterfaceMessageReferenceElement#getMessageLabel()
*/
- public MessageLabel getMessageLabel() {
+ public NCName getMessageLabel() {
return fMessageLabel;
}
@@ -104,7 +104,7 @@
/* (non-Javadoc)
* @see
org.apache.woden.wsdl20.xml.InterfaceMessageReferenceElement#setMessageLabel(org.apache.woden.wsdl20.enumeration.MessageLabel)
*/
- public void setMessageLabel(MessageLabel msgLabel) {
+ public void setMessageLabel(NCName msgLabel) {
fMessageLabel = msgLabel;
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidator.java
Thu Sep 28 04:59:15 2006
@@ -43,7 +43,6 @@
import org.apache.woden.wsdl20.Property;
import org.apache.woden.wsdl20.Service;
import org.apache.woden.wsdl20.WSDLComponent;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
/**
* The WSDL component validator can validate a WSDL 2.0 component model
@@ -621,7 +620,7 @@
int numMessageReferences = messageReferences.length;
for(int i = 0; i < numMessageReferences; i++)
{
- MessageLabel messageLabel = messageReferences[i].getMessageLabel();
+ NCName messageLabel = messageReferences[i].getMessageLabel();
if(messageLabels.contains(messageLabel))
{
errorReporter.reportError(new ErrorLocatorImpl(),
"InterfaceMessageReference-0042", new Object[]{messageLabel},
ErrorReporter.SEVERITY_ERROR);
@@ -654,7 +653,7 @@
for(int i = 0; i < numFaultReferences; i++)
{
InterfaceFault fault = faultReferences[i].getInterfaceFault();
- MessageLabel messageLabel = faultReferences[i].getMessageLabel();
+ NCName messageLabel = faultReferences[i].getMessageLabel();
if(fault == null || messageLabel == null)
continue;
List messageLabels = (List)identifiers.get(fault);
Modified: incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java Thu Sep
28 04:59:15 2006
@@ -79,5 +79,28 @@
{
return fValue;
}
+
+ public boolean equals(Object that) {
+ // If the two object ids are the same then comparing with itself
+ if (this==that) return true;
+
+ // if 'that' isn't an instance of NCName then not equal.
+ // implicitly tests for 'that' being null
+ if (!(that instanceof NCName)) return false;
+
+ NCName thatN = (NCName)that;
+
+ // NCName's value can be null so if both fValues are null they are
equal
+ if (this.fValue == null && thatN.fValue == null) return true;
+
+ // if either the fValues are null then the other one isn't so return
false
+ if (this.fValue == null || thatN.fValue == null) return false;
+
+ // Now that neither fValues are null, compare them
+ if (this.fValue.equals(thatN.fValue)) return true;
+
+ return false;
+
+ }
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceFaultReference.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceFaultReference.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceFaultReference.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceFaultReference.java
Thu Sep 28 04:59:15 2006
@@ -15,8 +15,8 @@
*/
package org.apache.woden.wsdl20;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.xml.InterfaceFaultReferenceElement;
/**
@@ -29,7 +29,7 @@
public InterfaceFault getInterfaceFault();
- public MessageLabel getMessageLabel();
+ public NCName getMessageLabel();
public Direction getDirection();
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceMessageReference.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceMessageReference.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceMessageReference.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/InterfaceMessageReference.java
Thu Sep 28 04:59:15 2006
@@ -15,8 +15,8 @@
*/
package org.apache.woden.wsdl20;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.xml.InterfaceMessageReferenceElement;
@@ -25,7 +25,7 @@
*/
public interface InterfaceMessageReference extends NestedComponent,
ConfigurableComponent {
- public MessageLabel getMessageLabel();
+ public NCName getMessageLabel();
public Direction getDirection();
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/enumeration/MessageLabel.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/enumeration/MessageLabel.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/enumeration/MessageLabel.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/enumeration/MessageLabel.java
Thu Sep 28 04:59:15 2006
@@ -15,92 +15,18 @@
*/
package org.apache.woden.wsdl20.enumeration;
+import org.apache.woden.types.NCName;
+
/**
* This class defines the values of the {message label} property of
- * InterfaceMessageReference and InterfaceFaultReference. This property
- * identifies the role the message plays in the message exchange pattern
- * associated with the parent InterfaceOperation.
- * The property is represented in XML by the <code>messageLabel</code>
- * attribute of the <input>, <output>, <infault> and
- * <outfault> elements.
- * <p>
- * The valid <code>messageLabel</code> values are:
- * <ul>
- * <li>"In" - represented by the constant IN
- * <li>"Out" - represented by the constant OUT
- * </ul>
- * This class uses the typesafe enum pattern. Applications should use the
- * public static final constants defined in this class to specify or to
- * evaluate a message label.
- * <p>
- * Examples:
- * <pre>
- * msgRef.setMessageLabel(MessageLabel.IN);
- * if(msgRef.getMessageLabel() == MessageLabel.IN) ...
- * if(msgRef.getMessageLabel().equals(MessageLabel.IN)) ...
- * </pre>
- * Valid MessageLabels are Singletons, so <tt>==</tt> and <tt>.equals</tt> are
gauranteed
- * to return the same result.
- * <p>
- * If a <tt>messageLabel</tt> attribute in the WSDL specifies an invalid value
- * (i.e. not represented by a constant), it may still be useful to capture
this
- * value for reporting purposes. Use the public static method
<tt>invalidValue(String)</tt>
- * for this purpose.
- * Invalid MessageLabels are not Singletons, so <tt>.equals</tt> is overridden
to compare
- * string contents for invalid MessageLabels and <tt>==</tt> is not gauranteed
to return the same
- * result as <tt>.equals</tt>.
- * <p>
- * TODO consider using a singleton map of invalid MessageLabels keyed by
intern() strings
- * so that '==' and '.equals' will return the same result, as they do for
valid MessageLabels
- * (i.e. remove the .equals() override and use object refs instead).
- * <p>
- * TODO if extensibility is required, chg ctor to protected
- * <p>
- * TODO confirm that 'isValid()' is needed as a public method on the API
- *
- * @author [EMAIL PROTECTED]
+ * InterfaceMessageReference and InterfaceFaultReference as used in the
+ * WSDL 2.0 specification. Other NCName values are also valid.
+
+ * @author [EMAIL PROTECTED], [EMAIL PROTECTED]
*/
public class MessageLabel
{
- public static final MessageLabel IN = new MessageLabel("In");
- public static final MessageLabel OUT = new MessageLabel("Out");
-
- public static final MessageLabel invalidValue(String value) {
- return new MessageLabel(value.intern(), false);
- }
-
- private final String fValue;
- private boolean fValid = true;
-
- private MessageLabel(String value) {
- this(value, true);
- }
-
- private MessageLabel(String value, boolean valid) {
- fValue = value;
- fValid = valid;
- }
-
- public String toString() {return fValue;}
- public boolean isValid() {return fValid;}
-
- public boolean equals(MessageLabel other)
- {
- if(fValid)
- {
- //valid MessageLabel is Singleton, so compare object refs
- return this == other;
- }
- else
- {
- //invalid MessageLabel is not Singleton, so compare contents
- if(other != null) {
- return this.fValue == other.toString();
- } else {
- return false;
- }
- }
- }
-
+ public static final NCName IN = new NCName("In");
+ public static final NCName OUT = new NCName("Out");
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingFaultReferenceElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingFaultReferenceElement.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingFaultReferenceElement.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingFaultReferenceElement.java
Thu Sep 28 04:59:15 2006
@@ -17,7 +17,7 @@
import javax.xml.namespace.QName;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
+import org.apache.woden.types.NCName;
/**
* This interface represents the <infault> and <outfault>
@@ -48,6 +48,6 @@
*/
public InterfaceFaultReferenceElement getInterfaceFaultReferenceElement();
- public void setMessageLabel(MessageLabel msgLabel);
- public MessageLabel getMessageLabel();
+ public void setMessageLabel(NCName msgLabel);
+ public NCName getMessageLabel();
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingMessageReferenceElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingMessageReferenceElement.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingMessageReferenceElement.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/BindingMessageReferenceElement.java
Thu Sep 28 04:59:15 2006
@@ -15,8 +15,8 @@
*/
package org.apache.woden.wsdl20.xml;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
/**
* This interface represents the <input> and <output>
@@ -31,6 +31,6 @@
public void setDirection(Direction dir);
public Direction getDirection();
- public void setMessageLabel(MessageLabel msgLabel);
- public MessageLabel getMessageLabel();
+ public void setMessageLabel(NCName msgLabel);
+ public NCName getMessageLabel();
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceFaultReferenceElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceFaultReferenceElement.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceFaultReferenceElement.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceFaultReferenceElement.java
Thu Sep 28 04:59:15 2006
@@ -17,8 +17,8 @@
import javax.xml.namespace.QName;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
/**
* This interface represents the <infault> and <outfault>
@@ -49,8 +49,8 @@
*/
public InterfaceFaultElement getInterfaceFaultElement();
- public void setMessageLabel(MessageLabel msgLabel);
- public MessageLabel getMessageLabel();
+ public void setMessageLabel(NCName msgLabel);
+ public NCName getMessageLabel();
public void setDirection(Direction dir);
public Direction getDirection();
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceMessageReferenceElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceMessageReferenceElement.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceMessageReferenceElement.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/InterfaceMessageReferenceElement.java
Thu Sep 28 04:59:15 2006
@@ -17,8 +17,8 @@
import javax.xml.namespace.QName;
+import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.ws.commons.schema.XmlSchemaElement;
/**
@@ -31,8 +31,8 @@
ConfigurableElement,
NestedElement
{
- public void setMessageLabel(MessageLabel msgLabel);
- public MessageLabel getMessageLabel();
+ public void setMessageLabel(NCName msgLabel);
+ public NCName getMessageLabel();
public void setMessageContentModel(String nmToken);
public String getMessageContentModel();
Modified:
incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTests.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTests.java?view=diff&rev=450818&r1=450817&r2=450818
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTests.java
(original)
+++ incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTests.java
Thu Sep 28 04:59:15 2006
@@ -15,6 +15,7 @@
*/
package org.apache.woden.tests;
+import org.apache.woden.types.NCNameTest;
import org.apache.woden.wsdl20.xml.ChildElementCreationTest;
import junit.framework.Test;
@@ -46,6 +47,7 @@
addTest(AllWodenTestsDOM.suite());
addTest(AllWodenTestsOM.suite());
addTest(ChildElementCreationTest.suite());
+ addTest(NCNameTest.suite());
//TODO in-progress 30May06 tests for BindingOpExt and BindingMsgRefExt
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
