[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 23 12:10:28 2014
New Revision: 4053

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4053&view=rev
Log:
OSJ-92 -  LocalizedURI classes are inheriting from LocalizedName and XSString

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/LocalizedURI.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIUnmarshaller.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java?rev=4053&r1=4052&r2=4053&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java Tue Sep 23 12:10:28 2014
@@ -20,7 +20,7 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.saml2.metadata.LocalizedName;
+import org.opensaml.saml.saml2.metadata.LocalizedURI;
 
 /**
  * Representation of the <code>&lt;mdrpi:RegistrationPolicy&gt</code> element. <br/>
@@ -29,7 +29,7 @@
  * /saml/Post2.0/saml-metadata-rpi/v1.0/</a>
  */
 // Checkstyle: InterfaceIsType OFF
-public interface RegistrationPolicy extends LocalizedName {
+public interface RegistrationPolicy extends LocalizedURI {
 
     /** Name of the element inside the Extensions. */
     public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RegistrationPolicy";

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/LocalizedURI.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/LocalizedURI.java?rev=4053&r1=4052&r2=4053&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/LocalizedURI.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/LocalizedURI.java Tue Sep 23 12:10:28 2014
@@ -18,15 +18,15 @@
 package org.opensaml.saml.saml2.metadata;
 
 import org.opensaml.core.xml.LangBearing;
-import org.opensaml.core.xml.schema.XSString;
+import org.opensaml.core.xml.schema.XSURI;
 import org.opensaml.saml.common.SAMLObject;
 
 /**
- * LocalizedName.
+ * LocalizedURI.
  */
-public interface LocalizedURI extends XSString, LangBearing, SAMLObject {
+public interface LocalizedURI extends XSURI, LangBearing, SAMLObject {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "localizedNameType"; 
+    public static final String TYPE_LOCAL_NAME = "localizedURIType"; 
         
-}
+}

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java?rev=4053&r1=4052&r2=4053&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java Tue Sep 23 12:10:28 2014
@@ -21,15 +21,15 @@
 
 import org.opensaml.core.xml.LangBearing;
 import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.schema.impl.XSStringImpl;
-import org.opensaml.saml.saml2.metadata.LocalizedName;
+import org.opensaml.core.xml.schema.impl.XSURIImpl;
+import org.opensaml.saml.saml2.metadata.LocalizedURI;
 
 import com.google.common.base.Strings;
 
 /**
- * Concrete implementation of {@link org.opensaml.saml.saml2.metadata.LocalizedName}.
+ * Concrete implementation of {@link LocalizedURI}.
  */
-public class LocalizedURIImpl extends XSStringImpl implements LocalizedName {
+public class LocalizedURIImpl extends XSURIImpl implements LocalizedURI {
 
     /** Language. */
     private String language;

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java?rev=4053&r1=4052&r2=4053&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java (original)

[... 73 lines stripped ...]