Author: brett
Date: Mon Oct 3 01:56:43 2011
New Revision: 1178285
URL: http://svn.apache.org/viewvc?rev=1178285&view=rev
Log:
add a patched version of Struts form template that corrects WW-3688 for URL
validation, and re-enable appearance tests
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/template/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/template/xhtml/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/template/xhtml/form-close-validate.ftl
- copied, changed from r1178270,
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java?rev=1178285&r1=1178284&r2=1178285&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java
Mon Oct 3 01:56:43 2011
@@ -78,27 +78,25 @@ public class AppearanceTest
assertTextPresent( "You must enter a URL for your logo." );
}
- @Test(enabled = false)
+ @Test
public void testAddAppearanceValidValues()
{
goToAppearancePage();
clickLinkWithText( "Edit" );
- // FIXME: not allowed this URL for the logo?!
addEditAppearance( "The Apache Software Foundation",
"http://www.apache.org/";,
"http://www.apache.org/images/asf_logo_wide.gifs";,
true );
assertTextPresent( "The Apache Software Foundation" );
}
- @Test( dependsOnMethods = { "testAddAppearanceValidValues" }, enabled =
false)
+ @Test( dependsOnMethods = { "testAddAppearanceValidValues" } )
public void testEditAppearance()
{
goToAppearancePage();
clickLinkWithText( "Edit" );
- // FIXME: not allowed this URL for the logo?!
addEditAppearance( "Apache Software Foundation",
"http://www.apache.org/";,
"http://www.apache.org/images/asf_logo_wide.gifs";,
true );
assertTextPresent( "Apache Software Foundation" );
}
-}
\ No newline at end of file
+}
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/template/xhtml/form-close-validate.ftl
(from r1178270,
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/template/xhtml/form-close-validate.ftl?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/template/xhtml/form-close-validate.ftl&p1=struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl&r1=1178270&r2=1178285&rev=1178285&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/template/xhtml/form-close-validate.ftl
Mon Oct 3 01:56:43 2011
@@ -91,7 +91,7 @@ END SNIPPET: supported-validators
<#if validator.shortCircuit>continueValidation = false;</#if>
}
<#elseif validator.validatorType = "url">
- if (continueValidation && field.value != null &&
field.value.length > 0 &&
field.value.match(/(^(ftp|http|https):\/\/(\.[_A-Za-z0-9-]+)*(@?([A-Za-z0-9-])+)?(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))(:[0-9]+)?([/A-Za-z0-9?#_-]*)?$)/gi)==null)
{
+ if (continueValidation && field.value != null &&
field.value.length > 0 &&
field.value.match(/^(ftp|http|https):\/\/((%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:])+@)?((%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=])+)(:[0-9]+)?((\/(%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:@])*)*)(\?(%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:@/?])*)?(#(%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:@/?])*)?$/gi)==null)
{
addError(field, error);
errors = true;
<#if validator.shortCircuit>continueValidation = false;</#if>
