[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml1md/SourceID.java opensam...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar  7 15:41:40 2013
New Revision: 3258

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3258&view=rev
Log:
OSJ-28: ported java-opensaml2 1619

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml1md/SourceID.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDUnmarshaller.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml1md/SourceID.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml1md/SourceID.java?rev=3258&r1=3257&r2=3258&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml1md/SourceID.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml1md/SourceID.java Thu Mar  7 15:41:40 2013
@@ -24,13 +24,14 @@
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 /**
- * SAML 1 Metadata extension SourceID
+ * SAML 1 Metadata extension SourceID.
  */
 public interface SourceID extends SAMLObject, XSString {
     
-    /** Element name, no namespace */
-    public final static String DEFAULT_ELEMENT_LOCAL_NAME = "SourceID";
+    /** Element name, no namespace. */
+    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SourceID";
     
-    /** Default element name */
-    public final static QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML1MD_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1MD_PREFIX);
+    /** Default element name. */
+    public static final QName DEFAULT_ELEMENT_NAME =
+            new QName(SAMLConstants.SAML1MD_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1MD_PREFIX);
 }

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java?rev=3258&r1=3257&r2=3258&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java Thu Mar  7 15:41:40 2013
@@ -26,7 +26,7 @@
  */
 public class SourceIDBuilder extends AbstractSAMLObjectBuilder<SourceID> {
 
-    /** Constructor */
+    /** Constructor. */
     public SourceIDBuilder() {
 
     }

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java?rev=3258&r1=3257&r2=3258&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java Thu Mar  7 15:41:40 2013
@@ -17,19 +17,17 @@
 
 package org.opensaml.saml.ext.saml1md.impl;
 
-import java.util.List;
 
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
+import org.opensaml.core.xml.schema.impl.XSStringImpl;
 import org.opensaml.saml.ext.saml1md.SourceID;
 
-public class SourceIDImpl extends AbstractSAMLObject implements SourceID {
-
-    /** Source ID */
-    private String sourceID;
+/**
+ * Concrete implementation of {@link SourceID}.
+ */
+public class SourceIDImpl extends XSStringImpl implements SourceID {
     
     /**
-     * Constructor
+     * Constructor.
      * 
      * @param namespaceURI the namespace the element is in
      * @param elementLocalName the local name of the XML element this Object represents
@@ -38,20 +36,4 @@
     protected SourceIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
-    
-    /** {@inheritDoc} */
-    public String getValue() {
-        return sourceID;
-    }
-
-    /** {@inheritDoc} */
-    public void setValue(String newSourceID) {
-        sourceID = prepareForAssignment(sourceID, newSourceID);
-    }
-    
-    /** {@inheritDoc} */
-    public List<XMLObject> getOrderedChildren() {
-        // no children
-        return null;
-    }
 }

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDMarshaller.java?rev=3258&r1=3257&r2=3258&view=diff

[... 63 lines stripped ...]