Actually set the artifact type for the outbound message (makes it work much better)

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

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
index d47b6a1..f0e9d2d 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
@@ -160,6 +160,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML1ProfileHandler {
                 AttributeQueryConfiguration profileConfig = (AttributeQueryConfiguration) rpConfig
                         .getProfileConfiguration(AttributeQueryConfiguration.PROFILE_ID);
                 requestContext.setProfileConfiguration(profileConfig);
+                requestContext.setOutboundMessageArtifactType(profileConfig.getOutboundArtifactType());
                 if (profileConfig.getSigningCredential() != null) {
                     requestContext.setOutboundSAMLMessageSigningCredential(profileConfig.getSigningCredential());
                 } else if (rpConfig.getDefaultSigningCredential() != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
index e7581d3..2023b8b 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
@@ -304,6 +304,7 @@ public class ShibbolethSSOProfileHandler extends AbstractSAML1ProfileHandler {
             ShibbolethSSOConfiguration profileConfig = (ShibbolethSSOConfiguration) rpConfig
                     .getProfileConfiguration(SSOConfiguration.PROFILE_ID);
             requestContext.setProfileConfiguration(profileConfig);
+            requestContext.setOutboundMessageArtifactType(profileConfig.getOutboundArtifactType());
             if (profileConfig.getSigningCredential() != null) {
                 requestContext.setOutboundSAMLMessageSigningCredential(profileConfig.getSigningCredential());
             } else if (rpConfig.getDefaultSigningCredential() != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
index a7f2199..325a1c2 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
@@ -157,6 +157,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML2ProfileHandler {
                 AttributeQueryConfiguration profileConfig = (AttributeQueryConfiguration) rpConfig
                         .getProfileConfiguration(AttributeQueryConfiguration.PROFILE_ID);
                 requestContext.setProfileConfiguration(profileConfig);
+                requestContext.setOutboundMessageArtifactType(profileConfig.getOutboundArtifactType());
                 if (profileConfig.getSigningCredential() != null) {
                     requestContext.setOutboundSAMLMessageSigningCredential(profileConfig.getSigningCredential());
                 } else if (rpConfig.getDefaultSigningCredential() != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
index 0df301e..ccc5479 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
@@ -317,6 +317,7 @@ public class SSOProfileHandler extends AbstractSAML2ProfileHandler {
             SSOConfiguration profileConfig = (SSOConfiguration) rpConfig
                     .getProfileConfiguration(SSOConfiguration.PROFILE_ID);
             requestContext.setProfileConfiguration(profileConfig);
+            requestContext.setOutboundMessageArtifactType(profileConfig.getOutboundArtifactType());
             if (profileConfig.getSigningCredential() != null) {
                 requestContext.setOutboundSAMLMessageSigningCredential(profileConfig.getSigningCredential());
             } else if (rpConfig.getDefaultSigningCredential() != null) {