Author: frankbille
Date: Sat Apr 12 15:48:50 2008
New Revision: 647505
URL: http://svn.apache.org/viewvc?rev=647505&view=rev
Log:
WICKET-1523: Wicket Spring and Wicket Spring Annot is merged. Update the
release and README to reflect that
Modified:
wicket/trunk/NOTICE
wicket/trunk/README
wicket/trunk/wicket-assembly-all.xml
Modified: wicket/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/trunk/NOTICE?rev=647505&r1=647504&r2=647505&view=diff
==============================================================================
--- wicket/trunk/NOTICE (original)
+++ wicket/trunk/NOTICE Sat Apr 12 15:48:50 2008
@@ -214,12 +214,3 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
----------------------------------------------------------------------------
-src/./wicket-spring-annot
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
Modified: wicket/trunk/README
URL:
http://svn.apache.org/viewvc/wicket/trunk/README?rev=647505&r1=647504&r2=647505&view=diff
==============================================================================
--- wicket/trunk/README (original)
+++ wicket/trunk/README Sat Apr 12 15:48:50 2008
@@ -57,7 +57,6 @@
- wicket-quickstart
- wicket-examples
- wicket-auth-roles
- - wicket-spring-annot
- wicket-guice
- wicket-jmx
- wicket-objectssizeof-agent
@@ -74,9 +73,8 @@
sizes in the JVM - most people probably never need this;
- wicket-ioc: base project for IoC (aka DI) implementations such as
Spring and Guice;
- - wicket-spring: support project for using Spring with Wicket;
- - wicket-spring-annot: supports including Spring managed dependencies
- through using @SpringBean annotations
+ - wicket-spring: support project for using Spring with Wicket and including
+ Spring managed dependencies 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
@@ -160,10 +158,6 @@
wicket-ioc and Spring (http://www.springframework.org/) and
it's dependencies
-
- - wicket-spring-annots:
-
- wicket-spring
- wicket-guice:
Modified: wicket/trunk/wicket-assembly-all.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-assembly-all.xml?rev=647505&r1=647504&r2=647505&view=diff
==============================================================================
--- wicket/trunk/wicket-assembly-all.xml (original)
+++ wicket/trunk/wicket-assembly-all.xml Sat Apr 12 15:48:50 2008
@@ -65,7 +65,6 @@
<include>wicket-ioc/**</include>
<include>wicket-guice/**</include>
<include>wicket-spring/**</include>
- <include>wicket-spring-annot/**</include>
<include>wicket-velocity/**</include>
</includes>
<excludes>
@@ -105,7 +104,6 @@
<include>org.apache.wicket:wicket-ioc</include>
<include>org.apache.wicket:wicket-guice</include>
<include>org.apache.wicket:wicket-spring</include>
-
<include>org.apache.wicket:wicket-spring-annot</include>
<include>org.apache.wicket:wicket-velocity</include>
</includes>
<binaries>
