[java-opensaml COMMIT] in /trunk: opensaml-soap-api/src/main/java/org/opensaml/ws/wstrust/OnBehalfOf.java opensaml-so...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Mar 28 20:39:28 2012
New Revision: 2963

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2963&view=rev
Log:
Fix misimplemented schema of WS-Trust OnBehalfOf.

Modified:
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/wstrust/OnBehalfOf.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfImpl.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfUnmarshaller.java

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/wstrust/OnBehalfOf.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/wstrust/OnBehalfOf.java?rev=2963&r1=2962&r2=2963&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/wstrust/OnBehalfOf.java (original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/wstrust/OnBehalfOf.java Wed Mar 28 20:39:28 2012
@@ -19,7 +19,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.ElementExtensibleXMLObject;
 
 /**
  * The wst:OnBehalfOf element.
@@ -27,7 +27,7 @@
  * @see "WS-Trust 1.3, Chapter 9.1 On-Behalf-Of Parameters."
  * 
  */
-public interface OnBehalfOf extends WSTrustObject {
+public interface OnBehalfOf extends ElementExtensibleXMLObject, WSTrustObject {
 
     /** Element local name. */
     public static final String ELEMENT_LOCAL_NAME = "OnBehalfOf";
@@ -43,18 +43,4 @@
     public static final QName TYPE_NAME = 
         new QName(WSTrustConstants.WST_NS, TYPE_LOCAL_NAME, WSTrustConstants.WST_PREFIX);
     
-    /**
-     * Get the unknown child element.
-     * 
-     * @return the child element
-     */
-    public XMLObject getUnknownXMLObject();
-    
-    /**
-     * Set the unknown child element.
-     * 
-     * @param unknownObject the new child element
-     */
-    public void setUnknownXMLObject(XMLObject unknownObject);
-    
 }

Modified: trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfImpl.java?rev=2963&r1=2962&r2=2963&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfImpl.java (original)
+++ trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfImpl.java Wed Mar 28 20:39:28 2012
@@ -21,8 +21,11 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import org.opensaml.ws.wstrust.OnBehalfOf;
 import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.util.IndexedXMLObjectChildrenList;
 
 /**
  * OnBehalfOfImpl.
@@ -30,8 +33,8 @@
  */
 public class OnBehalfOfImpl extends AbstractWSTrustObject implements OnBehalfOf {
     
-    /** Wildcard child element. */
-    private XMLObject unknownChild;
+    /** Wildcard child elements. */
+    private IndexedXMLObjectChildrenList<XMLObject> unknownChildren;
 
     /**
      * Constructor.
@@ -42,24 +45,24 @@
      */
     public OnBehalfOfImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
+        unknownChildren = new IndexedXMLObjectChildrenList<XMLObject>(this);
     }
 
     /** {@inheritDoc} */
-    public XMLObject getUnknownXMLObject() {
-        return unknownChild;
+    public List<XMLObject> getUnknownXMLObjects() {
+        return unknownChildren;
     }
 
     /** {@inheritDoc} */
-    public void setUnknownXMLObject(XMLObject unknownObject) {
-        unknownChild = prepareForAssignment(unknownChild, unknownObject);
+    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+        return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
-
+    
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         List<XMLObject> children = new ArrayList<XMLObject>();
-        if (unknownChild != null) {
-            children.add(unknownChild);
-        }
+        children.addAll(unknownChildren);
         return Collections.unmodifiableList(children);
     }
+
 }

Modified: trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfUnmarshaller.java?rev=2963&r1=2962&r2=2963&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfUnmarshaller.java (original)
+++ trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/wstrust/impl/OnBehalfOfUnmarshaller.java Wed Mar 28 20:39:28 2012
@@ -32,7 +32,7 @@
     protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject) 
             throws UnmarshallingException {

[... 7 lines stripped ...]