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

svn commit: r526966 - in /incubator/wicket/branches/wicket-1.x: ./ jdk-1.4/wicket-datetime/ jdk-1.4/wicket-datetime/src/main/resources/ jdk-1.4/wicket-datetime/src/main/resources/META-INF/ jdk-1.4/wicket-extensions/ jdk-1.4/wicket-extensions/licenses/ ...

Author: dashorst
Date: Mon Apr  9 17:15:10 2007
New Revision: 526966

URL: http://svn.apache.org/viewvc?view=rev&rev=526966
Log:
Fixed release procedure to get all required files in the correct place, moved files around and renamed them to ASF compatible guidelines and enabled the use of the remote resources plugin

Added:
    incubator/wicket/branches/wicket-1.x/DISCLAIMER
    incubator/wicket/branches/wicket-1.x/NOTICE
      - copied, changed from r526932, incubator/wicket/branches/wicket-1.x/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/README
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/README.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/resources/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/resources/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-quickstart/NOTICE
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-quickstart/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-spring/src/main/resources/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-spring/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-spring/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-spring/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/resources/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/resources/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-jmx/src/main/resources/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-jmx/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-jmx/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-jmx/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-objectssizeof-agent/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-objectssizeof-agent/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-spring-annot/src/main/resources/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-spring-annot/src/main/resources/META-INF/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-spring-annot/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-spring-annot/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/licenses/
      - copied from r526874, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/licenses/
Removed:
    incubator/wicket/branches/wicket-1.x/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/licenses/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-quickstart/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-quickstart/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-spring/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-spring/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-spring/licenses/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/README.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/licenses/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/licenses/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/licenses/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-jmx/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-jmx/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-jmx/licenses/
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-objectssizeof-agent/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-objectssizeof-agent/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-spring-annot/LICENSE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-spring-annot/NOTICE.txt
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-spring-annot/licenses/
Modified:
    incubator/wicket/branches/wicket-1.x/pom.xml
    incubator/wicket/branches/wicket-1.x/release.sh
    incubator/wicket/branches/wicket-1.x/wicket-assembly-all.xml

Added: incubator/wicket/branches/wicket-1.x/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/DISCLAIMER?view=auto&rev=526966
==============================================================================
--- incubator/wicket/branches/wicket-1.x/DISCLAIMER (added)
+++ incubator/wicket/branches/wicket-1.x/DISCLAIMER Mon Apr  9 17:15:10 2007
@@ -0,0 +1,10 @@
+Wicket Extensions is an effort undergoing incubation at the Apache Software 
+Foundation (ASF), sponsored by the Apache Incubator PMC. 
+
+Incubation is required of all newly accepted projects until a further review 
+indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness 
+or stability of the code, it does indicate that the project has yet to be 
+fully endorsed by the ASF.

Copied: incubator/wicket/branches/wicket-1.x/NOTICE (from r526932, incubator/wicket/branches/wicket-1.x/NOTICE.txt)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/NOTICE?view=diff&rev=526966&p1=incubator/wicket/branches/wicket-1.x/NOTICE.txt&r1=526932&p2=incubator/wicket/branches/wicket-1.x/NOTICE&r2=526966
==============================================================================
--- incubator/wicket/branches/wicket-1.x/NOTICE.txt (original)
+++ incubator/wicket/branches/wicket-1.x/NOTICE Mon Apr  9 17:15:10 2007
@@ -12,7 +12,7 @@
     AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
 
 ---------------------------------------------------------------------------
