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/03/11 18:53:08 UTC

svn commit: r516971 - in /incubator/wicket/branches/wicket-1.x/wicket/src/site: ./ apt/ fml/ resources/css/ resources/images/ resources/style/ template/ xdoc/

Author: dashorst
Date: Sun Mar 11 10:53:07 2007
New Revision: 516971

URL: http://svn.apache.org/viewvc?view=rev&rev=516971
Log:
Removed old site stuff from svn as it is now in confluence

Added:
    incubator/wicket/branches/wicket-1.x/wicket/src/site/apt/
    incubator/wicket/branches/wicket-1.x/wicket/src/site/apt/index.apt
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/apache.png   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/background.gif   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_container.png   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_menu.png   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/footer.png   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/ie.css   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/logo.png   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/menuknop.png   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/nowincubating.png   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.css   (with props)
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.png   (with props)
Removed:
    incubator/wicket/branches/wicket-1.x/wicket/src/site/fml/
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/css/
    incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/images/
    incubator/wicket/branches/wicket-1.x/wicket/src/site/xdoc/
Modified:
    incubator/wicket/branches/wicket-1.x/wicket/src/site/site.xml
    incubator/wicket/branches/wicket-1.x/wicket/src/site/template/wicket-site.vm

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/apt/index.apt?view=auto&rev=516971
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/site/apt/index.apt (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/site/apt/index.apt Sun Mar 11 10:53:07 2007
@@ -0,0 +1,92 @@
+ ~~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~~ contributor license agreements.  See the NOTICE file distributed with
+ ~~ this work for additional information regarding copyright ownership.
+ ~~ The ASF licenses this file to You 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.
+
+ ------
+ Maven 2 Compiler Plugin 
+ ------
+ Juraj Burian
+ <ju...@volny.cz>
+ ------
+ October 12, 2005
+
+Apache Wicket
+
+	Apache Wicket is an open source, java, component based, web application framework.
+	With proper mark-up/logic separation, a POJO data model, and a refreshing lack of XML, 
+	Apache Wicket makes developing web-apps simple and enjoyable again. Swap the boilerplate, 
+	complex debugging and brittle code for powerful, reusable components written with plain Java 
+	and HTML.
+
+* License
+
+	Wicket is distributed under the terms of the Apache Software Foundation license,
+	version 2.0. The text is included in the file LICENSE.txt in the root of the 
+	project.
+
+* Java/Application server requirements
+
+	Wicket requires at least Java 1.4. The application server for running your web
+	application should adhere to the servlet specification version 2.3 or newer. All
+	necessary dependencies are located in the /lib directory of this package.
+
+* Getting started
+
+	The Wicket project has several projects where you can learn from, and get started
+	quickly:
+
+	 * wicket-examples : shows all components in short usage examples, also available
+	     live on: http://wicketstuff.org/wicket13
+	
+	 * wicket-quickstart : provides a skeleton project for use in NetBeans, Eclipse, 
+	     IntelliJ IDEA and other major IDE's, without having to configure anything 
+	     yourself. You can copy'n'paste the examples from the website into your pages
+	     and see them running on your own box.
+
+* Building Wicket from source
+
+	The Wicket distribution contains the final Wicket jar. You can use this directly
+	in your applications. The Wicket project also uploads the source-jars together with
+	the final jar to the Ibiblio repository used by the Maven build tool. So there is
+	actually no specific need to build Wicket yourself from the distribution.
+
+	Now if you do with to do so, you can build Wicket using Ant or Maven 2. Support for
+	Maven 1 is limited to downloading the artifacts from the Ibiblio repository and the
+	conversion of the pom.xml file is done automatically by the Maven project.
+
+	Building using maven 2:
+
+	[mvn package]
+	 	creates wicket-x.y.z.jar in target/ subdirectory.
+
+	[mvn install]
+		creates wicket-x.y.z.jar in target/ subdirectory and installs the file into your
+		local repository for use in other projects.
+     
+* Migrating from 1.2
+
+	There is a migration guide available on our Wiki: http://cwiki.apache.org/WICKET/migrate-13.html
+    
+* Getting help
+
+	* Read the online documentation available on our website (http://incubator.apache.org/wicket)
+
+	* Read the migration guide (http://cwiki.apache.org/WICKET/migrate-13.html)
+
+	* Read the mailing archives available on nabble, gmane and sourceforge
+
+	* Send a complete message containing your problem, stacktrace and problem you're trying 
+	  to solve to the user list (wicket-user@lists.sourceforge.net)
+
+	* Ask a question on IRC at freenode.net, channel ##wicket

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/apache.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/apache.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/apache.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/background.gif
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/background.gif?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/background.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_container.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_container.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_container.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_menu.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_menu.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/bg_menu.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/footer.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/footer.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/footer.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/ie.css
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/ie.css?view=auto&rev=516971
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/ie.css (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/ie.css Sun Mar 11 10:53:07 2007
@@ -0,0 +1,16 @@
+#container{
+	background-image:none;
+	filter:progid:DXimageTransform.Microsoft.AlphaimageLoader(src='style/bg_container.png', sizingMethod='scale');
+}
+
+#navigation h5{
+	background-image:none;
+	filter:progid:DXimageTransform.Microsoft.AlphaimageLoader(src='style/menuknop.png', sizingMethod='scale');
+}
+#navigation, #contentbody {
+	position:relative;
+	z-index : 1;
+}
+#logo {
+	top : 0px;
+}
\ No newline at end of file

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/ie.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/logo.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/logo.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/logo.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/menuknop.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/menuknop.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/menuknop.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/nowincubating.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/nowincubating.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/nowincubating.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.css
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.css?view=auto&rev=516971
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.css (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.css Sun Mar 11 10:53:07 2007
@@ -0,0 +1,213 @@
+html{
+	height:100%;
+}
+
+body{
+	background:#787878 url('background.gif');
+	margin:0px;
+	padding:0px;
+	font-family: "Lucida Sans Regular", "Lucida Grande", "Tahoma", Verdana;
+	font-size: 76%;
+	color:#4a4a4a;
+	height:100%;
+}	
+
+a, a:visited {
+	text-decoration : none;
+	color : #eb5a0a;
+}
+a:hover {
+	text-decoration : underline;
+}
+
+/* Containers */
+#container{
+	background:url('bg_container.png');
+	/* De aloude <ie7 fix */	
+	/* filter:progid:DXimageTransform.Microsoft.AlphaimageLoader(src='bg_container.png', sizingMethod='scale'); */
+	width:927px;
+	min-height:100%;
+	margin-left:auto;
+	margin-right:auto;
+	padding-left:28px;
+}
+
+#header{
+	background:#e8590a url('logo.png');
+	width:899px;
+	height:108px;
+}
+
+#content{
+	width:899px;
+	height:auto;
+}
+
+p, table, h1, h2, h3, h4, h5, h6, h7, div.code {
+	padding-left:25px;
+	padding-right : 1em;
+}
+
+#navigation {
+	background:#ffffff url('bg_menu.png') no-repeat 0px -2px;
+	width:172px;
+	min-height:200px;
+	height:auto;
+	float:left;
+	padding-right:50px;
+	padding-top:20px;
+	padding-left : 0px;
+	overflow : hidden;
+	text-align:right;
+}
+
+#navigation h5{
+	color:#eb5a0a;
+	font-weight:bold;
+	display:block;
+	background:transparent url('menuknop.png') no-repeat left top;
+	overflow : hidden;
+	vertical-align:baseline;
+	white-space : nowrap;
+	width:120px;
+	height:26px;
+	padding-right:24px;
+	padding-left : 0px;
+	font-size:1.2em;
+	margin-top:1em;
+	margin-bottom:0px;
+	float:right;
+}
+
+#navigation ul{
+	text-align:right;
+	display:block;
+	float:right;
+	margin:0px;
+	padding-right:24px;
+	list-style:none;
+	line-height:1.5em;
+	font-weight:bold;
+}
+
+#navigation a{
+	text-decoration:none;
+	color:#4a4a4a;
+}
+
+#contentbody {
+	background:#ffffff;
+	width:668px;
+	padding-top:20px;
+	height:auto;
+	float:left
+}
+
+h1, h2, .blogHeading {
+	color:#eb5a0a;
+	font-weight:bold;
+	font-size:1.2em;
+	background:#ffffff;
+	height:1.5em;
+	display:block;
+	text-decoration : none;
+}
+
+h1 {
+	background:#ffffff url('wicket.png') no-repeat left bottom;
+	min-height : 20px;
+	height : 20px;
+}
+
+.blogSurtitle, a.blogDate {
+	color:#4a4a4a;
+	font-size : 90%;
+}
+a.blogDate {
+	padding-left:25px;
+}
+.endsection {
+	display : none;
+}
+
+#logo span, #incubator span {
+	display : none;
+}
+
+#logo {
+	background: #ffffff url('logo.png') no-repeat left bottom;
+	height : 108px;
+	width : 300px;
+	position : absolute;
+	//top : -9px;
+	margin-top : 0px;
+}
+
+#incubator {
+	background: #ffffff url('nowincubating.png') no-repeat left bottom;
+	height : 97px;
+	width : 139px;
+	padding-top : 4em;
+}
+
+#footer{
+	background:#ffffff url('footer.png');
+	height:34px;
+	width:899px;
+	margin-top:15px;
+	padding-top:20px;
+}
+
+#clearer{
+	clear:both;
+	height:1px;
+}
+
+#footer span{
+	margin-left:450px;
+	font-size:90%;
+}
+
+.blogSurtitle img, .rendericon {
+	display : none;
+}
+
+div.code {
+	margin-right : 25px;
+	margin-left : 25px;
+	padding-left : 25px;
+	padding-right : 25px;
+	border : thin solid black;
+}
+.confluenceTable {
+	width : 100%;
+}
+
+.confluenceTable div.code {
+	margin-right : 0;
+	margin-left : 0;
+	padding-left : 0;
+	padding-right : 0;
+	border : thin solid black;
+}
+.confluenceTd {
+	vertical-align : top;
+}
+
+pre {
+	font-family: "Lucida Sans Regular", "Lucida Grande", "Tahoma", Verdana;
+	font-size : 120%;
+}
+
+span.code-keyword {
+	font-weight : bold;
+}
+span.code-tag {
+	font-weight : bold;
+}
+
+div.section {
+	padding : 0;
+	margin: 0;
+	display : inline;
+}

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.png
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.png?view=auto&rev=516971
==============================================================================
Binary file - no diff available.

Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/site/resources/style/wicket.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: incubator/wicket/branches/wicket-1.x/wicket/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/site.xml?view=diff&rev=516971&r1=516970&r2=516971
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/site/site.xml (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/site/site.xml Sun Mar 11 10:53:07 2007
@@ -16,80 +16,19 @@
    limitations under the License.
 -->
 <project name="Wicket">
-	<bannerLeft>
-		<name>Wicket</name>
-		<src>http://wicketframework.org/images/logo.png</src>
-		<href>http://wicketframework.org/</href>
-	</bannerLeft>
-	<body>
-	<links>
-		<item name="1.0" href="/wicket-1.0/index.html" />
-		<item name="1.1" href="/wicket-1.1/index.html"/>
-		<item name="1.2" href="/wicket-1.2/index.html"/>
-	</links>
-
-	<menu name="Wicket">
+  <body>
+	<menu name="Apache Wicket">
 		<item name="Home" href="/index.html" />
-		<item name="Features" href="/Features.html" />
-		<item name="Buzz" href="/Buzz.html" />
-		<item name="Introduction" href="/Introduction.html" collapse="true">
-			<item name="Why Wicket?" href="#Why_Wicket" />
-			<item name="Motivations" href="#Motivations" />
-			<item name="Goals" href="#Goals" />
-		</item>
-	</menu>
-	<menu name="Getting Started">
-		<item name="Examples" href="/Examples.html" collapse="true">
-			<item name="Hello World!" href="/ExampleHelloWorld.html" />
-			<item name="Navomatic" href="/ExampleNavomatic.html" />
-			<item name="GuestBook Application" href="/ExampleGuestBook.html" />
-			<item name="StockQuote Component" href="/ExampleStockQuote.html" />
-			<item name="Markup Inheritance" href="/ExampleMarkupInheritance.html" />
-			<item name="Ajax Counter" href="/ExampleAjaxCounter.html" />
-			<item name="Using Fragments" href="/ExampleUsingFragments.html" />
-			<item name="Running the Examples" href="/Examples.html#Running_the_Examples_Yourself" />
-		</item>
-		<item name="Download" href="/Download.html" />
-	</menu>
-	<menu name="Project News">
-		<item name="News" href="/News.html" />
-		<item name="Blogs" href="/Blogs.html" />
-	</menu>
-	<menu name="Documentation">
-		<item name="Vision" href="/Vision.html" />
-		<item name="FAQ" href="/faqs.html" />
-		<item name="Javadoc" href="/apidocs/index.html" target="_blank" class="newwindow" />
-		<item name="Wiki" href="http://cwiki.apache.org/WICKET/" />
-		<item name="Dependencies" href="/dependencies.html" />
-	</menu>
-	<menu name="Releases">
-		<item name="Wicket 1.2" href="http://wicketframework.org/wicket-1.2/index.html" />
-		<item name="Wicket 1.1" href="http://wicketframework.org/wicket-1.1/index.html" />
-		<item name="Wicket 1.0" href="http://wicketframework.org/wicket-1.0/index.html" />
-	</menu>
-	<menu name="Companies">
-		<item name="Commercial Services" href="http://cwiki.apache.org/WICKET/companies-that-provide-services.html" />
-	</menu>
-	<menu name="Related projects">
-		<item name="Wicket Extensions" href="http://wicketframework.org/wicket-extensions/index.html" />
-		<item name="Wicket QuickStart" href="http://wicketframework.org/wicket-quickstart/index.html" />
-		<item name="Wicket Stuff" href="http://wicket-stuff.sourceforge.net" />
-		<item name="Wicket Library" href="http://www.wicket-library.com" />		
+		<item name="Apache Wicket" href="http://incubator.apache.org/wicket" />
+		<item name="Apache" href="http://www.apache.org" />
 	</menu>
 	<menu name="Project Info">
+		<item name="Javadoc" href="/apidocs/index.html" target="_blank" class="newwindow" />
 		<item name="Mailing Lists" href="/mail-lists.html" />
-		<item name="SourceForge" href="/SourceForge.html" />
 		<item name="Apache Incubator" href="http://incubator.apache.org/projects/wicket.html" />
 		<item name="Issue Tracker" href="http://issues.apache.org/jira/browse/WICKET" />
 		<item name="License" href="/license.html" />
-	</menu>
-	<menu name="Development">
-		<item name="Developers" href="/team-list.html" />
 		<item name="SVN Access" href="/source-repository.html" />
-		<item name="Build Reports" href="/project-reports.html" collapse="true">
-			<item name="Unit Tests" href="/surefire-report.html" />
-			<item name="Javadoc" href="/apidocs/index.html" target="_blank" class="newwindow" />
-		</item>
 	</menu>
   </body>
 </project>

Modified: incubator/wicket/branches/wicket-1.x/wicket/src/site/template/wicket-site.vm
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/site/template/wicket-site.vm?view=diff&rev=516971&r1=516970&r2=516971
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/site/template/wicket-site.vm (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/site/template/wicket-site.vm Sun Mar 11 10:53:07 2007
@@ -16,38 +16,6 @@
  *#
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-#macro ( banner $banner $id )
-  #if ( $banner )
-    #if( $banner.href )
-      <a href="$banner.href" id="$id">
-    #else
-        <span id="$id">
-    #end
-
-    #if( $banner.src )
-        #set ( $src = $banner.src )
-        #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
-            #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
-            #set ( $src = $src.replaceAll( "\\", "/" ) )
-        #end
-        #if ( $banner.alt )
-            #set ( $alt = $banner.alt )
-        #else
-            #set ( $alt = "" )
-        #end
-        <img src="$src" alt="$alt" />
-    #else
-        $banner.name
-    #end
-
-    #if( $banner.href )
-        </a>
-    #else
-        </span>
-    #end
-  #end
-#end
-
 #macro ( links $links )
   #set ( $counter = 0 )
   #foreach( $item in $links )
@@ -61,24 +29,6 @@
   #end
 #end
 
-#macro ( breadcrumbs $breadcrumbs )
-  #set ( $counter = 0 )
-  #foreach( $item in $breadcrumbs )
-    #set ( $counter = $counter + 1 )
-    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-    #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
-    #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
-      $item.name
-    #else
-      <a href="$currentItemHref">$item.name</a>
-    #end
-    #if ( $breadcrumbs.size() > $counter )
-      &gt;
-    #end
-  #end
-#end
-
 #macro ( displayTree $display $item )
   #if ( $item && $item.items && $item.items.size() > 0 )
     #foreach( $subitem in $item.items )
@@ -142,214 +92,40 @@
 #end
 
 #macro ( mainMenu $menus )
-  #foreach( $menu in $menus )
-    #if ( $menu.name )
-    <h5>$menu.name</h5>
-    #end
-    <ul>
-      #foreach( $item in $menu.items )
-        #menuItem( $item )
-      #end
-    </ul>
-  #end
-#end
-
-#macro ( copyright )
-  #if ( $project )
-    #set ( $currentYear = ${currentDate.year} + 1900 )
-
-    #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
-      ${project.inceptionYear}-${currentYear}
-    #else
-      ${currentYear}
-    #end
-
-    #if ( ${project.organization} && ${project.organization.name} )
-      ${project.organization.name}
-    #end
-  #end
-#end
-
-#macro ( publishDate $position $publishDate $version )
-  #if ( $publishDate && $publishDate.format )
-    #set ( $format = $publishDate.format )
-  #else
-    #set ( $format = "MM/dd/yyyy" )
-  #end
-
-  $dateFormat.applyPattern( $format )
-
-  #set ( $dateToday = $dateFormat.format( $currentDate ) )
-
-  #if ( $publishDate && $publishDate.position )
-    #set ( $datePosition = $publishDate.position )
-  #else
-    #set ( $datePosition = "left" )
-  #end
-
-  #if ( $version )
-    #if ( $version.position )
-      #set ( $versionPosition = $version.position )
-    #else
-      #set ( $versionPosition = "left" )
-    #end
-  #end
-
-  #set ( $breadcrumbs = $decoration.body.breadcrumbs )
-
-  #if ( $datePosition.equalsIgnoreCase( $position ) )
-    #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
-      &nbsp;| $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
-      #if ( $versionPosition.equalsIgnoreCase( $position ) )
-        &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-      #end
-    #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
-      <div id="lastPublished">
-        $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
-        #if ( $versionPosition.equalsIgnoreCase( $position ) )
-          &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-        #end
-      </div>
-    #elseif ( $datePosition.equalsIgnoreCase("left") )
-      <div class="xleft">
-        $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
-        #if ( $versionPosition.equalsIgnoreCase( $position ) )
-          &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-        #end
-        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          | #breadcrumbs( $breadcrumbs )
-        #end
-      </div>
-    #end
-  #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
-    #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
-      &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-    #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
-      <div id="lastPublished">
-        $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-      </div>
-    #elseif ( $versionPosition.equalsIgnoreCase("left") )
-      <div class="xleft">
-        $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          | #breadcrumbs( $breadcrumbs )
-        #end
-      </div>
-    #end
-  #elseif ( $position.equalsIgnoreCase( "left" ) )
-    #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-      <div class="xleft">
-        #breadcrumbs( $breadcrumbs )
-      </div>
-    #end
-  #end
-#end
-
-#macro ( poweredByLogo $poweredBy )
-    #if( $poweredBy )
-        #foreach ($item in $poweredBy)
-            #if( $item.href )
-                #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
-                #set ( $href = $href.replaceAll( "\\", "/" ) )
-            #else
-                #set ( $href="http://maven.apache.org/" )
-            #end
-
-            #if( $item.name )
-                #set ( $name = $item.name )
-            #else
-                #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" )  )
-                #set ( $name = "${name} Maven"  )
-            #end
-
-            #if( $item.img )
-                #set ( $img = $item.img )
-            #else
-                #set ( $img = "images/logos/maven-feather.png" )
-            #end
-
-            <a href="$href" title="$name" id="poweredBy">
-              #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
-              #set ( $img = $img.replaceAll( "\\", "/" ) )
-              <img alt="$name" src="$img" />
-            </a>
-        #end
-        #if( $poweredBy.isEmpty() )
-          <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" id="poweredBy">
-            <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
-          </a>
-        #end
-    #else
-        <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" id="poweredBy">
-          <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
-        </a>
-    #end
+	#foreach( $menu in $menus )
+		#if ( $menu.name )
+		<h5>$menu.name</h5>
+		#end
+		<ul>
+		#foreach( $item in $menu.items )
+			#menuItem( $item )
+		#end
+		</ul>
+	#end
 #end
 
 <html>
-  <head>
-    <title>$title</title>
-    <style type="text/css" media="all">
-      @import url("$relativePath/css/site.css");
-    </style>
-    <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
-    #foreach( $author in $authors )
-      <meta name="author" content="$author" />
-    #end
-    <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
-    #if ( $decoration.body.head )
-      #foreach( $item in $decoration.body.head.getChildren() )
-        #if ( $item.name == "script" )
-          $item.toUnescapedString()
-        #else
-          $item.toString()
-        #end
-      #end
-    #end
-  </head>
-  <body class="composite">
-  <div id="container">
-    <div id="banner">
-      #banner( $decoration.bannerLeft "bannerLeft" )
-      #banner( $decoration.bannerRight "bannerRight" )
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-      #publishDate( "left" $decoration.publishDate $decoration.version )
-      <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-		<div id="navcolumn">
-			#publishDate( "navigation-top" $decoration.publishDate $decoration.version )
-			#mainMenu( $decoration.body.menus )
-			#poweredByLogo( $decoration.poweredBy )
-			#publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
-			<p></p>
-			<a href="http://www.sourceforge.net" target="_blank"class="logoLink"><img alt="SourceForge.net" src="http://sourceforge.net/sflogo.php?group_id=119783&amp;type=1" /></a>
-			<p></p>
-		</div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-        $bodyContent
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">&#169;#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </div>
-  <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
-  <script type="text/javascript">_uacct = "UA-357038-1";urchinTracker();</script>
-  </body>
+<head>
+	<title>Apache Wicket - $title</title>
+	<link href="style/wicket.css" rel="stylesheet" media="screen" />
+	<!--[if lt IE 7]>
+	<link href="style/ie.css" rel="stylesheet" media="screen" />
+	<![endif]-->
+	<link rel="icon" href="favicon.ico" />
+</head>
+<body>
+<div id="container">
+	<div id="header"><a href="#"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
+	<div id="navigation">
+		#mainMenu( $decoration.body.menus )
+		<div id="clearer"></div>
+		<a href="http://incubator.apache.org/projects/wicket"><h3 id="incubator"><span>Now incubating!</span></h3></a>
+	</div>
+	<div id="contentBody">
+		$bodyContent
+    </div>
+	<div id="clearer"></div>
+	<div id="footer"><span>&copy; Apache Software Foundation</span></div>
+</div>
+</body>
 </html>