[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernam...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun  6 14:06:42 2014
New Revision: 6053

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6053&view=rev
Log:
Some work on JSPT-45: Implement class and method renames for new naming convention for any remaing components.

Modified:
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java

Modified: trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java?rev=6053&r1=6052&r2=6053&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java (original)
+++ trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java Fri Jun  6 14:06:42 2014
@@ -33,7 +33,7 @@
 import net.shibboleth.idp.authn.context.UsernamePasswordContext;
 import net.shibboleth.idp.authn.principal.UsernamePrincipal;
 import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.net.UriSupport;
+import net.shibboleth.utilities.java.support.net.URISupport;
 
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -144,7 +144,7 @@
         ac.setAttemptedFlow(authenticationFlows.get(0));
         action.setLoginConfigType("JavaLoginConfig");
         System.out.println(getCurrentDir());
-        action.setLoginConfigParameters(new URIParameter(UriSupport.fileURIFromAbsolutePath(getCurrentDir()
+        action.setLoginConfigParameters(new URIParameter(URISupport.fileURIFromAbsolutePath(getCurrentDir()
                 + '/' + DATA_PATH + "jaas.config")));
         action.initialize();
 
@@ -166,7 +166,7 @@
         ac.setAttemptedFlow(authenticationFlows.get(0));
         action.setLoginConfigType("JavaLoginConfig");
         System.out.println(getCurrentDir());
-        action.setLoginConfigParameters(new URIParameter(UriSupport.fileURIFromAbsolutePath(getCurrentDir()
+        action.setLoginConfigParameters(new URIParameter(URISupport.fileURIFromAbsolutePath(getCurrentDir()
                 + '/' + DATA_PATH + "jaas.config")));
         action.initialize();
 
@@ -189,7 +189,7 @@
 
         action.setLoginConfigType("JavaLoginConfig");
         System.out.println(getCurrentDir());
-        action.setLoginConfigParameters(new URIParameter(UriSupport.fileURIFromAbsolutePath(getCurrentDir()
+        action.setLoginConfigParameters(new URIParameter(URISupport.fileURIFromAbsolutePath(getCurrentDir()
                 + '/' + DATA_PATH + "jaas.config")));
         action.initialize();
 

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java?rev=6053&r1=6052&r2=6053&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java Fri Jun  6 14:06:42 2014
@@ -23,8 +23,8 @@
 import javax.servlet.http.HttpServletRequest;
 
 import net.shibboleth.idp.test.flows.AbstractFlowTest;
-import net.shibboleth.utilities.java.support.net.SimpleUrlCanonicalizer;
-import net.shibboleth.utilities.java.support.net.UrlBuilder;
+import net.shibboleth.utilities.java.support.net.SimpleURLCanonicalizer;
+import net.shibboleth.utilities.java.support.net.URLBuilder;
 
 import org.joda.time.DateTime;
 import org.opensaml.messaging.context.MessageContext;
@@ -62,8 +62,8 @@
         // TODO servlet context
         String destinationPath = "/idp/profile/SAML2/Redirect/SSO";
         try {
-            String baseUrl = SimpleUrlCanonicalizer.canonicalize(getBaseUrl(servletRequest));
-            UrlBuilder urlBuilder = new UrlBuilder(baseUrl);
+            String baseUrl = SimpleURLCanonicalizer.canonicalize(getBaseUrl(servletRequest));
+            URLBuilder urlBuilder = new URLBuilder(baseUrl);
             urlBuilder.setPath(destinationPath);
             return urlBuilder.buildURL();
         } catch (MalformedURLException e) {
@@ -77,7 +77,7 @@
         String destinationPath = "/idp/profile/SAML2/POST/SSO";
         String baseUrl = getBaseUrl(servletRequest);
         try {
-            UrlBuilder urlBuilder = new UrlBuilder(baseUrl);
+            URLBuilder urlBuilder = new URLBuilder(baseUrl);
             urlBuilder.setPath(destinationPath);
             return urlBuilder.buildURL();
         } catch (MalformedURLException e) {
@@ -91,7 +91,7 @@

[... 27 lines stripped ...]