-src/jdk-1.4/wicket/NOTICE.txt
+src/jdk-1.4/wicket
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2006 The Apache Software Foundation
@@ -77,7 +77,7 @@
    [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
 
 ---------------------------------------------------------------------------
-src/jdk-1.4/wicket-datetime/NOTICE.txt
+src/jdk-1.4/wicket-datetime
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -91,7 +91,7 @@
    Copyright (c) 2006, Yahoo!
 
 ---------------------------------------------------------------------------
-src/jdk-1.4/wicket-extensions/NOTICE.txt
+src/jdk-1.4/wicket-extensions
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -104,7 +104,7 @@
    (c) 2001-2005
 
 ---------------------------------------------------------------------------
-src/jdk-1.4/wicket-quickstart/NOTICE.txt
+src/jdk-1.4/wicket-quickstart/NOTICE
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -113,7 +113,7 @@
    The Apache Software Foundation (http://www.apache.org/).
 
 ---------------------------------------------------------------------------
-src/jdk-1.4/wicket-spring/NOTICE.txt
+src/jdk-1.4/wicket-spring
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -122,7 +122,7 @@
    The Apache Software Foundation (http://www.apache.org/).
 
 ---------------------------------------------------------------------------
-src/jdk-1.5/wicket-auth-roles/NOTICE.txt
+src/jdk-1.5/wicket-auth-roles
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -131,7 +131,7 @@
    The Apache Software Foundation (http://www.apache.org/).
 
 ---------------------------------------------------------------------------
-src/jdk-1.5/wicket-examples/NOTICE.txt
+src/jdk-1.5/wicket-examples
 ---------------------------------------------------------------------------
    Apache Wicket Examples
    Copyright 2007 The Apache Software Foundation
@@ -159,7 +159,7 @@
    Copyright (c) 2004-2005, The Dojo Foundation
 
 ---------------------------------------------------------------------------
-src/jdk-1.5/wicket-jmx/NOTICE.txt
+src/jdk-1.5/wicket-jmx
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -168,7 +168,7 @@
    The Apache Software Foundation (http://www.apache.org/).
 
 ---------------------------------------------------------------------------
-src/jdk-1.5/wicket-objectssizeof-agent/NOTICE.txt
+src/jdk-1.5/wicket-objectssizeof-agent
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -178,7 +178,7 @@
 
 
 ---------------------------------------------------------------------------
-src/jdk-1.5/wicket-spring-annot/NOTICE.txt
+src/jdk-1.5/wicket-spring-annot
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation

Modified: incubator/wicket/branches/wicket-1.x/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/pom.xml?view=diff&rev=526966&r1=526965&r2=526966
==============================================================================
--- incubator/wicket/branches/wicket-1.x/pom.xml (original)
+++ incubator/wicket/branches/wicket-1.x/pom.xml Mon Apr  9 17:15:10 2007
@@ -570,7 +570,7 @@
 								<resourceBundles>
 									<!-- don't use the generic apache resource bundle as it overwrites our local -->
 									<!-- notice files (only works for dependencies) -->
-									<!-- <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle> -->
+									<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
 									<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
 								</resourceBundles>
 							</configuration>

Modified: incubator/wicket/branches/wicket-1.x/release.sh
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/release.sh?view=diff&rev=526966&r1=526965&r2=526966
==============================================================================
--- incubator/wicket/branches/wicket-1.x/release.sh (original)
+++ incubator/wicket/branches/wicket-1.x/release.sh Mon Apr  9 17:15:10 2007
@@ -28,29 +28,30 @@
 stty $stty_orig
 
 # Clear the current NOTICE.txt file
-> NOTICE.txt; 
-echo "Apache Wicket" >> NOTICE.txt
-echo "Copyright 2006 The Apache Software Foundation" >> NOTICE.txt
-echo "" >> NOTICE.txt
-echo "This product includes software developed at" >> NOTICE.txt
-echo "The Apache Software Foundation (http://www.apache.org/)." >> NOTICE.txt
-echo "" >> NOTICE.txt
-echo "This is an aggregated NOTICE file for the Apache Wicket projects included" >> NOTICE.txt
-echo "in this distribution." >> NOTICE.txt
-echo "" >> NOTICE.txt
-echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> NOTICE.txt
-echo "    NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> NOTICE.txt
-echo "    AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> NOTICE.txt
-echo "" >> NOTICE.txt
+NOTICE=NOTICE
+> $NOTICE 
+echo "Apache Wicket" >> $NOTICE
+echo "Copyright 2006 The Apache Software Foundation" >> $NOTICE
+echo "" >> $NOTICE
+echo "This product includes software developed at" >> $NOTICE
+echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE
+echo "" >> $NOTICE
+echo "This is an aggregated NOTICE file for the Apache Wicket projects included" >> $NOTICE
+echo "in this distribution." >> $NOTICE
+echo "" >> $NOTICE
+echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE
+echo "    NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> $NOTICE
+echo "    AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE
+echo "" >> $NOTICE
 
 # next concatenate all NOTICE files from sub projects to the root file
-for i in `find jdk* -name "NOTICE.txt" -not -regex ".*/target/.*"`
-do 
-	echo "---------------------------------------------------------------------------" >> NOTICE.txt
-	echo "src/"$i >> NOTICE.txt
-	echo "---------------------------------------------------------------------------" >> NOTICE.txt
-	cat $i >> NOTICE.txt 
-	echo >> NOTICE.txt
+for i in `find jdk* -name "NOTICE" -not -regex ".*/target/.*"`
+do
+	echo "---------------------------------------------------------------------------" >> $NOTICE
+	echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
+	echo "---------------------------------------------------------------------------" >> $NOTICE
+	cat $i >> $NOTICE
+	echo >> $NOTICE
 done
 
 # clean all projects

Modified: incubator/wicket/branches/wicket-1.x/wicket-assembly-all.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-assembly-all.xml?view=diff&rev=526966&r1=526965&r2=526966
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-assembly-all.xml (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-assembly-all.xml Mon Apr  9 17:15:10 2007
@@ -24,46 +24,74 @@
 	<includeBaseDirectory>true</includeBaseDirectory>
 	<fileSets>
 		<fileSet>
-			<directory>${basedir}</directory>
-			<outputDirectory>src</outputDirectory>
+			<directory>jdk-1.4</directory>
+			<outputDirectory>src/jdk-1.4</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<excludes>
-				<exclude>**/wicket-sandbox/**</exclude>
+				<exclude>**/wicket/target</exclude>
+				<exclude>**/wicket-*/target</exclude>
 				<exclude>**/wicket/target/**</exclude>
+				<exclude>**/wicket-*/target/**</exclude>
+				<exclude>**/*gz</exclude>
+				<exclude>**/*zip</exclude>
+				<exclude>**/archive-tmp</exclude>
+				<exclude>**/sessions</exclude>
+				<exclude>${basedir}/target</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>jdk-1.5</directory>
+			<outputDirectory>src/jdk-1.5</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<excludes>
 				<exclude>**/wicket/target</exclude>
+				<exclude>**/wicket-*/target</exclude>
+				<exclude>**/wicket/target/**</exclude>
 				<exclude>**/wicket-*/target/**</exclude>
+				<exclude>**/*gz</exclude>
+				<exclude>**/*zip</exclude>
+				<exclude>**/archive-tmp</exclude>
+				<exclude>**/sessions</exclude>
+				<exclude>${basedir}/target</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>testing</directory>
+			<outputDirectory>src/testing</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<excludes>
+				<exclude>**/wicket/target</exclude>
 				<exclude>**/wicket-*/target</exclude>
-				<exclude>**/*wicket*gz</exclude>
-				<exclude>**/*wicket*zip</exclude>
+				<exclude>**/wicket/target/**</exclude>
+				<exclude>**/wicket-*/target/**</exclude>
+				<exclude>**/*gz</exclude>
+				<exclude>**/*zip</exclude>
 				<exclude>**/archive-tmp</exclude>
-				<exclude>**/target/**/wicket*.pom*</exclude>
-				<exclude>target</exclude>
-				<exclude>target/**</exclude>
-				<exclude>target/**/*</exclude>
 				<exclude>**/sessions</exclude>
 				<exclude>**/sessions/*</exclude>
-				<exclude>${project.build.directory}</exclude>
-				<exclude>**/maven-shared-archive-resources</exclude>
 				<exclude>${basedir}/target</exclude>
-				<exclude>${basedir}/target/**</exclude>
-				<exclude>${basedir}/target/**/*</exclude>
 			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>${basedir}</directory>
-			<outputDirectory></outputDirectory>
+			<outputDirectory>src</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
-				<include>LICENSE.txt</include>
-				<include>NOTICE.txt</include>
-				<include>README.txt</include>
-				<include>DISCLAIMER.txt</include>
+				<include>*.xml</include>
+				<include>eclipse.sh</include>
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/jdk-1.4/wicket/licenses</directory>
-			<outputDirectory>licenses</outputDirectory>
+			<directory>${basedir}</directory>
+			<outputDirectory></outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
+			<includes>
+				<include>LICENSE</include>
+				<include>NOTICE</include>
+				<include>README</include>
+				<include>DISCLAIMER</include>
+				<include>licenses/**</include>
+			</includes>
 		</fileSet>
 	</fileSets>
 	<moduleSets>