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 2007/12/08 12:24:42 UTC
svn commit: r602451 - in /wicket/releases/wicket-1.3.0-rc2: ./
jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/
jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/
jdk-1.5/wicket-examples/src/main/java/org/apache/wick...
Author: frankbille
Date: Sat Dec 8 03:24:37 2007
New Revision: 602451
URL: http://svn.apache.org/viewvc?rev=602451&view=rev
Log:
Merged with trunk for the following:
- WICKET-1209: WicketSessionFilter doesn't call Session.unset() after the filter chain is proecssed
- ghop-asf task 12: restyle wicket examples
Added:
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/ie.css
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/ie.css
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/images/background.gif
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/images/background.gif
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/images/bg_container.png
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/images/bg_container.png
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/images/logo_graduated.png
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/images/logo_graduated.png
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/images/wicket.png
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/images/wicket.png
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/logo.png
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/logo.png
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/main_style.css
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/main_style.css
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/style.css
- copied, changed from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/style.css
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/wicket-bg.png
- copied unchanged from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/wicket-bg.png
Modified:
wicket/releases/wicket-1.3.0-rc2/ (props changed)
wicket/releases/wicket-1.3.0-rc2/NOTICE
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignInPage.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignOutPage.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/bug.png
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/index.html
Propchange: wicket/releases/wicket-1.3.0-rc2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 8 03:24:37 2007
@@ -1,3 +1,4 @@
-target
-.metadata
-.project
+target
+.metadata
+.project
+velocity.log
Modified: wicket/releases/wicket-1.3.0-rc2/NOTICE
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/NOTICE?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/NOTICE (original)
+++ wicket/releases/wicket-1.3.0-rc2/NOTICE Sat Dec 8 03:24:37 2007
@@ -1,5 +1,5 @@
Apache Wicket
-Copyright 2006 The Apache Software Foundation
+Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -12,6 +12,23 @@
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
+src/jdk-1.4/wicket-datetime
+---------------------------------------------------------------------------
+ Apache Wicket Date Time
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Contains code of the Yahoo User Interface library (version: 0.12.2),
+ released under the BSD License:
+ http://developer.yahoo.net/yui/license.txt
+ Copyright (c) 2006, Yahoo!
+
+ This product includes software developed by
+ Joda.org (http://www.joda.org/).
+
+---------------------------------------------------------------------------
src/jdk-1.4/wicket
---------------------------------------------------------------------------
Apache Wicket
@@ -76,35 +93,23 @@
[1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
---------------------------------------------------------------------------
-src/jdk-1.4/wicket-datetime
+src/jdk-1.4/wicket-quickstart/NOTICE
---------------------------------------------------------------------------
- Apache Wicket Date Time
+ Apache Wicket
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
- Contains code of the Yahoo User Interface library (version: 0.12.2),
- released under the BSD License:
- http://developer.yahoo.net/yui/license.txt
- Copyright (c) 2006, Yahoo!
- This product includes software developed by
- Joda.org (http://www.joda.org/).
-
---------------------------------------------------------------------------
-src/jdk-1.4/wicket-extensions
+src/jdk-1.4/wicket-spring
---------------------------------------------------------------------------
- Apache Wicket Extensions
+ Apache Wicket
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
---------------------------------------------------------------------------
@@ -115,22 +120,17 @@
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/jdk-1.4/wicket-quickstart/NOTICE
+src/jdk-1.4/wicket-extensions
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Extensions
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/).
+ Contains software developed in Apache Turbine, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2005
---------------------------------------------------------------------------
src/jdk-1.5/wicket-auth-roles
@@ -196,7 +196,7 @@
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/jdk-1.5/wicket-objectssizeof-agent
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -204,8 +204,9 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-objectssizeof-agent
+src/jdk-1.5/wicket-spring-annot
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -213,9 +214,8 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-spring-annot
+src/jdk-1.5/wicket-jmx
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java Sat Dec 8 03:24:37 2007
@@ -82,14 +82,13 @@
* public class HelloWorldServlet extends HttpServlet
* {
* public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException,
- * IOException
+ * IOException
* {
* res.setContentType("text/html");
* PrintWriter out = res.getWriter();
* String message = "Hi. " +
- * (Session.exists()
- * ? " I know Wicket session " + Session.get() + "."
- * : " I can't find a Wicket session.");
+ * (Session.exists() ? " I know Wicket session " + Session.get() + "."
+ * : " I can't find a Wicket session.");
* out.println(message);
* out.close();
* }
@@ -132,8 +131,8 @@
if (filterName == null)
{
throw new ServletException(
- "you must provide init parameter 'filterName if you want to use " +
- getClass().getName());
+ "you must provide init parameter 'filterName if you want to use " +
+ getClass().getName());
}
if (log.isDebugEnabled())
@@ -154,7 +153,7 @@
* javax.servlet.ServletResponse, javax.servlet.FilterChain)
*/
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
+ throws IOException, ServletException
{
HttpServletRequest httpServletRequest = ((HttpServletRequest)request);
HttpSession httpSession = httpServletRequest.getSession(false);
@@ -169,8 +168,8 @@
if (log.isDebugEnabled())
{
log.debug("session " + session + " set as current for " +
- httpServletRequest.getContextPath() + "," +
- httpServletRequest.getServerName());
+ httpServletRequest.getContextPath() + "," +
+ httpServletRequest.getServerName());
}
}
else
@@ -178,9 +177,8 @@
if (log.isDebugEnabled())
{
log.debug("could not set Wicket session: key " + sessionKey +
- " not found in http session for " +
- httpServletRequest.getContextPath() + "," +
- httpServletRequest.getServerName());
+ " not found in http session for " + httpServletRequest.getContextPath() +
+ "," + httpServletRequest.getServerName());
}
}
}
@@ -189,13 +187,19 @@
if (log.isDebugEnabled())
{
log.debug("could not set Wicket session: no http session was created yet for " +
- httpServletRequest.getContextPath() + "," +
- httpServletRequest.getServerName());
+ httpServletRequest.getContextPath() + "," + httpServletRequest.getServerName());
}
}
- // go on with processing
- chain.doFilter(request, response);
+ try
+ {
+ // go on with processing
+ chain.doFilter(request, response);
+ }
+ finally
+ {
+ Session.unset();
+ }
}
/**
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html Sat Dec 8 03:24:37 2007
@@ -1,8 +1,7 @@
<html xmlns:wicket>
<body>
<wicket:panel>
- <h1 wicket:id="hideInPortlet"><a href="index.html" style="color: #E9601A" target="_top">Wicket Examples</a></h1>
- <span wicket:id="inspector"/>
+ <div wicket:id="hideInPortlet"><a href="index.html" style="color: #E9601A" target="_top"><img src="logo.png" /></a><span wicket:id="inspector"/></div>
<div id="titleblock" style="font-size:larger;height:1.5em;vertical-align:center;">
<div style="float:left;"><span wicket:id="exampleTitle">Example Title Goes Here</span></div>
<div style="float:right;padding-right:10px"><a href="#" wicket:id="sources">Source code</a></div>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java Sat Dec 8 03:24:37 2007
@@ -27,7 +27,6 @@
import org.apache.wicket.markup.html.link.PopupSettings;
import org.apache.wicket.markup.html.panel.Panel;
-
/**
* Navigation panel for the examples project.
*
@@ -48,7 +47,7 @@
public WicketExampleHeader(String id, String exampleTitle, WebPage page)
{
super(id);
- add(new WebMarkupContainer("hideInPortlet")
+ WebMarkupContainer hideInPortlet = new WebMarkupContainer("hideInPortlet")
{
/**
* @see org.apache.wicket.Component#isVisible()
@@ -58,11 +57,13 @@
{
return !RequestContext.get().isPortletRequest();
}
- });
- add(new InspectorBug("inspector", page));
+ };
+ add(hideInPortlet);
+ hideInPortlet.add(new InspectorBug("inspector", page));
add(new Label("exampleTitle", exampleTitle));
Link link = new Link("sources")
{
+ @Override
public void onClick()
{
setResponsePage(new SourcesPage(getPage().getClass()));
@@ -71,7 +72,7 @@
add(link);
PopupSettings settings = new PopupSettings(PageMap.forName("sources"),
- PopupSettings.RESIZABLE);
+ PopupSettings.RESIZABLE);
settings.setWidth(800);
settings.setHeight(600);
settings.setWindowName("sources");
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignInPage.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignInPage.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignInPage.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignInPage.html Sat Dec 8 03:24:37 2007
@@ -18,6 +18,9 @@
<head>
<title>Sign In</title>
<link rel="stylesheet" type="text/css" href="style.css"/>
+ <style>
+ body { background-image: none; }
+ </style>
</head>
<body>
<h2>Sign In</h2>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignOutPage.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignOutPage.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignOutPage.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication/MySignOutPage.html Sat Dec 8 03:24:37 2007
@@ -18,6 +18,9 @@
<head>
<title>Sign Out</title>
<link rel="stylesheet" type="text/css" href="style.css"/>
+ <style>
+ body { background-image: none; }
+ </style>
</head>
<body>
<h2>Goodbye!</h2>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/bug.png
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/bug.png?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
Binary files - no diff available.
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html Sat Dec 8 03:24:37 2007
@@ -2,6 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" >
<head>
<title>Top Frame</title>
+ <link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
<span wicket:id="mainNavigation"/>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html Sat Dec 8 03:24:37 2007
@@ -11,6 +11,7 @@
padding: 0;
margin: 0;
height: 100%;
+ background-image: none;
}
#header {
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html Sat Dec 8 03:24:37 2007
@@ -3,6 +3,9 @@
<head>
<title>Wicket Examples - stateless</title>
<link rel="stylesheet" type="text/css" href="style.css" />
+ <style>
+ body { background-image: none; }
+ </style>
</head>
<body>
<span wicket:id="message" id="message">Message goes here</span>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html Sat Dec 8 03:24:37 2007
@@ -3,6 +3,9 @@
<head>
<title>Wicket Examples - stateless</title>
<link rel="stylesheet" type="text/css" href="style.css" />
+ <style>
+ body { background-image: none; }
+ </style>
</head>
<body>
<span wicket:id="message" id="message">Message goes here</span>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html Sat Dec 8 03:24:37 2007
@@ -3,6 +3,9 @@
<head>
<title>Wicket Examples - stateless</title>
<link rel="stylesheet" type="text/css" href="style.css" />
+ <style>
+ body { background-image: none; }
+ </style>
</head>
<body>
<span wicket:id="message" id="message">Message goes here</span>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html Sat Dec 8 03:24:37 2007
@@ -12,8 +12,8 @@
The VelocityPanel is useful for CMS-like functionality, where you want
to enable users to do basic scripting in predefined areas of your web
application. Read more about the
- <a href="http://jakarta.apache.org/velocity/">velocity</a> language
- <a href="http://jakarta.apache.org/velocity/user-guide.html">here</a>.
+ <a href="http://velocity.apache.org/">velocity</a> language
+ <a href="http://velocity.apache.org/engine/devel/user-guide.html">here</a>.
</p>
</div>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html Sat Dec 8 03:24:37 2007
@@ -21,6 +21,7 @@
</head>
<body>
+ <span wicket:id="mainNavigation"/>
<a href="#" wicket:id="home-link">Home Page</a>
<hr/>
<wicket:child/>
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java Sat Dec 8 03:24:37 2007
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.spring.common.web;
-import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
/**
@@ -24,7 +24,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class BasePage extends WebPage
+public class BasePage extends WicketExamplePage
{
public BasePage()
{
Modified: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/index.html?rev=602451&r1=602450&r2=602451&view=diff
==============================================================================
--- wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/index.html (original)
+++ wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/index.html Sat Dec 8 03:24:37 2007
@@ -1,19 +1,23 @@
-<html xmlns:wicket="http://wicket.apache.org/">
- <head>
- <title>Wicket examples</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
- </head>
- <body>
- <p>
- <h1>Wicket Examples</h1>
- <p id="titleblock">
- <b><font size="+1">menu</font></b>
- </p>
- <p>
- The following examples demonstrate both core functionality and also functionality in other modules (e.g. wicket-extensions):
- </p>
- <table>
- <tr><td align="right"><a href="helloworld">helloworld</a></td><td> - As simple as it gets.</td></tr>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Wicket Examples</title>
+ <link href="main_style.css" rel="stylesheet" type="text/css" />
+ <!--[if lte IE 6]>
+ <link href="ie.css" rel="stylesheet" type="text/css" />
+ <![endif]-->
+
+</head>
+
+<body>
+<div id="container">
+ <div id="content">
+ <div id="header"></div>
+ </div>
+ <h1> Menu</h1>
+<table>
+ <tbody><tr><td align="right"><a href="helloworld">helloworld</a></td><td> - As simple as it gets.</td></tr>
<tr><td align="right"><a href="echo">echo</a></td><td> - Trivial input form.</td></tr>
<tr><td align="right"><a href="forminput">forminput</a></td><td> - Basic form processing.</td></tr>
<tr><td align="right"><a href="compref">compref</a></td><td> - Component Reference.</td></tr>
@@ -54,6 +58,14 @@
<tr class="section"><td align="right"><a href="spring">spring</a></td><td> - Demonstrates integration options with the Spring framework.</td></tr>
<tr><td align="right"><a href="guice">guice</a></td><td> - Integration with the Google Guice IoC container.</td></tr>
<tr><td align="right"><a href="velocity">velocity</a></td><td> - Shows a Velocity panel in action.</td></tr>
- </table>
- </body>
-</html>
+ </tbody></table>
+
+
+
+
+ <!-- </div> -->
+ <div id="clearer"/>
+</div>
+</body>
+
+</html>
\ No newline at end of file
Copied: wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/style.css (from r602351, wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/style.css)
URL: http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/style.css?p2=wicket/releases/wicket-1.3.0-rc2/jdk-1.5/wicket-examples/src/main/webapp/style.css&p1=wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/style.css&r1=602351&r2=602451&rev=602451&view=diff
==============================================================================
(empty)