You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/03/01 08:02:24 UTC
svn commit: r513200 - in /incubator/wicket/branches/wicket-1.x/wicket:
NOTICE.txt src/main/java/wicket/util/license/ApacheLicenseHeaderTestCase.java
src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java
Author: ivaynberg
Date: Wed Feb 28 23:02:24 2007
New Revision: 513200
URL: http://svn.apache.org/viewvc?view=rev&rev=513200
Log:
fixed license tests
Modified:
incubator/wicket/branches/wicket-1.x/wicket/NOTICE.txt
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/ApacheLicenseHeaderTestCase.java
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java
Modified: incubator/wicket/branches/wicket-1.x/wicket/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/NOTICE.txt?view=diff&rev=513200&r1=513199&r2=513200
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/NOTICE.txt (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/NOTICE.txt Wed Feb 28 23:02:24 2007
@@ -41,3 +41,21 @@
[1]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
[2]: licenses/sun-u.c.license.pdf
+ wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
+ and has the following notice:
+ "Licence:
+ Use this however/wherever you like, just don't blame me if it breaks
+ anything.
+
+ Credit:
+ If you're nice, you'll leave this bit:
+
+ Class by Stickman -- http://www.the-stickman.com
+ with thanks to:
+ [for Safari fixes]
+ Luis Torrefranca -- http://www.law.pitt.edu
+ and
+ Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
+ [for duplicate name bug]
+ 'neal'"
+ [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/ApacheLicenseHeaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/ApacheLicenseHeaderTestCase.java?view=diff&rev=513200&r1=513199&r2=513200
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/ApacheLicenseHeaderTestCase.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/license/ApacheLicenseHeaderTestCase.java Wed Feb 28 23:02:24 2007
@@ -99,9 +99,10 @@
for (int i = 0; i < ignoreFiles.length; i++)
{
String ignorePath = ignoreFiles[i];
- // Will convert '/'s to '\\'s on Windows
- ignorePath = Strings.replaceAll(ignorePath, "/", System.getProperty("file.separator")).toString();
- File ignoreFile = new File(baseDirectory, ignorePath);
+ // Will convert '/'s to '\\'s on Windows
+ ignorePath = Strings.replaceAll(ignorePath, "/",
+ System.getProperty("file.separator")).toString();
+ File ignoreFile = new File(baseDirectory, ignorePath);
// Directory ignore
if (ignoreFile.isDirectory())
@@ -143,7 +144,8 @@
relativePathname = Strings.replaceAll(relativePathname,
baseDirectory.getAbsolutePath() + System.getProperty("file.separator"), "")
.toString();
- if (relativePathname.equals("target") == false) {
+ if (relativePathname.equals("target") == false)
+ {
boolean found = false;
for (int i = 0; i < ignoreDirectory.length; i++)
{
@@ -219,7 +221,8 @@
if (addHeaders == false
|| licenseHeaderHandler.addLicenseHeader(file) == false)
{
- List/* <File> */files = (List)badFiles.get(licenseHeaderHandler);
+ List/* <File> */files = (List)badFiles
+ .get(licenseHeaderHandler);
if (files == null)
{
@@ -258,10 +261,10 @@
{
File file = (File)iterator.next();
String filename = file.getAbsolutePath();
-
+
// Find the license type
String licenseType = licenseHeaderHandler.getLicenseType(file);
-
+
if (licenseType == null)
{
failString.append("NONE");
@@ -270,7 +273,7 @@
{
failString.append(licenseType);
}
-
+
failString.append(" ").append(filename).append(LINE_ENDING);
}
}
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java?view=diff&rev=513200&r1=513199&r2=513200
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java Wed Feb 28 23:02:24 2007
@@ -97,7 +97,8 @@
/*
* See NOTICE.txt
*/
- "src/main/java/wicket/ajax/wicket-ajax-debug-drag.js"
+ "src/main/java/wicket/ajax/wicket-ajax-debug-drag.js",
+ "src/main/java/wicket/markup/html/form/upload/MultiFileUploadField.js"
};
propertiesIgnore = new String[] {