WICKET-1523: Wicket Spring and Wicket Spring Annot is merged. Update …

…the release and README to reflect that

git-svn-id: https://svn.apache.org/repos/asf/wicket/trunk@647505 13f79535-47bb-0310-9956-ffa450edef68

NOTICE

@@ -214,12 +214,3 @@ src/./wicket-spring
    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/).
-

README

@@ -57,7 +57,6 @@ You will find the source code here:
    - wicket-quickstart
    - wicket-examples
    - wicket-auth-roles
-   - wicket-spring-annot
    - wicket-guice
    - wicket-jmx
    - wicket-objectssizeof-agent
@@ -74,9 +73,8 @@ Here is a list of projects in this distribution and what they do.
 		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 
@@ -161,10 +159,6 @@ If you do not want to use maven, here is a break down of the dependencies you ne
  	wicket-ioc and Spring (http://www.springframework.org/) and
  	it's dependencies
 
- - wicket-spring-annots:
-
-	wicket-spring
-
  - wicket-guice:
 
 	Google Guice (http://code.google.com/p/google-guice/).

wicket-assembly-all.xml

@@ -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>