correct test logback config file name
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 12 Apr 2011 13:26:46 +0000 (13:26 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 12 Apr 2011 13:26:46 +0000 (13:26 +0000)
remove use of deprecated macros in POM
fix javadoc typos
fix test case that broke now that TARGET param, in POST profile, is aggressively escaped

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

pom.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/ExternalAuthnSystemLoginHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/util/HttpServletHelper.java
src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java
src/test/resources/logback-test.xml [moved from src/test/resources/logback.xml with 100% similarity]

diff --git a/pom.xml b/pom.xml
index 715d480..9a0e299 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                             <manifestSection>
                                 <name>edu/internet2/middleware/shibboleth/idp/</name>
                                 <manifestEntries>
-                                    <Implementation-Title>${pom.artifactId}</Implementation-Title>
-                                    <Implementation-Version>${pom.version}</Implementation-Version>
+                                    <Implementation-Title>${project.artifactId}</Implementation-Title>
+                                    <Implementation-Version>${project.version}</Implementation-Version>
                                     <Implementation-Vendor>shibboleth.internet2.edu</Implementation-Vendor>
                                 </manifestEntries>
                             </manifestSection>
index 75fd0ae..4c1fc46 100644 (file)
@@ -40,8 +40,8 @@ import edu.internet2.middleware.shibboleth.idp.util.HttpServletHelper;
  * A login handler meant to bridge between the IdP and an external, web-based, authentication service.
  * 
  * This login handler will redirect the user-agent to a context-relative path and include the following query
- * parameters: {@link #FORCE_AUTHN_PARAM}, {@link #PASSIVE_AUTHN_PARAM}, {@link #AUTHN_METHOD_PARAM},
- * {@link #RETURN_URL_PARAM}, {@link #RELYING_PARTY_PARAM}.
+ * parameters: {@link #FORCE_AUTHN_PARAM}, {@link #PASSIVE_AUTHN_PARAM}, {@link #AUTHN_METHOD_PARAM}, and
+ * {@link #RELYING_PARTY_PARAM}.
  * 
  * The external authentication service must be configured to protect the page to which the user-agent is authenticated.
  * This external service must populate the REMOTE_USER header with the principal name of the authenticated user. The
index 1aae630..a3b657f 100644 (file)
@@ -417,7 +417,7 @@ public class HttpServletHelper {
      * 
      * @return the service or null if there is no such service bound to the context
      * 
-     * @deprecated use {@link #getRelyingPartyConfigurationManager(ServletContext, String)
+     * @deprecated use {@link #getRelyingPartyConfigurationManager(ServletContext, String)}
 
      */
     public static RelyingPartyConfigurationManager getRelyingPartyConfirmationManager(ServletContext context,
index d0eb544..4291410 100644 (file)
@@ -103,7 +103,7 @@ public class ShibbolethSSOTestCase extends BaseConf1TestCase {
 
         String response = servletResponse.getContentAsString();
         assertTrue(response.contains("action=\"https://example.org/mySP\" method=\"post\""));
-        assertTrue(response.contains("name=\"TARGET\" value=\"https://example.org/mySP\""));
+        assertTrue(response.contains("name=\"TARGET\" value=\"https&#x3a;&#x2f;&#x2f;example.org&#x2f;mySP\""));
         assertTrue(response.contains("SAMLResponse"));
     }