[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java ope...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 23 11:01:35 2014
New Revision: 4052

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4052&view=rev
Log:
Move some constants into SAMLConstants, and replace schema paths with pre-existing constants.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/idpdisco/DiscoveryResponse.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/MDRPI.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/Publication.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/PublicationInfo.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/PublicationPath.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationInfo.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/RegistrationPolicy.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/UsagePolicy.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyBuilder.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java?rev=4052&r1=4051&r2=4052&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java Tue Sep 23 11:01:35 2014
@@ -41,6 +41,9 @@
     /** XML core schema system Id. */
     public static final String XML_SCHEMA_LOCATION = SCHEMA_DIR + "xml.xsd";
 
+    /** XML Schema schema system Id. */
+    public static final String XSD_SCHEMA_LOCATION = SCHEMA_DIR + "XMLSchema.xsd";
+
     /** XML Signature schema Id. */
     public static final String XMLSIG_SCHEMA_LOCATION = SCHEMA_DIR + "xmldsig-core-schema.xsd";
 
@@ -57,7 +60,7 @@
     // SOAP
     // ****************************
     /** SOAP 1.1 schema Id. */
-    public static final String SOAP11ENV_SCHEMA_LOCATION = SCHEMA_DIR + SCHEMA_DIR + "soap-envelope.xsd";
+    public static final String SOAP11ENV_SCHEMA_LOCATION = SCHEMA_DIR + "soap-envelope.xsd";
 
     /** SOAP 1.1 Envelope XML namespace. */
     public static final String SOAP11ENV_NS = "http://schemas.xmlsoap.org/soap/envelope/";
@@ -203,23 +206,32 @@
     /** SAML 2.0 Condition for Delegation Restriction QName prefix. */
     public static final String SAML20DEL_PREFIX = "del";
 
-    /** SAML V2.0 Metadata Extension for Entity Attributes schema ID . */
+    /** SAML 2.0 Metadata Extension for Entity Attributes schema Id. */
     public static final String SAML20MDATTR_SCHEMA_LOCATION = SCHEMA_DIR + "sstc-metadata-attr.xsd";
 
-    /** SAML V2.0 Metadata Extension for Entity Attributes XML Namespace. */
+    /** SAML 2.0 Metadata Extension for Entity Attributes XML Namespace. */
     public static final String SAML20MDATTR_NS = "urn:oasis:names:tc:SAML:metadata:attribute";
 
-    /** SAML V2.0 Metadata Extension for Entity Attributes QName prefix. */
+    /** SAML 2.0 Metadata Extension for Entity Attributes QName prefix. */
     public static final String SAML20MDATTR_PREFIX = "mdattr";
 
-    /** SAML V2.0 Metadata Extension for Discovery and Login UI schema ID . */
+    /** SAML 2.0 Metadata Extension for Discovery and Login UI schema Id. */
     public static final String SAML20MDUI_SCHEMA_LOCATION = SCHEMA_DIR + "sstc-saml-metadata-ui-v1.0.xsd";
 
-    /** SAML V2.0 Metadata Extension for Discovery and Login UI XML Namespace. */
+    /** SAML 2.0 Metadata Extension for Discovery and Login UI XML Namespace. */
     public static final String SAML20MDUI_NS = "urn:oasis:names:tc:SAML:metadata:ui";
 
-    /** SAML V2.0 Metadata Extension for Discovery and Login UI QName prefix. */
+    /** SAML 2.0 Metadata Extension for Discovery and Login UI QName prefix. */
     public static final String SAML20MDUI_PREFIX = "mdui";
+
+    /** SAML 2.0 Metadata Extension for Registration and Publication Information schema Id. */
+    public static final String SAML20MDRPI_SCHEMA_LOCATION = SCHEMA_DIR + "saml-metadata-rpi-v1.0.xsd";
+

[... 491 lines stripped ...]