Author: ivaynberg
Date: Tue Aug 16 03:56:05 2011
New Revision: 1158100
URL: http://svn.apache.org/viewvc?rev=1158100&view=rev
Log:
fix tests
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage1.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage2.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage3.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/InjectionPage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/WeldHomePage.html
wicket/trunk/wicket-examples/src/main/resources/META-INF/beans.xml
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage1.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage1.html?rev=1158100&r1=1158099&r2=1158100&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage1.html
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage1.html
Tue Aug 16 03:56:05 2011
@@ -1,15 +1,20 @@
+<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org";>
+<body>
<wicket:extend>
-
- <p>This page demonstrates conversational propagation between
+ <p>
+ This page demonstrates conversational propagation between
non-bookmarkable pages. Below is a counter that is
conversation-scoped. Click increment a couple of times and then
click
the 'Continue to next page', the counter value should persist
on the
- next page.</p>
+ next page.
+ </p>
<p>
- Current counter value is: <span wicket:id="count">100</span> <a
- wicket:id="increment">increment</a>
+ Current counter value is: <span wicket:id="count">100</span>
+ <a wicket:id="increment">increment</a>
</p>
<p>
<a wicket:id="next">Continue to next page</a>
</p>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
+</body>
+</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage2.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage2.html?rev=1158100&r1=1158099&r2=1158100&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage2.html
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage2.html
Tue Aug 16 03:56:05 2011
@@ -1,18 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org";>
+<body>
<wicket:extend>
-
<p>
This page was reached via a non-bookmarkable link so
conversation was propagated.
Notice the conversational counter injected into this page has
the same value as in the
- previous page, this is because it is the same counter
instance.</p>
- <p>
+ previous page, this is because it is the same counter instance.
+ </p>
<p>
The 'Continue to next page' link below is a bookmarkable link.
Conversations do not propagate
across bookmarkable links, so the counter on the next page will
have the starting value of zero.
</p>
- Current counter value is: <span wicket:id="count">100</span> <a
- wicket:id="increment">increment</a>
+ <p>
+ Current counter value is: <span wicket:id="count">100</span>
+ <a wicket:id="increment">increment</a>
</p>
<p>
<a wicket:id="next">Continue to next page</a>
</p>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
+</body>
+</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage3.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage3.html?rev=1158100&r1=1158099&r2=1158100&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage3.html
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/ConversationPage3.html
Tue Aug 16 03:56:05 2011
@@ -1,3 +1,5 @@
+<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org";>
+<body>
<wicket:extend>
<p>
This page was reached via a bookmarkable link, which means the
conversation
@@ -6,4 +8,6 @@
<p>
Current counter value is: <span wicket:id="count">100</span>
</p>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
+</body>
+</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/InjectionPage.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/InjectionPage.html?rev=1158100&r1=1158099&r2=1158100&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/InjectionPage.html
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/InjectionPage.html
Tue Aug 16 03:56:05 2011
@@ -1,5 +1,6 @@
+<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org";>
+<body>
<wicket:extend>
-
<p>
This page demonstrates injection of a application-scoped Counter service
</p>
@@ -10,5 +11,6 @@
<p>
Notice as you navigate away and come back to this page the value
persists or is larger because it is shared across all users in application scope
</p>
-
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
+</body>
+</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/WeldHomePage.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/WeldHomePage.html?rev=1158100&r1=1158099&r2=1158100&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/WeldHomePage.html
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/weld/WeldHomePage.html
Tue Aug 16 03:56:05 2011
@@ -1,14 +1,16 @@
+<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org";>
+<body>
<wicket:extend>
-
-<wicket:link>
-<ul>
- <li>
- <a href="InjectionPage.html">Injection Example</a>
- </li>
- <li>
- <a href="ConversationPage1.html">Conversation Propagation
Example</a>
- </li>
-</ul>
-</wicket:link>
-
-</wicket:extend>
\ No newline at end of file
+ <wicket:link>
+ <ul>
+ <li>
+ <a href="InjectionPage.html">Injection Example</a>
+ </li>
+ <li>
+ <a href="ConversationPage1.html">Conversation
Propagation Example</a>
+ </li>
+ </ul>
+ </wicket:link>
+</wicket:extend>
+</body>
+</html>
\ No newline at end of file
Modified: wicket/trunk/wicket-examples/src/main/resources/META-INF/beans.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/resources/META-INF/beans.xml?rev=1158100&r1=1158099&r2=1158100&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/resources/META-INF/beans.xml
(original)
+++ wicket/trunk/wicket-examples/src/main/resources/META-INF/beans.xml Tue Aug
16 03:56:05 2011
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<beans xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
