You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/05/07 21:09:06 UTC

svn commit: r535955 - in /incubator/wicket/trunk/jdk-1.5/wicket-examples/src: main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.properties test/java/wicket/util/license/ApacheLicenceHeaderTest.java

Author: ehillenius
Date: Mon May  7 12:09:05 2007
New Revision: 535955

URL: http://svn.apache.org/viewvc?view=rev&rev=535955
Log:
license test fixes

Modified:
    incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.properties
    incubator/wicket/trunk/jdk-1.5/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java

Modified: incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.properties
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.properties?view=diff&rev=535955&r1=535954&r2=535955
==============================================================================
--- incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.properties (original)
+++ incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.properties Mon May  7 12:09:05 2007
@@ -1,2 +1,16 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
 lastName=Last Name
 firstName=First Name

Modified: incubator/wicket/trunk/jdk-1.5/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java?view=diff&rev=535955&r1=535954&r2=535955
==============================================================================
--- incubator/wicket/trunk/jdk-1.5/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java (original)
+++ incubator/wicket/trunk/jdk-1.5/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java Mon May  7 12:09:05 2007
@@ -25,64 +25,62 @@
  * 
  * @author Frank Bille Jensen (frankbille)
  */
-public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase {
+public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
+{
 
 	/**
 	 * Construct.
 	 */
-	public ApacheLicenceHeaderTest() {
+	public ApacheLicenceHeaderTest()
+	{
 
-//		 addHeaders = true;
+		// addHeaders = true;
 
 		htmlIgnore = new String[] {
-				/*
-				 * This is an example project. Therefore we'd rather not have
-				 * license headers in html files, because it removes the
-				 * focus away from what the example is about.
-				 */
-				"src"
-		};
-		
+		/*
+		 * This is an example project. Therefore we'd rather not have license
+		 * headers in html files, because it removes the focus away from what
+		 * the example is about.
+		 */
+		"src" };
+
+		/* same, same */
+		velocityIgnore = new String[] { "src" };
+
 		javaScriptIgnore = new String[] {
-				/*
-				 * Prototype, released under MIT. See NOTICE
-				 */
-				"src/main/webapp/prototype.js",
-				/*
-				 * Script.aculo.us, released under MIT. See NOTICE
-				 */
-				"src/main/webapp/effects.js",
-				"src/main/webapp/scriptaculous.js",
-				/*
-				 * Behaviour, released under BSD. See NOTICE
-				 */
-				"src/main/java/org/apache/wicket/examples/preview/behaviour.js",
-				/*
-				 * DOJO is dual licensed. We use the BSD license. See NOTICE.
-				 */
-				"src/main/java/org/apache/wicket/examples/preview/dojo.js"
-		};
-		
+		/*
+		 * Prototype, released under MIT. See NOTICE
+		 */
+		"src/main/webapp/prototype.js",
+		/*
+		 * Script.aculo.us, released under MIT. See NOTICE
+		 */
+		"src/main/webapp/effects.js", "src/main/webapp/scriptaculous.js",
+		/*
+		 * Behaviour, released under BSD. See NOTICE
+		 */
+		"src/main/java/org/apache/wicket/examples/preview/behaviour.js",
+		/*
+		 * DOJO is dual licensed. We use the BSD license. See NOTICE.
+		 */
+		"src/main/java/org/apache/wicket/examples/preview/dojo.js" };
+
 		xmlIgnore = new String[] {
-				/*
-				 * Part of an example
-				 */
-				"src/main/java/org/apache/wicket/examples/compref/XmlPage.xml"
-		};
-		
+		/*
+		 * Part of an example
+		 */
+		"src/main/java/org/apache/wicket/examples/compref/XmlPage.xml" };
+
 		propertiesIgnore = new String[] {
-				/*
-				 * Configuration files with no "intelligent" content
-				 */
-				"src/main/java/commons-logging.properties",
-				"src/main/java/log4j.properties"
-		};
-		
+		/*
+		 * Configuration files with no "intelligent" content
+		 */
+		"src/main/java/commons-logging.properties", "src/main/java/log4j.properties" };
+
 		javaIgnore = new String[] {
-				/*
-				 * MIT style license. See NOTICE
-				 */
-				"src/test/java/com/meterware/httpunit/ParsedHTML.java"
-		};
+		/*
+		 * MIT style license. See NOTICE
+		 */
+		"src/test/java/com/meterware/httpunit/ParsedHTML.java" };
 	}
 }