jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1396331 [2/3] - in /incubator/jspwiki/trunk: ./ src/org/apache/wiki/ src/org/apache/wiki/attachment/ src/org/apache/wiki/auth/ src/org/apache/wiki/auth/acl/ src/org/apache/wiki/auth/authorize/ src/org/apache/wiki/auth/login/ src/org/apache...
Date Tue, 09 Oct 2012 21:16:32 GMT
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupFullName.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupFullName.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupFullName.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupFullName.html Tue Oct  9 21:16:31 2012
@@ -1,90 +1,109 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Create Group Full Name</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Create Group Full Name<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Create Group Full Name</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Create Group Full Name<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Test-group-'+new Date().getTime()}</td>	<td>group</td></tr>
-	<tr><td>store</td>	<td>Janne Jalkanen</td>									<td>members</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp</td>			<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>		<td>loginurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Group.jsp?</td>		<td>viewgroupurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/NewGroup.jsp?</td>	<td>newgroupurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/EditGroup.jsp?</td>	<td>editgroupurl</td></tr>
-	<tr><td>store</td>	<td>janne</td>	<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
-
-    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
-
-    <!-- login -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day</td>	<td></td></tr>
-    <tr><td>verifyTextPresent</td>	<td>(authenticated)</td>	<td></td></tr>
-        
-    <!-- First, name the group -->
-    <tr><td>open</td>	<td>${newgroupurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: New Group</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>css=form#createGroup input[name="ok"]</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>group</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>members</td>	<td></td></tr>
-
-    <tr><td>type</td>			<td>group</td>		<td>${group}</td></tr>
-    <tr><td>type</td>			<td>members</td>	<td>${members}</td></tr>
-    <tr><td>clickAndWait</td>	<td>css=form#createGroup input[name="ok"]</td>	<td>&nbsp;</td></tr>
-        
-    <!-- Verify the group was created -->
-    <tr><td>verifyTextNotPresent</td>	<td>Could not create group</td>	<td></td></tr>
-
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
-        
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-    <!-- Verifiy that anonymous users can't view the group -->
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>Please sign in</td>	<td></td></tr>
-        
-    <!-- Log in again and verify we can read it -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
-        
-    <!-- Try to edit, it should be allowed -->
-    <tr><td>open</td>	<td>${editgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
-
-    <tr><td>verifyElementPresent</td>	<td>css=form#editGroup</td>	<td></td></tr>
-        
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-    
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>javascript{'Test-group-'+new Date().getTime()}</td>	<td>group</td></tr>
+	<tr><td>store</td>	<td>Janne Jalkanen</td>									<td>members</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp</td>			<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>		<td>loginurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Group.jsp?</td>		<td>viewgroupurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/NewGroup.jsp?</td>	<td>newgroupurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/EditGroup.jsp?</td>	<td>editgroupurl</td></tr>
+	<tr><td>store</td>	<td>janne</td>	<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
+
+    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
+
+    <!-- login -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day</td>	<td></td></tr>
+    <tr><td>verifyTextPresent</td>	<td>(authenticated)</td>	<td></td></tr>
+        
+    <!-- First, name the group -->
+    <tr><td>open</td>	<td>${newgroupurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: New Group</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>css=form#createGroup input[name="ok"]</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>group</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>members</td>	<td></td></tr>
+
+    <tr><td>type</td>			<td>group</td>		<td>${group}</td></tr>
+    <tr><td>type</td>			<td>members</td>	<td>${members}</td></tr>
+    <tr><td>clickAndWait</td>	<td>css=form#createGroup input[name="ok"]</td>	<td>&nbsp;</td></tr>
+        
+    <!-- Verify the group was created -->
+    <tr><td>verifyTextNotPresent</td>	<td>Could not create group</td>	<td></td></tr>
+
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
+        
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+    <!-- Verifiy that anonymous users can't view the group -->
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>Please sign in</td>	<td></td></tr>
+        
+    <!-- Log in again and verify we can read it -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
+        
+    <!-- Try to edit, it should be allowed -->
+    <tr><td>open</td>	<td>${editgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
+
+    <tr><td>verifyElementPresent</td>	<td>css=form#editGroup</td>	<td></td></tr>
+        
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+    
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupLoginName.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupLoginName.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupLoginName.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupLoginName.html Tue Oct  9 21:16:31 2012
@@ -1,89 +1,108 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Create Group Login Name</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Create Group Login Name<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Create Group Login Name</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Create Group Login Name<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Test-group-'+new Date().getTime()}</td>	<td>group</td></tr>
-	<tr><td>store</td>	<td>janne</td>									<td>members</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp</td>			<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>		<td>loginurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Group.jsp?</td>		<td>viewgroupurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/NewGroup.jsp?</td>	<td>newgroupurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/EditGroup.jsp?</td>	<td>editgroupurl</td></tr>
-	<tr><td>store</td>	<td>janne</td>	<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
-
-    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
-
-    <!-- login -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day</td>	<td></td></tr>
-    <tr><td>verifyTextPresent</td>	<td>(authenticated)</td>	<td></td></tr>
-        
-    <!-- First, name the group -->
-    <tr><td>open</td>	<td>${newgroupurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: New Group</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>css=form#createGroup input[name="ok"]</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>group</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>members</td>	<td></td></tr>
-
-    <tr><td>type</td>			<td>group</td>		<td>${group}</td></tr>
-    <tr><td>type</td>			<td>members</td>	<td>${members}</td></tr>
-    <tr><td>clickAndWait</td>	<td>css=form#createGroup input[name="ok"]</td>	<td>&nbsp;</td></tr>
-        
-    <!-- Verify the group was created -->
-    <tr><td>verifyTextNotPresent</td>	<td>Could not create group</td>	<td></td></tr>
-
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
-        
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-    <!-- Verifiy that anonymous users can't view the group -->
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>Please sign in</td>	<td></td></tr>
-        
-    <!-- Log in again and verify we can read it -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
-        
-    <!-- Try to edit, it should be allowed -->
-    <tr><td>open</td>	<td>${editgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
-
-    <tr><td>verifyElementPresent</td>	<td>css=form#editGroup</td>	<td></td></tr>
-        
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>javascript{'Test-group-'+new Date().getTime()}</td>	<td>group</td></tr>
+	<tr><td>store</td>	<td>janne</td>									<td>members</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp</td>			<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>		<td>loginurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Group.jsp?</td>		<td>viewgroupurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/NewGroup.jsp?</td>	<td>newgroupurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/EditGroup.jsp?</td>	<td>editgroupurl</td></tr>
+	<tr><td>store</td>	<td>janne</td>	<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
+
+    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
+
+    <!-- login -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day</td>	<td></td></tr>
+    <tr><td>verifyTextPresent</td>	<td>(authenticated)</td>	<td></td></tr>
+        
+    <!-- First, name the group -->
+    <tr><td>open</td>	<td>${newgroupurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: New Group</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>css=form#createGroup input[name="ok"]</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>group</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>members</td>	<td></td></tr>
+
+    <tr><td>type</td>			<td>group</td>		<td>${group}</td></tr>
+    <tr><td>type</td>			<td>members</td>	<td>${members}</td></tr>
+    <tr><td>clickAndWait</td>	<td>css=form#createGroup input[name="ok"]</td>	<td>&nbsp;</td></tr>
+        
+    <!-- Verify the group was created -->
+    <tr><td>verifyTextNotPresent</td>	<td>Could not create group</td>	<td></td></tr>
+
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
+        
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+    <!-- Verifiy that anonymous users can't view the group -->
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>Please sign in</td>	<td></td></tr>
+        
+    <!-- Log in again and verify we can read it -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
+        
+    <!-- Try to edit, it should be allowed -->
+    <tr><td>open</td>	<td>${editgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
+
+    <tr><td>verifyElementPresent</td>	<td>css=form#editGroup</td>	<td></td></tr>
+        
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupWikiName.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupWikiName.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupWikiName.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupWikiName.html Tue Oct  9 21:16:31 2012
@@ -1,89 +1,108 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Create Group WikiName</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Create Group WikiName<br></td></tr>
-	
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Create Group WikiName</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Create Group WikiName<br></td></tr>
+	
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Test-group-'+new Date().getTime()}</td>	<td>group</td></tr>
-	<tr><td>store</td>	<td>JanneJalkanen</td>									<td>members</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp</td>			<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>		<td>loginurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Group.jsp?</td>		<td>viewgroupurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/NewGroup.jsp?</td>	<td>newgroupurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/EditGroup.jsp?</td>	<td>editgroupurl</td></tr>
-	<tr><td>store</td>	<td>janne</td>	<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
-
-    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
-
-    <!-- login -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day</td>	<td></td></tr>
-    <tr><td>verifyTextPresent</td>	<td>(authenticated)</td>	<td></td></tr>
-        
-    <!-- First, name the group -->
-    <tr><td>open</td>	<td>${newgroupurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: New Group</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>css=form#createGroup input[name="ok"]</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>group</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>members</td>	<td></td></tr>
-
-    <tr><td>type</td>			<td>group</td>		<td>${group}</td></tr>
-    <tr><td>type</td>			<td>members</td>	<td>${members}</td></tr>
-    <tr><td>clickAndWait</td>	<td>css=form#createGroup input[name="ok"]</td>	<td>&nbsp;</td></tr>
-        
-    <!-- Verify the group was created -->
-    <tr><td>verifyTextNotPresent</td>	<td>Could not create group</td>	<td></td></tr>
-
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
-        
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-    <!-- Verifiy that anonymous users can't view the group -->
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>Please sign in</td>	<td></td></tr>
-        
-    <!-- Log in again and verify we can read it -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
-        
-    <!-- Try to edit, it should be allowed -->
-    <tr><td>open</td>	<td>${editgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
-
-    <tr><td>verifyElementPresent</td>	<td>css=form#editGroup</td>	<td></td></tr>
-        
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>javascript{'Test-group-'+new Date().getTime()}</td>	<td>group</td></tr>
+	<tr><td>store</td>	<td>JanneJalkanen</td>									<td>members</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp</td>			<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>		<td>loginurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Group.jsp?</td>		<td>viewgroupurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/NewGroup.jsp?</td>	<td>newgroupurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/EditGroup.jsp?</td>	<td>editgroupurl</td></tr>
+	<tr><td>store</td>	<td>janne</td>	<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
+
+    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
+
+    <!-- login -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day</td>	<td></td></tr>
+    <tr><td>verifyTextPresent</td>	<td>(authenticated)</td>	<td></td></tr>
+        
+    <!-- First, name the group -->
+    <tr><td>open</td>	<td>${newgroupurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: New Group</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>css=form#createGroup input[name="ok"]</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>group</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>members</td>	<td></td></tr>
+
+    <tr><td>type</td>			<td>group</td>		<td>${group}</td></tr>
+    <tr><td>type</td>			<td>members</td>	<td>${members}</td></tr>
+    <tr><td>clickAndWait</td>	<td>css=form#createGroup input[name="ok"]</td>	<td>&nbsp;</td></tr>
+        
+    <!-- Verify the group was created -->
+    <tr><td>verifyTextNotPresent</td>	<td>Could not create group</td>	<td></td></tr>
+
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
+        
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+    <!-- Verifiy that anonymous users can't view the group -->
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>Please sign in</td>	<td></td></tr>
+        
+    <!-- Log in again and verify we can read it -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>open</td>	<td>${viewgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>This is the wiki group called</td>	<td></td></tr>
+        
+    <!-- Try to edit, it should be allowed -->
+    <tr><td>open</td>	<td>${editgroupurl}group=${group}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td></td></tr>
+
+    <tr><td>verifyElementPresent</td>	<td>css=form#editGroup</td>	<td></td></tr>
+        
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreatePage.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreatePage.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreatePage.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreatePage.html Tue Oct  9 21:16:31 2012
@@ -1,48 +1,67 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Create Page</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Create Page<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Create Page</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Create Page<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Createpage '+new Date().getTime()}</td>	<td>page</td></tr>
-	<tr><td>store</td>	<td>janne</td>			<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
-
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=Main</td>		<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>			<td>loginurl</td></tr>
-    <tr><td>store</td>	<td>This page was created by the web unit tests.</td>	<td>PageContent</td></tr>
-
-	<!-- Login -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-	<!-- create page -->
-    <tr><td>open</td>	<td>${editurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
-
-    <tr><td>type</td>			<td>id=editorarea</td>		<td>${PageContent}</td></tr>
-    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
-    
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>javascript{'Createpage '+new Date().getTime()}</td>	<td>page</td></tr>
+	<tr><td>store</td>	<td>janne</td>			<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
+
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=Main</td>		<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>			<td>loginurl</td></tr>
+    <tr><td>store</td>	<td>This page was created by the web unit tests.</td>	<td>PageContent</td></tr>
+
+	<!-- Login -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+	<!-- create page -->
+    <tr><td>open</td>	<td>${editurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
+
+    <tr><td>type</td>			<td>id=editorarea</td>		<td>${PageContent}</td></tr>
+    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
+    
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePage.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePage.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePage.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePage.html Tue Oct  9 21:16:31 2012
@@ -1,64 +1,83 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Delete Page</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Delete Page<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Delete Page</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Delete Page<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Delete-page '+new Date().getTime()}</td>	<td>page</td></tr>
-	<tr><td>store</td>	<td>admin</td>		<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
-
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>	<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>				<td>loginurl</td></tr>
-    <tr><td>store</td>	<td>This page was created by the web unit tests.</td>	<td>PageContent</td></tr>
-
-	<!-- Login --!>
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-	<!-- Create page --!>
-    <tr><td>open</td>					<td>${editurl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>			<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
-
-    <tr><td>type</td>			<td>id=editorarea</td>		<td>${PageContent}</td></tr>
-    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>open</td>				<td>${url}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
-    
-	<!-- Delete Page --!>
-    <tr><td>open</td>					<td>${infourl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>			<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>assertElementPresent</td>	<td>id=delete-all</td>	<td>&nbsp;</td></tr>	
-    <tr><td>clickAndWait</td>			<td>id=delete-all</td> 	<td>&nbsp;</td></tr>
-
-    <!-- Confirm delete --!>
-    <tr><td>assertConfirmation</td>	<td>Please confirm that you want to delete this content permanently!</td>	<td>&nbsp;</td></tr>	
-
-
-    <!-- This page does not exist. Why don&#8217;t you go and create it? --!>
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>This page does not exist. Why don&#8217;t you go and create it?</td> <td>&nbsp;</td></tr>	
-	<!-- class= information --!>
-
-    <!-- Log out --!>
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>javascript{'Delete-page '+new Date().getTime()}</td>	<td>page</td></tr>
+	<tr><td>store</td>	<td>admin</td>		<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
+
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>	<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>				<td>loginurl</td></tr>
+    <tr><td>store</td>	<td>This page was created by the web unit tests.</td>	<td>PageContent</td></tr>
+
+	<!-- Login --!>
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+	<!-- Create page --!>
+    <tr><td>open</td>					<td>${editurl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>			<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
+
+    <tr><td>type</td>			<td>id=editorarea</td>		<td>${PageContent}</td></tr>
+    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>open</td>				<td>${url}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
+    
+	<!-- Delete Page --!>
+    <tr><td>open</td>					<td>${infourl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>			<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>assertElementPresent</td>	<td>id=delete-all</td>	<td>&nbsp;</td></tr>	
+    <tr><td>clickAndWait</td>			<td>id=delete-all</td> 	<td>&nbsp;</td></tr>
+
+    <!-- Confirm delete --!>
+    <tr><td>assertConfirmation</td>	<td>Please confirm that you want to delete this content permanently!</td>	<td>&nbsp;</td></tr>	
+
+
+    <!-- This page does not exist. Why don&#8217;t you go and create it? --!>
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>This page does not exist. Why don&#8217;t you go and create it?</td> <td>&nbsp;</td></tr>	
+	<!-- class= information --!>
+
+    <!-- Log out --!>
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePageNonAdmin.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePageNonAdmin.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePageNonAdmin.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePageNonAdmin.html Tue Oct  9 21:16:31 2012
@@ -1,54 +1,73 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Delete Page</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Delete Page<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Delete Page</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Delete Page<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Delete-page '+new Date().getTime()}</td>	<td>page</td></tr>
-	<tr><td>store</td>	<td>janne</td>		<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
-
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>	<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>				<td>loginurl</td></tr>
-    <tr><td>store</td>	<td>This page was created by the web unit tests.</td>	<td>PageContent</td></tr>
-
-	<!-- Login --!>
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-	<!-- Create page --!>
-    <tr><td>open</td>					<td>${editurl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>			<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
-
-    <tr><td>type</td>			<td>id=editorarea</td>		<td>${PageContent}</td></tr>
-    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>open</td>				<td>${url}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
-    
-	<!-- Delete Page --!>
-    <tr><td>open</td>					<td>${infourl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>			<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>assertElementNotPresent</td>	<td>id=delete-all</td>	<td>&nbsp;</td></tr>	
-
-    <!-- Log out --!>
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>javascript{'Delete-page '+new Date().getTime()}</td>	<td>page</td></tr>
+	<tr><td>store</td>	<td>janne</td>		<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
+
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>	<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/PageInfo.jsp?page=${page}</td><td>infourl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>				<td>loginurl</td></tr>
+    <tr><td>store</td>	<td>This page was created by the web unit tests.</td>	<td>PageContent</td></tr>
+
+	<!-- Login --!>
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+	<!-- Create page --!>
+    <tr><td>open</td>					<td>${editurl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>			<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
+
+    <tr><td>type</td>			<td>id=editorarea</td>		<td>${PageContent}</td></tr>
+    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>open</td>				<td>${url}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
+    
+	<!-- Delete Page --!>
+    <tr><td>open</td>					<td>${infourl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>			<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>assertElementNotPresent</td>	<td>id=delete-all</td>	<td>&nbsp;</td></tr>	
+
+    <!-- Log out --!>
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Login.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Login.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Login.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Login.html Tue Oct  9 21:16:31 2012
@@ -1,44 +1,63 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Login</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Login<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Login</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Login<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=Main</td>	<td>url</td></tr>
-	<tr><td>store</td>	<td>janne</td>		<td>TestLoginname</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
-    
-    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
-
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=Main</td>	<td>url</td></tr>
+	<tr><td>store</td>	<td>janne</td>		<td>TestLoginname</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
+    
+    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
+
     <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
-
-    <!-- login -->
-    <tr><td>clickAndWait</td>	<td>link=Log in</td> 	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyValue</td>	<td>j_username</td>		<td>&nbsp;</td></tr>
-    <tr><td>verifyValue</td>	<td>j_password</td>		<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>submitlogin</td>	<td></td></tr>
-
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestLoginname}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td><td>JSPWiki: Main</td><td>&nbsp;</td></tr>
-    
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-	</tbody>
-</table>
-
-</body>
-</html>
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
+
+    <!-- login -->
+    <tr><td>clickAndWait</td>	<td>link=Log in</td> 	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>	<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyValue</td>	<td>j_username</td>		<td>&nbsp;</td></tr>
+    <tr><td>verifyValue</td>	<td>j_password</td>		<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>submitlogin</td>	<td></td></tr>
+
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestLoginname}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td><td>JSPWiki: Main</td><td>&nbsp;</td></tr>
+    
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Logout.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Logout.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Logout.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Logout.html Tue Oct  9 21:16:31 2012
@@ -1,46 +1,65 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Logout</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Logout<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Logout</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Logout<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=Main</td>	<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>			<td>loginurl</td></tr>
-	<tr><td>store</td>	<td>janne</td>			<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
-	<tr><td>store</td>	<td>Janne\+Jalkanen</td>	<td>wikiname</td></tr>
-
-	<!-- Start at front page: try to log in -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>		<td>G&#8217;day</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>		<td>(authenticated)</td><td>&nbsp;</td></tr>
-
-    <tr><td>assertCookie</td>	<td>regex:JSPWikiAssertedName=${wikiname}</td>	<td></td></tr>
-
-    <!-- Log out; we should NOT see any asserted identities -->
-    <tr><td>assertElementPresent</td>	<td>link=Log out</td>	<td></td></tr>
-    <tr><td>clickAndWait</td>			<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>assertNotCookie</td>	<td>regex:JSPWikiAssertedName=${wikiname}</td>	<td></td></tr>
-    
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=Main</td>	<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>			<td>loginurl</td></tr>
+	<tr><td>store</td>	<td>janne</td>			<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
+	<tr><td>store</td>	<td>Janne\+Jalkanen</td>	<td>wikiname</td></tr>
+
+	<!-- Start at front page: try to log in -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTextNotPresent</td>	<td>Please sign in</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>		<td>G&#8217;day</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>		<td>(authenticated)</td><td>&nbsp;</td></tr>
+
+    <tr><td>assertCookie</td>	<td>regex:JSPWikiAssertedName=${wikiname}</td>	<td></td></tr>
+
+    <!-- Log out; we should NOT see any asserted identities -->
+    <tr><td>assertElementPresent</td>	<td>link=Log out</td>	<td></td></tr>
+    <tr><td>clickAndWait</td>			<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTextPresent</td>	<td>G&#8217;day (anonymous guest)</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>		<td>JSPWiki: Main</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>assertNotCookie</td>	<td>regex:JSPWikiAssertedName=${wikiname}</td>	<td></td></tr>
+    
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RedirectAfterLogin.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RedirectAfterLogin.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RedirectAfterLogin.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RedirectAfterLogin.html Tue Oct  9 21:16:31 2012
@@ -1,69 +1,88 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Redirect Page After Login</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Redirect Page After Login<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Redirect Page After Login</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Redirect Page After Login<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Redirectpage '+new Date().getTime()}</td>	<td>page</td></tr>
-	<tr><td>store</td>	<td>janne</td>		<td>TestUsername</td></tr>
-	<tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
-
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>	<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>	<td>loginurl</td></tr>
-	<tr><td>store</td>	<td>This page was created to test redirects.</td>	<td>RedirectText</td></tr>
-
-	<!-- Login -->
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-	<!-- Create a new page -->
-    <tr><td>open</td>	<td>${editurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>			<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
-
-    <tr><td>type</td>			<td>id=editorarea</td>		<td>[{ALLOW view Authenticated}] ${RedirectText}</td></tr>
-    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>${RedirectText}</td>	<td>&nbsp;</td></tr>	
-    
-    <!-- Log out -->
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-    <!-- Now, from an anonymous session, try to view it, fail, then login -->
-    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTextNotPresent</td>	<td>${RedirectText}</td><td>&nbsp;</td></tr>	
-    <tr><td>verifyTitle</td>			<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>j_username</td>		<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>j_password</td>		<td>&nbsp;</td></tr>
-
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-    <!-- We should be able to see the page now -->
-    <tr><td>verifyTextPresent</td>	<td>${RedirectText}</td>	<td>&nbsp;</td></tr>
-
-    <!-- Log out --!>
+	<tr><td>store</td>	<td>javascript{'Redirectpage '+new Date().getTime()}</td>	<td>page</td></tr>
+	<tr><td>store</td>	<td>janne</td>		<td>TestUsername</td></tr>
+	<tr><td>store</td>	<td>myP@5sw0rd</td>	<td>TestPassword</td></tr>
+
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>	<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>	<td>editurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>	<td>loginurl</td></tr>
+	<tr><td>store</td>	<td>This page was created to test redirects.</td>	<td>RedirectText</td></tr>
+
+	<!-- Login -->
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+	<!-- Create a new page -->
+    <tr><td>open</td>	<td>${editurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>			<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
+
+    <tr><td>type</td>			<td>id=editorarea</td>		<td>[{ALLOW view Authenticated}] ${RedirectText}</td></tr>
+    <tr><td>clickAndWait</td>	<td>ok</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>${RedirectText}</td>	<td>&nbsp;</td></tr>	
+    
+    <!-- Log out -->
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+    <!-- Now, from an anonymous session, try to view it, fail, then login -->
+    <tr><td>open</td>	<td>${url}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTextNotPresent</td>	<td>${RedirectText}</td><td>&nbsp;</td></tr>	
+    <tr><td>verifyTitle</td>			<td>JSPWiki: Login</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>j_username</td>		<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>j_password</td>		<td>&nbsp;</td></tr>
+
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+    <!-- We should be able to see the page now -->
+    <tr><td>verifyTextPresent</td>	<td>${RedirectText}</td>	<td>&nbsp;</td></tr>
+
+    <!-- Log out --!>
     <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
 
-	</tbody>
-</table>
-
-</body>
-</html>
+	</tbody>
+</table>
+
+</body>
+</html>

Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenamePage.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenamePage.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenamePage.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenamePage.html Tue Oct  9 21:16:31 2012
@@ -1,58 +1,77 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>JSPWiki Test Rename Page</title>
-</head>
-<body> 
-<table cellpadding="1" cellspacing="1" border="1">
-	<tbody>
-	<tr><td rowspan="1" colspan="3">JSPWiki Test Rename Page<br></td></tr>
-
+<!--
+    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.  
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>JSPWiki Test Rename Page</title>
+</head>
+<body> 
+<table cellpadding="1" cellspacing="1" border="1">
+	<tbody>
+	<tr><td rowspan="1" colspan="3">JSPWiki Test Rename Page<br></td></tr>
+
 	<tr><td>store</td>	<td>/@selenium.context@</td>	<td>baseUrl</td></tr>
-	<tr><td>store</td>	<td>javascript{'Rename-page '+new Date().getTime()}</td>	<td>page</td></tr>
-	<tr><td>store</td>	<td>janne</td>			<td>TestUsername</td></tr>
-    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
-
-	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>		<td>url</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>		<td>editurl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/PageInfo.jsp?page=${page}</td>	<td>infourl</td></tr>
-	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>				<td>loginurl</td></tr>
-    <tr><td>store</td>	<td>This page was created by the rename web unit tests.</td>	<td>PageContent</td></tr>
-
-	<!-- Login --!>
-    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
-    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
-    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
-
-	<!-- Create a new page --!>
-    <tr><td>open</td>	<td>${editurl}</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
-    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
-    <tr><td>type</td>					<td>id=editorarea</td>		<td>${PageContent}</td></tr>
-    <tr><td>clickAndWait</td>			<td>ok</td>	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
-    
-	<!-- Rename Page --!>
-    <tr><td>open</td>					<td>${infourl}</td>	<td>&nbsp;</td></tr>
-    <tr><td>verifyTitle</td>			<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
-    <tr><td>assertElementPresent</td>	<td>rename</td>			<td>&nbsp;</td></tr>	
-    <tr><td>assertElementPresent</td>	<td>renameto</td>		<td>&nbsp;</td></tr>
-    <tr><td>type</td>					<td>renameto</td>	<td>${page}-renamed</td></tr>
-    <tr><td>clickAndWait</td>			<td>rename</td> 	<td>&nbsp;</td></tr>
-
-    <tr><td>verifyTitle</td>	<td>JSPWiki: ${page}-renamed</td>	<td>&nbsp;</td></tr>
-
-    <!-- Log out --!>
-    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
-
-	</tbody>
-</table>
-
-</body>
-</html>
+	<tr><td>store</td>	<td>javascript{'Rename-page '+new Date().getTime()}</td>	<td>page</td></tr>
+	<tr><td>store</td>	<td>janne</td>			<td>TestUsername</td></tr>
+    <tr><td>store</td>	<td>myP@5sw0rd</td>		<td>TestPassword</td></tr>
+
+	<tr><td>store</td>	<td>${baseUrl}/Wiki.jsp?page=${page}</td>		<td>url</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Edit.jsp?page=${page}</td>		<td>editurl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/PageInfo.jsp?page=${page}</td>	<td>infourl</td></tr>
+	<tr><td>store</td>	<td>${baseUrl}/Login.jsp</td>				<td>loginurl</td></tr>
+    <tr><td>store</td>	<td>This page was created by the rename web unit tests.</td>	<td>PageContent</td></tr>
+
+	<!-- Login --!>
+    <tr><td>open</td>	<td>${loginurl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>type</td>	<td>j_username</td>	<td>${TestUsername}</td></tr>
+    <tr><td>type</td>	<td>j_password</td>	<td>${TestPassword}</td></tr>
+    <tr><td>clickAndWait</td>	<td>submitlogin</td>	<td>&nbsp;</td></tr>
+
+	<!-- Create a new page --!>
+    <tr><td>open</td>	<td>${editurl}</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: Edit: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyElementPresent</td>	<td>ok</td>	<td></td></tr>
+    <tr><td>verifyElementPresent</td>	<td>id=editorarea</td>	<td></td></tr>
+    <tr><td>type</td>					<td>id=editorarea</td>		<td>${PageContent}</td></tr>
+    <tr><td>clickAndWait</td>			<td>ok</td>	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>		<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTextPresent</td>	<td>${PageContent}</td>	<td>&nbsp;</td></tr>	
+    
+	<!-- Rename Page --!>
+    <tr><td>open</td>					<td>${infourl}</td>	<td>&nbsp;</td></tr>
+    <tr><td>verifyTitle</td>			<td>JSPWiki: ${page}</td>	<td>&nbsp;</td></tr>
+    <tr><td>assertElementPresent</td>	<td>rename</td>			<td>&nbsp;</td></tr>	
+    <tr><td>assertElementPresent</td>	<td>renameto</td>		<td>&nbsp;</td></tr>
+    <tr><td>type</td>					<td>renameto</td>	<td>${page}-renamed</td></tr>
+    <tr><td>clickAndWait</td>			<td>rename</td> 	<td>&nbsp;</td></tr>
+
+    <tr><td>verifyTitle</td>	<td>JSPWiki: ${page}-renamed</td>	<td>&nbsp;</td></tr>
+
+    <!-- Log out --!>
+    <tr><td>clickAndWait</td>	<td>link=Log out</td> 	<td>&nbsp;</td></tr>
+
+	</tbody>
+</table>
+
+</body>
+</html>



Mime
View raw message