[java-idp-testbed COMMIT] in /trunk/src/main/java: common/MockPopulateContextData.java idp/EncodeSAMLMessageFromBindi...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec 30 12:02:59 2013
New Revision: 105

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=105&view=rev
Log:
Rename of SAML messaging contexts (Saml to SAML)

Modified:
    trunk/src/main/java/common/MockPopulateContextData.java
    trunk/src/main/java/idp/EncodeSAMLMessageFromBindingURI.java
    trunk/src/main/java/idp/PrepareOutboundMessageContext.java
    trunk/src/main/java/sp/Saml2Controller.java

Modified: trunk/src/main/java/common/MockPopulateContextData.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/common/MockPopulateContextData.java?rev=105&r1=104&r2=105&view=diff
==============================================================================
--- trunk/src/main/java/common/MockPopulateContextData.java (original)
+++ trunk/src/main/java/common/MockPopulateContextData.java Mon Dec 30 12:02:59 2013
@@ -9,8 +9,8 @@
 import org.opensaml.messaging.handler.AbstractMessageHandler;
 import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.saml.common.SAMLObject;
-import org.opensaml.saml.common.messaging.context.SamlPeerEntityContext;
-import org.opensaml.saml.common.messaging.context.SamlProtocolContext;
+import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
+import org.opensaml.saml.common.messaging.context.SAMLProtocolContext;
 
 public class MockPopulateContextData extends AbstractMessageHandler<SAMLObject> {
 	
@@ -53,8 +53,8 @@
 	}
 	
 	protected void doInvoke(MessageContext<SAMLObject> messageContext) throws MessageHandlerException {
-		messageContext.getSubcontext(SamlProtocolContext.class, true).setProtocol(samlProtocol);
-		messageContext.getSubcontext(SamlPeerEntityContext.class, true).setRole(peerSamlRole);
+		messageContext.getSubcontext(SAMLProtocolContext.class, true).setProtocol(samlProtocol);
+		messageContext.getSubcontext(SAMLPeerEntityContext.class, true).setRole(peerSamlRole);
 	}
 	
 }

Modified: trunk/src/main/java/idp/EncodeSAMLMessageFromBindingURI.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/idp/EncodeSAMLMessageFromBindingURI.java?rev=105&r1=104&r2=105&view=diff
==============================================================================
--- trunk/src/main/java/idp/EncodeSAMLMessageFromBindingURI.java (original)
+++ trunk/src/main/java/idp/EncodeSAMLMessageFromBindingURI.java Mon Dec 30 12:02:59 2013
@@ -36,7 +36,7 @@
 import org.opensaml.profile.ProfileException;
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.saml.common.messaging.context.SamlBindingContext;
+import org.opensaml.saml.common.messaging.context.SAMLBindingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.webflow.execution.RequestContext;
@@ -148,7 +148,7 @@
     }
     
     private MessageEncoder lookupMessageEncoder(ProfileRequestContext profileRequestContext) throws ProfileException {
-    	SamlBindingContext bindingContext = profileRequestContext.getOutboundMessageContext().getSubcontext(SamlBindingContext.class, false);
+    	SAMLBindingContext bindingContext = profileRequestContext.getOutboundMessageContext().getSubcontext(SAMLBindingContext.class, false);
     	if (bindingContext == null || bindingContext.getBindingUri() == null) {
     		throw new ProfileException("Binding URI was not available, unable to lookup message encoder");
     	}

Modified: trunk/src/main/java/idp/PrepareOutboundMessageContext.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/idp/PrepareOutboundMessageContext.java?rev=105&r1=104&r2=105&view=diff
==============================================================================
--- trunk/src/main/java/idp/PrepareOutboundMessageContext.java (original)
+++ trunk/src/main/java/idp/PrepareOutboundMessageContext.java Mon Dec 30 12:02:59 2013
@@ -9,9 +9,9 @@
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.binding.SAMLBindingSupport;
-import org.opensaml.saml.common.messaging.context.SamlBindingContext;
-import org.opensaml.saml.common.messaging.context.SamlEndpointContext;
-import org.opensaml.saml.common.messaging.context.SamlPeerEntityContext;
+import org.opensaml.saml.common.messaging.context.SAMLBindingContext;
+import org.opensaml.saml.common.messaging.context.SAMLEndpointContext;
+import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.metadata.AssertionConsumerService;
@@ -64,10 +64,10 @@
 		
 		MessageContext<SAMLObject> messageContext = profileRequestContext.getOutboundMessageContext();
 		
-		SamlPeerEntityContext peerContext = messageContext.getSubcontext(SamlPeerEntityContext.class, true);
+		SAMLPeerEntityContext peerContext = messageContext.getSubcontext(SAMLPeerEntityContext.class, true);
 		peerContext.setEntityId(getSpEntityId());
 		

[... 60 lines stripped ...]