Wicket 7.x please correction doc about CDI

.gitignore

@@ -12,3 +12,4 @@ release.properties
 **/node_modules/
 nb-configuration.xml
 .DS_Store
+**.launch

NOTICE

@@ -1,5 +1,5 @@
 Apache Wicket
-Copyright 2006-2012 The Apache Software Foundation
+Copyright 2006-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -116,4 +116,16 @@ src/./wicket-datetime
 
    This product includes software developed by
    Joda.org (http://www.joda.org/).
+
+---------------------------------------------------------------------------
+src/./wicket-metrics
+---------------------------------------------------------------------------
+
+   Apache Wicket Metrics
+   Copyright 2006-2016 Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
 
+   This product uses AspectJ, developed at Eclipse, and licensed
+   under the Eclipse Public License. (https://eclipse.org/aspectj/).

README

@@ -66,6 +66,8 @@ You will find the source code here:
 	    |-- wicket-eclipse-settings
 	    |-- wicket-examples
 	    |-- wicket-experimental
+	    |   |-- wicket-metrics
+	    |   `-- wicket-atmosphere
 	    |-- wicket-extensions
 	    |-- wicket-guice
 	    |-- wicket-ioc
@@ -118,14 +120,16 @@ Here is a list of projects in this distribution and what they do.
  - wicket-eclipse-settings: specifies Eclipse settings for a uniform development environment.
    Most notably the formatting rules;
  - wicket-user-guide: the user guide of wicket
-
+ - wicket-metrics: collects data of a running wicket application
+ - wicket-atmosphere: wicket atmosphere support
+
 Getting started
 ---------------
 
 The Wicket project has several resources and projects where you can learn 
 from, and get started quickly:
 
- - The Wicket user guide - http://wicket.apache.org/start/userguide.html: 
+ - The Wicket user guide - https://ci.apache.org/projects/wicket/guide/7.x: 
 
     learn Wicket from scratch reading its userguide which gradually 
     introduces you to the various features of the framework with 
@@ -248,7 +252,7 @@ Getting help
  - Read the online documentation available on our website
    (http://wicket.apache.org)
 
- - Read the migration guide (migration-to-wicket-60.html)
+ - Read the migration guide (migration-to-wicket-70.html)
 
  - Read the mailing archives available on Nabble, GMane and Apache
 

archetypes/quickstart/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>wicket-archetype-quickstart</artifactId>
@@ -29,8 +29,8 @@
 	<build>
 		<resources>
 			<resource>
-				<filtering>false</filtering>
-				<directory>${basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+				<directory>${project.basedir}/src/main/resources</directory>
 				<includes>
 					<include>**/*</include>
 				</includes>
@@ -40,14 +40,24 @@
 			<extension>
 				<groupId>org.apache.maven.archetype</groupId>
 				<artifactId>archetype-packaging</artifactId>
-				<version>2.2</version>
+				<version>2.4</version>
 			</extension>
 		</extensions>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-archetype-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<useDefaultDelimiters>false</useDefaultDelimiters>
+					<delimiters>
+						<delimiter>@</delimiter>
+					</delimiters>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>

archetypes/quickstart/src/main/resources/archetype-resources/pom.xml

@@ -42,9 +42,9 @@
 		</license>
 	</licenses>
 	<properties>
-		<wicket.version>7.0.0-SNAPSHOT</wicket.version>
-		<jetty9.version>9.2.13.v20150730</jetty9.version>
-		<log4j.version>2.4</log4j.version>
+		<wicket.version>@project.version@</wicket.version>
+		<jetty9.version>9.2.19.v20160908</jetty9.version>
+		<log4j.version>2.6.2</log4j.version>
 		<junit.version>4.12</junit.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
@@ -87,26 +87,8 @@
 
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->
 		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty9.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<version>${jetty9.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty9.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-jmx</artifactId>
+			<groupId>org.eclipse.jetty.aggregate</groupId>
+			<artifactId>jetty-all</artifactId>
 			<version>${jetty9.version}</version>
 			<scope>test</scope>
 		</dependency>

archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 
 	<display-name>${artifactId}</display-name>
 

archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java

@@ -78,6 +78,11 @@ public static void main(String[] args)
 		bb.setContextPath("/");
 		bb.setWar("src/main/webapp");
 
+		// uncomment the next two lines if you want to start Jetty with WebSocket (JSR-356) support
+		// you need org.apache.wicket:wicket-native-websocket-javax in the classpath!
+		// ServerContainer serverContainer = WebSocketServerContainerInitializer.configureContext(bb);
+		// serverContainer.addEndpoint(new WicketServerEndpointConfig());
+
 		// uncomment next line if you want to test with JSESSIONID encoded in the urls
 		// ((AbstractSessionManager)
 		// bb.getSessionHandler().getSessionManager()).setUsingCookies(false);

build-changelog.sh

@@ -117,7 +117,7 @@ echo "done"
 
 echo "  - merging release notes into changelog: \c"
 
-echo "This file contains all changes done in releases for Apache Wicket 7.x.
+echo "This file contains all changes done in releases for Apache Wicket $major_version.x.
 
 =======================================================================
 $(cat /tmp/release-notes-$version.txt)
@@ -127,21 +127,21 @@ $(tail -n +4 CHANGELOG-$major_version.x)
 " > /tmp/changelog-$version.txt
 cp /tmp/changelog-$version.txt CHANGELOG-$major_version.x
 
-echo "done"
+echo "done
+"
+git diff
 
-echo "
-The CHANGELOG-$major_version.x file has been updated. Please check the contents
-and commit the changes.
+echo ""
 
-To see the status:
+git add CHANGELOG-$major_version.x
+git commit -m "Added CHANGELOG for release $version"
 
-    git status
-    git diff
+echo "
+The CHANGELOG-$major_version.x file has been updated and committed.
 
-To add and commit the CHANGELOG:
+To revert the changes to the CHANGELOG:
 
-    git add CHANGELOG-$major_version.x
-    git commit -m \"Added CHANGELOG for release $version
+    git reset HEAD^ --hard
 
 Have fun!
 "

licenses/json-license.txt

@@ -0,0 +1,13 @@
+Copyright (C) 2010 The Android Open Source Project
+
+Licensed 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.