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 2008/04/12 11:56:20 UTC
svn commit: r647408 - in /wicket/trunk: CHANGELOG-1.3 NOTICE README
migrate-13.html pom.xml release.sh wicket-assembly-all.xml
Author: frankbille
Date: Sat Apr 12 02:56:17 2008
New Revision: 647408
URL: http://svn.apache.org/viewvc?rev=647408&view=rev
Log:
WICKET-1517: Update the release script, README and removed obsolete files.
Removed:
wicket/trunk/CHANGELOG-1.3
wicket/trunk/migrate-13.html
Modified:
wicket/trunk/NOTICE
wicket/trunk/README
wicket/trunk/pom.xml
wicket/trunk/release.sh
wicket/trunk/wicket-assembly-all.xml
Modified: wicket/trunk/NOTICE
URL: http://svn.apache.org/viewvc/wicket/trunk/NOTICE?rev=647408&r1=647407&r2=647408&view=diff
==============================================================================
--- wicket/trunk/NOTICE (original)
+++ wicket/trunk/NOTICE Sat Apr 12 02:56:17 2008
@@ -1,5 +1,5 @@
Apache Wicket
-Copyright 2006 The Apache Software Foundation
+Copyright 2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -12,7 +12,7 @@
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/jdk-1.4/wicket
+src/./wicket
---------------------------------------------------------------------------
Apache Wicket
Copyright 2006 The Apache Software Foundation
@@ -76,7 +76,16 @@
[1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
---------------------------------------------------------------------------
-src/jdk-1.4/wicket-datetime
+src/./wicket-auth-roles
+---------------------------------------------------------------------------
+ Apache Wicket Auth Roles
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------------------------
+src/./wicket-datetime
---------------------------------------------------------------------------
Apache Wicket Date Time
Copyright 2007 The Apache Software Foundation
@@ -93,56 +102,7 @@
Joda.org (http://www.joda.org/).
---------------------------------------------------------------------------
-src/jdk-1.4/wicket-extensions
----------------------------------------------------------------------------
- Apache Wicket Extensions
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Contains software developed in Apache Turbine, released
- under the Apache Software License, Version 2.0.
- (c) 2001-2005
-
----------------------------------------------------------------------------
-src/jdk-1.4/wicket-ioc
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
----------------------------------------------------------------------------
-src/jdk-1.4/wicket-quickstart/NOTICE
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
----------------------------------------------------------------------------
-src/jdk-1.4/wicket-spring
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
----------------------------------------------------------------------------
-src/jdk-1.5/wicket-auth-roles
----------------------------------------------------------------------------
- Apache Wicket Auth Roles
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
----------------------------------------------------------------------------
-src/jdk-1.5/wicket-examples
+src/./wicket-examples
---------------------------------------------------------------------------
Apache Wicket Examples
Copyright 2007 The Apache Software Foundation
@@ -185,7 +145,20 @@
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-guice
+src/./wicket-extensions
+---------------------------------------------------------------------------
+ Apache Wicket Extensions
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Contains software developed in Apache Turbine, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2005
+
+---------------------------------------------------------------------------
+src/./wicket-guice
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -196,7 +169,25 @@
This product includes Guice, developed at Google, and licensed
under the Apache License 2.0. (http://code.google.com/p/google-guice/).
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-jmx
+src/./wicket-ioc
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------------------------
+src/./wicket-jmx
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------------------------
+src/./wicket-objectssizeof-agent
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -204,8 +195,9 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-objectssizeof-agent
+src/./wicket-quickstart/NOTICE
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -213,9 +205,17 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+---------------------------------------------------------------------------
+src/./wicket-spring
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-spring-annot
+src/./wicket-spring-annot
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
Modified: wicket/trunk/README
URL: http://svn.apache.org/viewvc/wicket/trunk/README?rev=647408&r1=647407&r2=647408&view=diff
==============================================================================
--- wicket/trunk/README (original)
+++ wicket/trunk/README Sat Apr 12 02:56:17 2008
@@ -1,4 +1,4 @@
-Apache Wicket 1.3
+Apache Wicket 1.4
=================
This is the readme file for the Apache Wicket project.
@@ -20,7 +20,7 @@
- Getting started
- Dependencies
- Building Wicket from source
- - Migrating from 1.2
+ - Migrating from 1.3
- Getting help
- Cryptographic Software Notice
@@ -34,7 +34,7 @@
Java/Application server requirements
------------------------------------
-Wicket requires at least Java 1.4. The application server for running your web
+Wicket requires at least Java 1.5. The application server for running your web
application should adhere to the servlet specification version 2.3 or newer.
What is in this package
@@ -47,7 +47,7 @@
You will find the source code here:
- - src/jdk-1.4
+ - src/
- wicket
- wicket-extensions
- wicket-datetime
@@ -55,7 +55,6 @@
- wicket-spring
- wicket-velocity
- wicket-quickstart
- - src/jdk-1.5
- wicket-examples
- wicket-auth-roles
- wicket-spring-annot
@@ -77,8 +76,7 @@
Spring and Guice;
- wicket-spring: support project for using Spring with Wicket;
- wicket-spring-annot: supports including Spring managed dependencies
- through using @SpringBean annotations - recommended for most users
- who use Spring and can use JDK 5 and up;
+ through using @SpringBean annotations
- wicket-guice: support project for using Google Guice with Wicket;
- wicket-velocity: contains special components for rendering Velocity templates
using Wicket components - most people probably don't need this, but it
@@ -96,7 +94,7 @@
- wicket-examples:
shows all components in short usage examples, also available live on:
- http://www.wicketstuff.org/wicket13
+ http://www.wicketstuff.org/wicket14
- wicket-quickstart:
@@ -144,11 +142,6 @@
As the following projects all depend on wicket, they inherit these dependencies.
- - wicket-auth-roles, wicket-jmx and wicket-objectssize-agent:
-
- JDK 5 or up (though JMX can be run on 1.4 with an
- extension package if you really need to).
-
- wicket-datetime:
Joda-Time 1.4 (http://joda-time.sourceforge.net/)
@@ -170,11 +163,11 @@
- wicket-spring-annots:
- wicket-spring and needs to run on JDK 5 or up
+ wicket-spring
- wicket-guice:
- Google Guice (http://code.google.com/p/google-guice/) and runs on JDK 5 or up.
+ Google Guice (http://code.google.com/p/google-guice/).
- wicket-examples:
@@ -200,16 +193,12 @@
creates wicket-x.y.z.jar in target/ subdirectory and installs the file
into your local Maven repository for use in other projects.
-Migrating from 1.2
+Migrating from 1.3
------------------
-We have included a migration guide in the distribution called:
-
- migrate-13.html
-
This file is a copy of the migration guide from available on our Wiki:
- http://cwiki.apache.org/WICKET/migrate-13.html
+ http://cwiki.apache.org/WICKET/migrate-14.html
Getting help
------------
@@ -217,7 +206,7 @@
- Read the online documentation available on our website
(http://wicket.apache.org)
- - Read the migration guide (migrate-13.html)
+ - Read the migration guide (migrate-14.html)
- Read the mailing archives available on Nabble, GMane and Apache
Modified: wicket/trunk/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=647408&r1=647407&r2=647408&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Sat Apr 12 02:56:17 2008
@@ -139,11 +139,11 @@
<distributionManagement>
<site>
<id>local</id>
- <url>file:target/site/</url>
+ <url>file:target/site</url>
</site>
<repository>
<id>local</id>
- <url>file:target/m2-repo/</url>
+ <url>file:target/m2-repo</url>
</repository>
</distributionManagement>
</profile>
Modified: wicket/trunk/release.sh
URL: http://svn.apache.org/viewvc/wicket/trunk/release.sh?rev=647408&r1=647407&r2=647408&view=diff
==============================================================================
--- wicket/trunk/release.sh (original)
+++ wicket/trunk/release.sh Sat Apr 12 02:56:17 2008
@@ -17,8 +17,8 @@
echo "----------------------------"
echo "Building a release for Apache Wicket. We will need the passphrase for"
echo "GPG to sign the release."
-echo "This program assumes you have a 'mvn4' script that starts Maven 2 using"
-echo "a Java 1.4 development kit to compile the projects that are JDK-1.4 based."
+echo "This program assumes you use a jdk 1.5 explicitly configured when"
+echo "invoking the 'mvn' Maven 2 command."
echo ""
echo "Enter your GPG passphrase (input will be hidden)"
@@ -28,10 +28,12 @@
stty $stty_orig
# Clear the current NOTICE.txt file
+echo "Creating notice file."
+
NOTICE=NOTICE
> $NOTICE
echo "Apache Wicket" >> $NOTICE
-echo "Copyright 2007 The Apache Software Foundation" >> $NOTICE
+echo "Copyright 2008 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
@@ -45,7 +47,7 @@
echo "" >> $NOTICE
# next concatenate all NOTICE files from sub projects to the root file
-for i in `find jdk* -name "NOTICE" -not -regex ".*/target/.*"`
+for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"`
do
echo "---------------------------------------------------------------------------" >> $NOTICE
echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
@@ -55,12 +57,11 @@
done
# clean all projects
+echo "Clean all projects"
mvn clean -Pall
-# compile the JDK-1.4 projects
-mvn4 -ff -Pjdk-1.4 test $1
-
# package and assemble the release
+echo "Package and assemble the release"
mvn -ff -Dgpg.passphrase=$passphrase -Prelease deploy assembly:attached $1
filename=`ls target/dist/apache-wicket*gz`
Modified: wicket/trunk/wicket-assembly-all.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-assembly-all.xml?rev=647408&r1=647407&r2=647408&view=diff
==============================================================================
--- wicket/trunk/wicket-assembly-all.xml (original)
+++ wicket/trunk/wicket-assembly-all.xml Sat Apr 12 02:56:17 2008
@@ -28,43 +28,12 @@
<outputDirectory>src/archetypes</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
- <exclude>**/quickstart/target</exclude>
- <exclude>**/quickstart/target/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>jdk-1.4</directory>
- <outputDirectory>src/jdk-1.4</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>target</exclude>
- <exclude>target/**</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>
<exclude>target/**</exclude>
+ <exclude>**/.classpath/**</exclude>
+ <exclude>**/.project/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.amateras/**</exclude>
+ <exclude>**/.tomcatplugin/**</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -72,16 +41,12 @@
<outputDirectory>src/testing</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>**/sessions/*</exclude>
- <exclude>${basedir}/target</exclude>
+ <exclude>target/**</exclude>
+ <exclude>**/.classpath/**</exclude>
+ <exclude>**/.project/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.amateras/**</exclude>
+ <exclude>**/.tomcatplugin/**</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -90,8 +55,28 @@
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>*.xml</include>
- <include>eclipse.sh</include>
+ <include>wicket/**</include>
+ <include>wicket-auth-roles/**</include>
+ <include>wicket-datetime/**</include>
+ <include>wicket-examples/**</include>
+ <include>wicket-extensions/**</include>
+ <include>wicket-jmx/**</include>
+ <include>wicket-objectssizeof-agent/**</include>
+ <include>wicket-ioc/**</include>
+ <include>wicket-guice/**</include>
+ <include>wicket-spring/**</include>
+ <include>wicket-spring-annot/**</include>
+ <include>wicket-velocity/**</include>
</includes>
+ <excludes>
+ <exclude>**/wicket/target/**</exclude>
+ <exclude>**/wicket-*/target/**</exclude>
+ <exclude>**/.classpath/**</exclude>
+ <exclude>**/.project/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.amateras/**</exclude>
+ <exclude>**/.tomcatplugin/**</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>${basedir}</directory>
@@ -101,9 +86,8 @@
<include>LICENSE</include>
<include>NOTICE</include>
<include>README</include>
- <include>migrate-13.html</include>
- <include>CHANGELOG-1.3</include>
- <include>DISCLAIMER</include>
+ <include>migrate-14.html</include>
+ <include>CHANGELOG-1.4</include>
<include>licenses/**</include>
</includes>
</fileSet>