[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml1/core/RequestAbstractType.java op...

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Dec  1 18:17:31 2011
New Revision: 2918

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2918&view=rev
Log:
expose SAML 1 message version the same way as it's done in SAML 2

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/RequestAbstractType.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/ResponseAbstractType.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeImpl.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/ResponseAbstractTypeImpl.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/ResponseAbstractTypeMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/validator/RequestAbstractTypeSchemaValidator.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/validator/ResponseAbstractTypeSchemaValidator.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml1/core/impl/RequestTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml1/core/impl/ResponseTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/RequestAbstractType.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/RequestAbstractType.java?rev=2918&r1=2917&r2=2918&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/RequestAbstractType.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/RequestAbstractType.java Thu Dec  1 18:17:31 2011
@@ -44,20 +44,18 @@
     /** Name for the attribute which defines the Issue Instant. */
     public final static String ID_ATTRIB_NAME = "RequestID";
 
-    /**
-     * Gets the major version of this SAML message.
+    /** 
+     * Gets the SAML version of this message. 
      * 
-     * @return the major version of this SAML message
+     * @return the SAML version of this message
      */
-    public int getMajorVersion();
+    public SAMLVersion getVersion();
     
     /**
-     * Gets the minor version of this SAML message.
+     * Sets the SAML version of this message.
      * 
-     * @return the minor version of this SAML message
+     * @param version SAML version of this message
      */
-    public int getMinorVersion();
-    
     public void setVersion(SAMLVersion version);
       
     /** Get the issue instant */

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/ResponseAbstractType.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/ResponseAbstractType.java?rev=2918&r1=2917&r2=2918&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/ResponseAbstractType.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml1/core/ResponseAbstractType.java Thu Dec  1 18:17:31 2011
@@ -56,15 +56,12 @@
     /** Set the ID */
     public void setID(String id);
     
-    /** Return the Minor Version (attribute). */
-    public int getMinorVersion();
-    
     /**
-     * Gets the major version of this SAML message.
+     * Sets the SAML version for this message.
      * 
-     * @return the major version of this SAML message
+     * @return SAML version for this message
      */
-    public int getMajorVersion();
+    public SAMLVersion getVersion();
     
     /**
      * Sets the SAML version for this message.

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeImpl.java?rev=2918&r1=2917&r2=2918&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeImpl.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeImpl.java Thu Dec  1 18:17:31 2011
@@ -72,13 +72,8 @@
     }
 
     /** {@inheritDoc} */
-    public int getMajorVersion() {
-        return version.getMajorVersion();
-    }
-
-    /** {@inheritDoc} */
-    public int getMinorVersion() {
-        return version.getMinorVersion();
+    public SAMLVersion getVersion() {
+        return version;
     }
 
     /** {@inheritDoc} */

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/core/impl/RequestAbstractTypeMarshaller.java

[... 212 lines stripped ...]