You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2012/10/09 23:16:32 UTC
svn commit: r1396331 [1/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...
Author: juanpablo
Date: Tue Oct 9 21:16:31 2012
New Revision: 1396331
URL: http://svn.apache.org/viewvc?rev=1396331&view=rev
Log:
added Apache License Header to .html files (cfr. with http://s.apache.org/EDd).
(the command was find . -name *.html -exec sed -i '1s:^:APPROPIATE_ESCAPED_HEADER_HERE:' {} \;)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/attachment/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/auth/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/content/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/filters/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/forms/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/preferences/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/providers/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/rpc/json/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/search/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/ui/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/ui/progress/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/url/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/util/package.html
incubator/jspwiki/trunk/src/webdocs/error/Forbidden.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEdit.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEditAllView.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousCreateGroup.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousView.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousViewImage.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedName.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedPermissions.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupFullName.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupLoginName.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreateGroupWikiName.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/CreatePage.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePage.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/DeletePageNonAdmin.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Login.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/Logout.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RedirectAfterLogin.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenamePage.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenameProfile.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/TestSuite.html
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/ViewPageSource.html
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Oct 9 21:16:31 2012
@@ -1,6 +1,6 @@
2012-10-09 Juan Pablo Santos (juanpablo AT apache DOT org)
- * added Apache License Header to .jsp files (cfr. with http://s.apache.org/EDd).
+ * added Apache License Header to .jsp and .html files (cfr. with http://s.apache.org/EDd).
2012-10-08 Juan Pablo Santos (juanpablo AT apache DOT org)
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/attachment/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/attachment/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/attachment/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/attachment/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<body>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/content/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/content/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/content/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/content/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<body>
Provides content management functionality for JSPWiki.
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/filters/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/filters/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/filters/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/filters/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<body>
Provides page and content filtering functionality for JSPWiki.
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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 3.2 Final//EN">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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 "-//IETF//DTD HTML//EN">
<html> <head>
<title>org.apache.wiki.plugin</title>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/preferences/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/preferences/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/preferences/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/preferences/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<body>
Preferences storage.
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<body>
Provides storage for JSPWiki.
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/rpc/json/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/rpc/json/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/rpc/json/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/rpc/json/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/search/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/search/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/search/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/search/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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 "-//IETF//DTD HTML//EN">
<html> <head>
<title>org.apache.wiki.search</title>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<body>
Provides standard JSP tags for JSPWiki.
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<body>
Java classes for management of the JSP user interface.
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/progress/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/progress/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/progress/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/progress/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/url/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/url/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/url/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/url/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/package.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/package.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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 3.2 Final//EN">
<html>
<head>
Modified: incubator/jspwiki/trunk/src/webdocs/error/Forbidden.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/error/Forbidden.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/error/Forbidden.html (original)
+++ incubator/jspwiki/trunk/src/webdocs/error/Forbidden.html Tue Oct 9 21:16:31 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
<html>
<body>
<h3>Forbidden</h3>
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEdit.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEdit.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEdit.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEdit.html Tue Oct 9 21:16:31 2012
@@ -1,75 +1,94 @@
-<!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 Acl Janne Edit</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
- <tbody>
- <tr><td rowspan="1" colspan="3">JSPWiki Test Acl Janne Edit<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 Acl Janne Edit</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+ <tbody>
+ <tr><td rowspan="1" colspan="3">JSPWiki Test Acl Janne Edit<br></td></tr>
+
<tr><td>store</td> <td>/@selenium.context@</td> <td>baseUrl</td></tr>
- <tr><td>store</td> <td>javascript{'Acleditonly '+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 with an ACL by janne.</td> <td>PageContent</td></tr>
-
- <!-- Login -->
- <tr><td>open</td> <td>${loginurl}</td> <td> </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> </td></tr>
-
- <!-- Create a new page -->
- <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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 edit janne}] ${PageContent}</td></tr>
- <tr><td>clickAndWait</td> <td>ok</td> <td> </td></tr>
-
- <tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
-
- <!-- Log out -->
- <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
-
- <!-- Anonymous viewing should NOT succeed -->
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
- <tr><td>verifyTextNotPresent</td> <td>${PageContent}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
-
- <!-- Anonymous editing should fail -->
- <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
- <tr><td>verifyTextNotPresent</td> <td>${PageContent}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
-
- <!-- Now log in as janne again and view/edit it successfully -->
- <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> </td></tr>
-
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
-
- <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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>clickAndWait</td> <td>ok</td> <td> </td></tr>
-
- <!-- Log out -->
- <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
-
- </tbody>
-</table>
-
-</body>
-</html>
+ <tr><td>store</td> <td>javascript{'Acleditonly '+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 with an ACL by janne.</td> <td>PageContent</td></tr>
+
+ <!-- Login -->
+ <tr><td>open</td> <td>${loginurl}</td> <td> </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> </td></tr>
+
+ <!-- Create a new page -->
+ <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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 edit janne}] ${PageContent}</td></tr>
+ <tr><td>clickAndWait</td> <td>ok</td> <td> </td></tr>
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
+
+ <!-- Log out -->
+ <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
+
+ <!-- Anonymous viewing should NOT succeed -->
+ <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>verifyTextNotPresent</td> <td>${PageContent}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
+
+ <!-- Anonymous editing should fail -->
+ <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
+ <tr><td>verifyTextNotPresent</td> <td>${PageContent}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
+
+ <!-- Now log in as janne again and view/edit it successfully -->
+ <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> </td></tr>
+
+ <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
+
+ <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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>clickAndWait</td> <td>ok</td> <td> </td></tr>
+
+ <!-- Log out -->
+ <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
+
+ </tbody>
+</table>
+
+</body>
+</html>
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEditAllView.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEditAllView.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEditAllView.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AclJanneEditAllView.html Tue Oct 9 21:16:31 2012
@@ -1,78 +1,97 @@
-<!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 Acl Janne Edit All View</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
- <tbody>
- <tr><td rowspan="1" colspan="3">JSPWiki Test Acl Janne Edit All View<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 Acl Janne Edit All View</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+ <tbody>
+ <tr><td rowspan="1" colspan="3">JSPWiki Test Acl Janne Edit All View<br></td></tr>
+
<tr><td>store</td> <td>/@selenium.context@</td> <td>baseUrl</td></tr>
- <tr><td>store</td> <td>javascript{'Aclviewandeditonly '+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 with an ACL by janne.</td> <td>PageContent</td></tr>
-
- <!-- Login -->
- <tr><td>open</td> <td>${loginurl}</td> <td> </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> </td></tr>
-
- <!-- Create a new page -->
- <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
-
- <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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 edit janne}] [{ALLOW view All}] ${PageContent}</td></tr>
- <tr><td>clickAndWait</td> <td>ok</td> <td> </td></tr>
-
- <tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
-
- <!-- Log out -->
- <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
-
- <!-- Anonymous viewing should succeed -->
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
-
- <!-- Anonymous editing should fail -->
- <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
- <tr><td>verifyTextNotPresent</td> <td>${PageContent}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
-
- <!-- Now log in as janne again and view/edit it successfully -->
- <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> </td></tr>
-
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
-
- <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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>clickAndWait</td> <td>ok</td> <td> </td></tr>
-
- <!-- Log out -->
- <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
-
- </tbody>
-</table>
-
-</body>
-</html>
+ <tr><td>store</td> <td>javascript{'Aclviewandeditonly '+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 with an ACL by janne.</td> <td>PageContent</td></tr>
+
+ <!-- Login -->
+ <tr><td>open</td> <td>${loginurl}</td> <td> </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> </td></tr>
+
+ <!-- Create a new page -->
+ <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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 edit janne}] [{ALLOW view All}] ${PageContent}</td></tr>
+ <tr><td>clickAndWait</td> <td>ok</td> <td> </td></tr>
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
+
+ <!-- Log out -->
+ <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
+
+ <!-- Anonymous viewing should succeed -->
+ <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: ${page}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
+
+ <!-- Anonymous editing should fail -->
+ <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
+ <tr><td>verifyTextNotPresent</td> <td>${PageContent}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
+
+ <!-- Now log in as janne again and view/edit it successfully -->
+ <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> </td></tr>
+
+ <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>${PageContent}</td> <td> </td></tr>
+
+ <tr><td>open</td> <td>${editurl}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Edit: ${page}</td> <td> </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>clickAndWait</td> <td>ok</td> <td> </td></tr>
+
+ <!-- Log out -->
+ <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
+
+ </tbody>
+</table>
+
+</body>
+</html>
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousCreateGroup.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousCreateGroup.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousCreateGroup.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousCreateGroup.html Tue Oct 9 21:16:31 2012
@@ -1,33 +1,52 @@
-<!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 Anonymous Create Group</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
- <tbody>
- <tr><td rowspan="1" colspan="3">
- JSPWiki Test Anonymous Create Group<br>
- Try to create a group; we should get redirected to login page
- </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 Anonymous Create Group</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+ <tbody>
+ <tr><td rowspan="1" colspan="3">
+ JSPWiki Test Anonymous Create Group<br>
+ Try to create a group; we should get redirected to login page
+ </td></tr>
<tr><td>store</td> <td>/@selenium.context@</td> <td>baseUrl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp</td> <td>newgroupurl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</td></tr>
-
- <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
- <tr><td>clickAndWait</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
-
-
- <tr><td>open</td> <td>${newgroupurl}</td> <td> </td></tr>
-
- <tr><td>assertTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
- <tr><td>assertTextPresent</td> <td>Please sign in</td> <td> </td></tr>
-
- </tbody>
-</table>
-
-</body>
-</html>
+ <tr><td>store</td> <td>${baseUrl}/NewGroup.jsp</td> <td>newgroupurl</td></tr>
+ <tr><td>store</td> <td>${baseUrl}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</td></tr>
+
+ <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
+ <tr><td>clickAndWait</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
+
+
+ <tr><td>open</td> <td>${newgroupurl}</td> <td> </td></tr>
+
+ <tr><td>assertTitle</td> <td>JSPWiki: Login</td> <td> </td></tr>
+ <tr><td>assertTextPresent</td> <td>Please sign in</td> <td> </td></tr>
+
+ </tbody>
+</table>
+
+</body>
+</html>
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousView.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousView.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousView.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousView.html Tue Oct 9 21:16:31 2012
@@ -1,20 +1,39 @@
-<!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 Anonymous View</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
- <tbody>
- <tr><td rowspan="1" colspan="3">JSPWiki Test Anonymous View<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 Anonymous View</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+ <tbody>
+ <tr><td rowspan="1" colspan="3">JSPWiki Test Anonymous View<br></td></tr>
<tr><td>store</td><td>/@selenium.context@</td> <td>baseUrl</td></tr>
- <tr><td>open</td> <td>${baseUrl}/Wiki.jsp?page=Main</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>You have successfully installed</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>link=About</td> <td></td></tr>
- <tr><td>clickAndWait</td> <td>link=About</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>This Wiki is done using</td> <td> </td></tr>
- </tbody>
-</table>
-</body>
-</html>
+ <tr><td>open</td> <td>${baseUrl}/Wiki.jsp?page=Main</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>You have successfully installed</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>link=About</td> <td></td></tr>
+ <tr><td>clickAndWait</td> <td>link=About</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>This Wiki is done using</td> <td> </td></tr>
+ </tbody>
+</table>
+</body>
+</html>
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousViewImage.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousViewImage.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousViewImage.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AnonymousViewImage.html Tue Oct 9 21:16:31 2012
@@ -1,30 +1,49 @@
-<!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 Anonymous View Image</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
- <tbody>
- <tr><td rowspan="1" colspan="3">
- JSPWiki Test Anonymous View Image<br>See if we can view the JSPWiki logo
- </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 Anonymous View Image</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+ <tbody>
+ <tr><td rowspan="1" colspan="3">
+ JSPWiki Test Anonymous View Image<br>See if we can view the JSPWiki logo
+ </td></tr>
+
<tr><td>store</td> <td>/@selenium.context@</td> <td>baseUrl</td></tr>
- <tr><td>store</td> <td>${baseUrl}/images/jspwiki_logo_s.png</td> <td>imgurl</td></tr>
-
- <tr><td>open</td> <td>${imgurl}</td> <td> </td></tr>
- <tr><td>assertBodyText</td> <td></td> <td> </td></tr>
-
- <tr><td>store</td> <td>../images/jspwiki_logo_ss.png</td> <td>imgurl</td></tr>
-
- <tr><td>open</td> <td>${imgurl}</td> <td> </td></tr>
- <tr><td>assertNotBodyText</td> <td></td> <td> </td></tr>
-
- </tbody>
-</table>
-
-</body>
-</html>
+ <tr><td>store</td> <td>${baseUrl}/images/jspwiki_logo_s.png</td> <td>imgurl</td></tr>
+
+ <tr><td>open</td> <td>${imgurl}</td> <td> </td></tr>
+ <tr><td>assertBodyText</td> <td></td> <td> </td></tr>
+
+ <tr><td>store</td> <td>../images/jspwiki_logo_ss.png</td> <td>imgurl</td></tr>
+
+ <tr><td>open</td> <td>${imgurl}</td> <td> </td></tr>
+ <tr><td>assertNotBodyText</td> <td></td> <td> </td></tr>
+
+ </tbody>
+</table>
+
+</body>
+</html>
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedName.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedName.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedName.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedName.html Tue Oct 9 21:16:31 2012
@@ -1,63 +1,82 @@
-<!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 Asserted Name</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
- <tbody>
- <tr><td rowspan="1" colspan="3">JSPWiki Test Asserted 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 Asserted Name</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+ <tbody>
+ <tr><td rowspan="1" colspan="3">JSPWiki Test Asserted Name<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}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</td></tr>
- <tr><td>store</td> <td>DonQuixote</td> <td>TestUsername</td></tr>
-
- <!-- Navigate to Prefs page; see the 'G'day message' for the anonymous user -->
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
-
- <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td> <td> </td></tr>
-
- <!-- Go to the UserPreferences page; see the set-cookie form, plus welcome text that invites -->
- <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
-
- <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>You wouldn’t lie to us would you?</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>assertedName</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
-
- <tr><td>type</td> <td>assertedName</td> <td>${TestUsername}</td></tr>
- <tr><td>clickAndWait</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
-
- <!-- Now navigate back to the main page; see the 'G'day message' for the test user -->
- <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>G’day</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>DonQuixote</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>link=${TestUsername}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>(not logged in)</td> <td> </td></tr>
-
- <tr><td>assertCookie</td> <td>regex:JSPWikiAssertedName=${TestUsername}</td> <td></td></tr>
-
- <!-- Clear user cookie -->
- <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
-
- <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
- <tr><td>verifyValue</td> <td>assertedName</td> <td>${TestUsername}</td></tr>
- <tr><td>verifyElementPresent</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
-
- <tr><td>clickAndWait</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
-
- <!-- Go back to the main page, and see the 'G'day message for the anonymous user again -->
- <tr><td>verifyTitle</td><td>JSPWiki: Main</td><td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td> <td> </td></tr>
- <tr><td>verifyTextNotPresent</td> <td>${TextUsername}</td> <td> </td></tr>
- <tr><td>assertNotCookie</td> <td>regex:JSPWikiAssertedName=</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}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</td></tr>
+ <tr><td>store</td> <td>DonQuixote</td> <td>TestUsername</td></tr>
+
+ <!-- Navigate to Prefs page; see the 'G'day message' for the anonymous user -->
+ <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td> <td> </td></tr>
+
+ <!-- Go to the UserPreferences page; see the set-cookie form, plus welcome text that invites -->
+ <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>You wouldn’t lie to us would you?</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>assertedName</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
+
+ <tr><td>type</td> <td>assertedName</td> <td>${TestUsername}</td></tr>
+ <tr><td>clickAndWait</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
+
+ <!-- Now navigate back to the main page; see the 'G'day message' for the test user -->
+ <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>G’day</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>DonQuixote</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>link=${TestUsername}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>(not logged in)</td> <td> </td></tr>
+
+ <tr><td>assertCookie</td> <td>regex:JSPWikiAssertedName=${TestUsername}</td> <td></td></tr>
+
+ <!-- Clear user cookie -->
+ <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
+ <tr><td>verifyValue</td> <td>assertedName</td> <td>${TestUsername}</td></tr>
+ <tr><td>verifyElementPresent</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
+
+ <tr><td>clickAndWait</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
+
+ <!-- Go back to the main page, and see the 'G'day message for the anonymous user again -->
+ <tr><td>verifyTitle</td><td>JSPWiki: Main</td><td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td> <td> </td></tr>
+ <tr><td>verifyTextNotPresent</td> <td>${TextUsername}</td> <td> </td></tr>
+ <tr><td>assertNotCookie</td> <td>regex:JSPWikiAssertedName=</td> <td></td></tr>
+
+
+ </tbody>
+</table>
+
+</body>
+</html>
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedPermissions.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedPermissions.html?rev=1396331&r1=1396330&r2=1396331&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedPermissions.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/AssertedPermissions.html Tue Oct 9 21:16:31 2012
@@ -1,131 +1,150 @@
-<!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 Asserted Permissions</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
- <tbody>
- <tr><td rowspan="1" colspan="3">JSPWiki Test Asserted Permissions<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 Asserted Permissions</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+ <tbody>
+ <tr><td rowspan="1" colspan="3">JSPWiki Test Asserted Permissions<br></td></tr>
+
<tr><td>store</td> <td>/@selenium.context@</td> <td>baseUrl</td></tr>
- <tr><td>store</td> <td>javascript{'Test-asserted-permissions-'+new Date().getTime()}</td> <td>group</td></tr>
- <tr><td>store</td> <td>Janne Jalkanen<br />FredFlintstone</td> <td>members</td></tr>
- <tr><td>store</td> <td>${baseUrl}/Wiki.jsp</td> <td>url</td></tr>
- <tr><td>store</td> <td>${baseUrl}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</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 rowspan="1" colspan="3"> Create new group with 'janne' and 'FredFlintstone' as members </td></tr>
-
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td> <td> </td></tr>
-
- <tr><td rowspan="1" colspan="3"> login </td></tr>
-
- <tr><td>open</td> <td>${loginurl}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </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> </td></tr>
-
- <tr><td>verifyTextNotPresent</td> <td>Please sign in</td> <td></td></tr>
- <tr><td>verifyTextPresent</td> <td>G’day</td> <td></td></tr>
- <tr><td>verifyTextPresent</td> <td>(authenticated)</td> <td></td></tr>
-
- <tr><td rowspan="1" colspan="3"> First, name the group </td></tr>
-
- <tr><td>open</td> <td>${newgroupurl}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: New Group</td> <td> </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> </td></tr>
-
- <tr><td rowspan="1" colspan="3"> Verify the group was created </td></tr>
-
- <tr><td>verifyTextNotPresent</td> <td>Could not create group</td> <td></td></tr>
-
- <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: ${group}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>This is the wiki group called</td> <td></td></tr>
-
- <tr><td rowspan="1" colspan="3"> Log out </td></tr>
-
- <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
-
- <tr><td rowspan="1" colspan="3"> Verifiy that anonymous users can't view the group </td></tr>
-
- <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>Please sign in</td> <td></td></tr>
-
- <tr><td rowspan="1" colspan="3"> Log in again and verify we can read it </td></tr>
-
- <tr><td>open</td> <td>${loginurl}</td> <td> </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> </td></tr>
-
- <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>This is the wiki group called</td> <td></td></tr>
-
- <tr><td rowspan="1" colspan="3"> Log out </td></tr>
-
- <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
-
- <tr><td rowspan="1" colspan="3"> Verify that asserted user 'Fred' can view the group but not edit </td></tr>
-
- <tr><td>open</td> <td>${url}</td> <td> </td></tr>
-
- <tr><td>clickAndWait</td> <td>link=My Prefs</td> <td> </td></tr>
- <!--<tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>-->
-
- <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>assertedName</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
-
- <tr><td>type</td> <td>assertedName</td> <td>FredFlintstone</td></tr>
- <tr><td>clickAndWait</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
-
- <tr><td rowspan="1" colspan="3"> Now navigate back to the main page; see the 'G'day message' for FredFlintstone </td></tr>
-
- <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>G’day</td> <td> </td></tr>
- <tr><td>verifyElementPresent</td> <td>link=FredFlintstone</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>(not logged in)</td> <td> </td></tr>
-
- <tr><td>assertCookie</td> <td>regex:JSPWikiAssertedName=FredFlintstone</td> <td></td></tr>
-
- <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: ${group}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>This is the wiki group called</td> <td></td></tr>
-
- <tr><td rowspan="1" colspan="3"> Try to edit it should not be allowed </td></tr>
-
- <tr><td>open</td> <td>${editgroupurl}group=${group}</td> <td> </td></tr>
- <tr><td>verifyTextPresent</td> <td>Please sign in</td> <td></td></tr>
-
- <tr><td rowspan="1" colspan="3"> Clear user cookie </td></tr>
-
- <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
- <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
- <tr><td>verifyValue</td> <td>assertedName</td> <td>FredFlintstone</td></tr>
- <tr><td>verifyElementPresent</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
- <tr><td>clickAndWait</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
-
-
- </tbody>
-</table>
-
-</body>
-</html>
+ <tr><td>store</td> <td>javascript{'Test-asserted-permissions-'+new Date().getTime()}</td> <td>group</td></tr>
+ <tr><td>store</td> <td>Janne Jalkanen<br />FredFlintstone</td> <td>members</td></tr>
+ <tr><td>store</td> <td>${baseUrl}/Wiki.jsp</td> <td>url</td></tr>
+ <tr><td>store</td> <td>${baseUrl}/UserPreferences.jsp?redirect=Main</td> <td>prefsurl</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 rowspan="1" colspan="3"> Create new group with 'janne' and 'FredFlintstone' as members </td></tr>
+
+ <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>G’day (anonymous guest)</td> <td> </td></tr>
+
+ <tr><td rowspan="1" colspan="3"> login </td></tr>
+
+ <tr><td>open</td> <td>${loginurl}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: Login</td> <td> </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> </td></tr>
+
+ <tr><td>verifyTextNotPresent</td> <td>Please sign in</td> <td></td></tr>
+ <tr><td>verifyTextPresent</td> <td>G’day</td> <td></td></tr>
+ <tr><td>verifyTextPresent</td> <td>(authenticated)</td> <td></td></tr>
+
+ <tr><td rowspan="1" colspan="3"> First, name the group </td></tr>
+
+ <tr><td>open</td> <td>${newgroupurl}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: New Group</td> <td> </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> </td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Verify the group was created </td></tr>
+
+ <tr><td>verifyTextNotPresent</td> <td>Could not create group</td> <td></td></tr>
+
+ <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: ${group}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>This is the wiki group called</td> <td></td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Log out </td></tr>
+
+ <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Verifiy that anonymous users can't view the group </td></tr>
+
+ <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>Please sign in</td> <td></td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Log in again and verify we can read it </td></tr>
+
+ <tr><td>open</td> <td>${loginurl}</td> <td> </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> </td></tr>
+
+ <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>This is the wiki group called</td> <td></td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Log out </td></tr>
+
+ <tr><td>clickAndWait</td> <td>link=Log out</td> <td> </td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Verify that asserted user 'Fred' can view the group but not edit </td></tr>
+
+ <tr><td>open</td> <td>${url}</td> <td> </td></tr>
+
+ <tr><td>clickAndWait</td> <td>link=My Prefs</td> <td> </td></tr>
+ <!--<tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>-->
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>assertedName</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
+
+ <tr><td>type</td> <td>assertedName</td> <td>FredFlintstone</td></tr>
+ <tr><td>clickAndWait</td> <td>css=form#setCookie input[name="ok"]</td> <td> </td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Now navigate back to the main page; see the 'G'day message' for FredFlintstone </td></tr>
+
+ <tr><td>verifyTitle</td> <td>JSPWiki: Main</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>G’day</td> <td> </td></tr>
+ <tr><td>verifyElementPresent</td> <td>link=FredFlintstone</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>(not logged in)</td> <td> </td></tr>
+
+ <tr><td>assertCookie</td> <td>regex:JSPWikiAssertedName=FredFlintstone</td> <td></td></tr>
+
+ <tr><td>open</td> <td>${viewgroupurl}group=${group}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: ${group}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>This is the wiki group called</td> <td></td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Try to edit it should not be allowed </td></tr>
+
+ <tr><td>open</td> <td>${editgroupurl}group=${group}</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>Please sign in</td> <td></td></tr>
+
+ <tr><td rowspan="1" colspan="3"> Clear user cookie </td></tr>
+
+ <tr><td>open</td> <td>${prefsurl}</td> <td> </td></tr>
+ <tr><td>verifyTitle</td> <td>JSPWiki: User Preferences</td> <td> </td></tr>
+ <tr><td>verifyValue</td> <td>assertedName</td> <td>FredFlintstone</td></tr>
+ <tr><td>verifyElementPresent</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
+ <tr><td>clickAndWait</td> <td>css=form#clearCookie input[name="ok"]</td> <td> </td></tr>
+
+
+ </tbody>
+</table>
+
+</body>
+</html>