[java-idp-testbed COMMIT] in /trunk/src: main/java/sp/Saml2Controller.java main/webapp/index.html test/java/idp/saml1...

[noreply at shibboleth.net]

Author: scantor
Date: Tue May  6 17:59:16 2014
New Revision: 215

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=215&view=rev
Log:
Add SimpleSign test, and relocate profile flows to match V2

Added:
    trunk/src/test/java/idp/saml2/SAML2POSTSimpleSignSSOFlowTest.java   (with props)
Modified:
    trunk/src/main/java/sp/Saml2Controller.java
    trunk/src/main/webapp/index.html
    trunk/src/test/java/idp/saml1/SAML1AttributeQueryFlowTest.java
    trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java
    trunk/src/test/java/idp/saml2/AbstractSAML2SSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2AttributeQueryFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2POSTSSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2UnsolicitedSSOFlowTest.java

Modified: trunk/src/main/java/sp/Saml2Controller.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/sp/Saml2Controller.java?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- trunk/src/main/java/sp/Saml2Controller.java (original)
+++ trunk/src/main/java/sp/Saml2Controller.java Tue May  6 17:59:16 2014
@@ -227,7 +227,7 @@
 
 	private String getDestinationRedirect(HttpServletRequest servletRequest) {
 		//TODO servlet context
-		String destinationPath = "/idp/SAML2/Redirect/SSO";
+		String destinationPath = "/idp/profile/SAML2/Redirect/SSO";
 		String baseUrl = getBaseUrl(servletRequest);
 		try {
 			UrlBuilder urlBuilder = new UrlBuilder(baseUrl);
@@ -241,7 +241,7 @@
 	
 	private String getDestinationPost(HttpServletRequest servletRequest) {
 		//TODO servlet context
-		String destinationPath = "/idp/SAML2/POST/SSO";
+		String destinationPath = "/idp/profile/SAML2/POST/SSO";
 		String baseUrl = getBaseUrl(servletRequest);
 		try {
 			UrlBuilder urlBuilder = new UrlBuilder(baseUrl);

Modified: trunk/src/main/webapp/index.html
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/index.html?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- trunk/src/main/webapp/index.html (original)
+++ trunk/src/main/webapp/index.html Tue May  6 17:59:16 2014
@@ -13,8 +13,8 @@
 <li><a href="sp/SAML2/InitSSO/POST">Init SAML 2 SSO, POST Binding</a></li>
 <li><a href="sp/SAML2/InitSSO/Passive">Init SAML 2 SSO, Redirect Binding, Passive Request</a></li>
 <li><a href="sp/SAML2/InitSSO/ForceAuthn">Init SAML 2 SSO, Redirect Binding, ForceAuthn Request</a></li>
-<li><a href="idp/SAML2/Unsolicited/SSO?providerId=https://sp.example.org&shire=https://localhost:8443/sp/SAML2/POST/ACS&target=MyRelayState">IdP-initiated (Unsolicited) SAML 2 SSO</a></li>
-<li><a href="idp/Shibboleth/SSO?providerId=https://sp.example.org&shire=https://localhost:8443/sp/SAML1/POST/ACS&target=MyRelayState">IdP-initiated (Unsolicited) SAML 1 SSO</a></li>
+<li><a href="idp/profile/SAML2/Unsolicited/SSO?providerId=https://sp.example.org&shire=https://localhost:8443/sp/SAML2/POST/ACS&target=MyRelayState">IdP-initiated (Unsolicited) SAML 2 SSO</a></li>
+<li><a href="idp/profile/Shibboleth/SSO?providerId=https://sp.example.org&shire=https://localhost:8443/sp/SAML1/POST/ACS&target=MyRelayState">IdP-initiated (Unsolicited) SAML 1 SSO</a></li>
 </ul>
 
 </body>

Modified: trunk/src/test/java/idp/saml1/SAML1AttributeQueryFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml1/SAML1AttributeQueryFlowTest.java?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/SAML1AttributeQueryFlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/SAML1AttributeQueryFlowTest.java Tue May  6 17:59:16 2014
@@ -48,7 +48,7 @@
 public class SAML1AttributeQueryFlowTest extends AbstractSAML1FlowTest {
 
     /** Flow id. */
-    @Nonnull public final static String FLOW_ID = "SAML1/AttributeQuery";
+    @Nonnull public final static String FLOW_ID = "profile/SAML1/SOAP/AttributeQuery";
 
     // TODO Retrieve SP certificate from metadata
     @Autowired @Qualifier("testbed.sp.X509Certificate") private X509CertificateFactoryBean certFactoryBean;

Modified: trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/SAML1UnsolicitedSSOFlowTest.java Tue May  6 17:59:16 2014
@@ -35,7 +35,7 @@
 public class SAML1UnsolicitedSSOFlowTest extends AbstractSAML1FlowTest {
 
     /** The flow id. */
-    @Nonnull public final static String FLOW_ID = "Shibboleth/SSO";
+    @Nonnull public final static String FLOW_ID = "profile/Shibboleth/SSO";
 
     /**
      * Test the SAML1 unsolicited SSO flow.


[... 129 lines stripped ...]