Added dual version support.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1516 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/lib/opensaml-1.1.jar b/lib/opensaml-1.1.jar
index 23370e2..0c2be2c 100644 (file)
Binary files a/lib/opensaml-1.1.jar and b/lib/opensaml-1.1.jar differ

diff --git a/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java b/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java
index 8e233f0..118844c 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java
+++ b/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java
@@ -201,14 +201,7 @@ public class ShibBrowserProfile implements SAMLBrowserProfile {
 
 
     /**
-     * @see org.opensaml.SAMLBrowserProfile#setVersion(int, int)
-     */
-    public void setVersion(int major, int minor) throws SAMLException {
-        profile.setVersion(major, minor);
-    }
-
-    /**
-     * @see org.opensaml.SAMLBrowserProfile#receive(java.lang.StringBuffer, javax.servlet.http.HttpServletRequest, java.lang.String, int, org.opensaml.ReplayCache, org.opensaml.SAMLBrowserProfile.ArtifactMapper)
+     * @see org.opensaml.SAMLBrowserProfile#receive(java.lang.StringBuffer, javax.servlet.http.HttpServletRequest, java.lang.String, int, org.opensaml.ReplayCache, org.opensaml.SAMLBrowserProfile.ArtifactMapper, int)
      */
     public BrowserProfileResponse receive(
             StringBuffer issuer,
@@ -216,14 +209,15 @@ public class ShibBrowserProfile implements SAMLBrowserProfile {
             String recipient,
             int supportedProfiles,
             ReplayCache replayCache,
-            ArtifactMapper artifactMapper
+            ArtifactMapper artifactMapper,
+            int minorVersion
             ) throws SAMLException {
         
         String providerId = null;
         issuer.setLength(0);
         
         // Let SAML do all the decoding and parsing
-        BrowserProfileResponse bpr = profile.receive(issuer, reqContext, recipient, supportedProfiles, replayCache, artifactMapper);
+        BrowserProfileResponse bpr = profile.receive(issuer, reqContext, recipient, supportedProfiles, replayCache, artifactMapper, minorVersion);
         
         /*
          * Now find the Metadata for the Entity that send this assertion.

diff --git a/webApplication/WEB-INF/lib/opensaml-1.1.jar b/webApplication/WEB-INF/lib/opensaml-1.1.jar
index a8419cf..0c2be2c 100644 (file)
Binary files a/webApplication/WEB-INF/lib/opensaml-1.1.jar and b/webApplication/WEB-INF/lib/opensaml-1.1.jar differ