You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by fr...@apache.org on 2007/03/04 13:30:26 UTC

svn commit: r514388 - in /incubator/wicket/branches/wicket-1.x/wicket-datetime: pom.xml src/assembly/bin.xml src/assembly/build.xml src/site/ src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java

Author: frankbille
Date: Sun Mar  4 04:30:25 2007
New Revision: 514388

URL: http://svn.apache.org/viewvc?view=rev&rev=514388
Log:
Removed the site folder because there is no site.
Changed the assembly bin.xml to not include site and licenses.
Added missing license headers and put a comment on the ignores in the license test.
Use the version number of surefire from the parent in pom.

Removed:
    incubator/wicket/branches/wicket-1.x/wicket-datetime/src/site/
Modified:
    incubator/wicket/branches/wicket-1.x/wicket-datetime/pom.xml
    incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/bin.xml
    incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/build.xml
    incubator/wicket/branches/wicket-1.x/wicket-datetime/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java

Modified: incubator/wicket/branches/wicket-1.x/wicket-datetime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-datetime/pom.xml?view=diff&rev=514388&r1=514387&r2=514388
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-datetime/pom.xml (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-datetime/pom.xml Sun Mar  4 04:30:25 2007
@@ -78,7 +78,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.1.3</version>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>

Modified: incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/bin.xml?view=diff&rev=514388&r1=514387&r2=514388
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/bin.xml (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/bin.xml Sun Mar  4 04:30:25 2007
@@ -1,3 +1,19 @@
+<!--
+   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.
+-->
 <assembly>
     <id>bin</id>
     <formats>
@@ -11,7 +27,6 @@
                 <include>LICENSE*</include>
                 <include>NOTICE*</include>
                 <include>pom.xml</include>
-                <include>project.xml</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -22,13 +37,6 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>licenses</directory>
-            <outputDirectory>licenses</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>target</directory>
             <outputDirectory></outputDirectory>
             <includes>
@@ -42,13 +50,6 @@
         <fileSet>
             <directory>src</directory>
             <outputDirectory>src</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/site</directory>
-            <outputDirectory>docs</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>

Modified: incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/build.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/build.xml?view=diff&rev=514388&r1=514387&r2=514388
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/build.xml (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-datetime/src/assembly/build.xml Sun Mar  4 04:30:25 2007
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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.
+-->
 <project default="jar" name="wicket-auth-roles" basedir=".">
 
 	<property name="final.name" value="wicket-datetime" />

Modified: incubator/wicket/branches/wicket-1.x/wicket-datetime/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-datetime/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java?view=diff&rev=514388&r1=514387&r2=514388
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-datetime/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-datetime/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java Sun Mar  4 04:30:25 2007
@@ -30,17 +30,23 @@
 	 */
 	public ApacheLicenceHeaderTest() {
 
-		// addHeaders = true;
-
-		xmlIgnore = new String[] { "src/assembly/bin.xml",
-				"src/assembly/build.xml" };
-
-		cssIgnore = new String[] { "src/main/java/wicket/extensions/yui/calendar/assets/calendar.css" };
+//		 addHeaders = true;
 
+		/*
+		 * YUI lib. See NOTICE
+		 */
+		cssIgnore = new String[] { 
+				"src/main/java/wicket/extensions/yui/calendar/assets/calendar.css" 
+		};
+		
+		/*
+		 * YUI lib. See NOTICE
+		 */
 		javaScriptIgnore = new String[] {
 				"src/main/java/wicket/extensions/yui/yahoo.js",
 				"src/main/java/wicket/extensions/yui/event.js",
 				"src/main/java/wicket/extensions/yui/dom.js",
-				"src/main/java/wicket/extensions/yui/calendar/calendar.js" };
+				"src/main/java/wicket/extensions/yui/calendar/calendar.js" 
+		};
 	}
 }