further jsecurity name changes. Also moved jsecurity.tld to ki.tld in the appropriate META-INF location in maven resource tree
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@766174 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/home.jsp b/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/home.jsp
index eb05c2e..c6c6e07 100644
--- a/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/home.jsp
@@ -17,7 +17,7 @@
~ under the License.
--%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="jsec" uri="http://ki.apache.org/tags" %>
+<%@ taglib prefix="ki" uri="http://ki.apache.org/tags" %>
<html>
<head>
@@ -40,12 +40,12 @@
</ul>
<p>
- <jsec:hasPermission name="user:manage">
+ <ki:hasPermission name="user:manage">
Since you are logged in as the admin user, you can <a href="<c:url value="/s/manageUsers"/>">manage site users</a>.
- </jsec:hasPermission>
- <jsec:lacksPermission name="user:manage">
+ </ki:hasPermission>
+ <ki:lacksPermission name="user:manage">
Since you are not logged in as the admin user, you can't manage site users.
- </jsec:lacksPermission>
+ </ki:lacksPermission>
</p>
</div>
diff --git a/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/manageUsers.jsp b/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/manageUsers.jsp
index 96cd203..14e6e22 100644
--- a/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/manageUsers.jsp
+++ b/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/manageUsers.jsp
@@ -17,7 +17,7 @@
~ under the License.
--%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="jsec" uri="http://ki.apache.org/tags" %>
+<%@ taglib prefix="ki" uri="http://ki.apache.org/tags" %>
<html>
<head>
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index 71a1b71..8d5a7d1 100644
--- a/samples/spring/pom.xml
+++ b/samples/spring/pom.xml
@@ -85,10 +85,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -98,6 +100,18 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldbVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/samples/spring/src/main/resources/ehcache.xml b/samples/spring/src/main/resources/ehcache.xml
index 09133d0..fcc9f71 100644
--- a/samples/spring/src/main/resources/ehcache.xml
+++ b/samples/spring/src/main/resources/ehcache.xml
@@ -82,7 +82,7 @@
diskPersistent=true since we want an enterprise session management feature - ability to use sessions after
even after a JVM restart. -->
- <cache name="jsecurity-activeSessionCache"
+ <cache name="ki-activeSessionCache"
maxElementsInMemory="20000"
eternal="true"
overflowToDisk="true"
diff --git a/samples/spring/src/main/webapp/WEB-INF/resources/include.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/include.jsp
index defab00..fe7b493 100644
--- a/samples/spring/src/main/webapp/WEB-INF/resources/include.jsp
+++ b/samples/spring/src/main/webapp/WEB-INF/resources/include.jsp
@@ -21,4 +21,4 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="jsecurity" uri="http://ki.apache.org/tags" %>
\ No newline at end of file
+<%@ taglib prefix="ki" uri="http://ki.apache.org/tags" %>
\ No newline at end of file
diff --git a/samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/ki.jnlp.jsp
similarity index 100%
rename from samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp
rename to samples/spring/src/main/webapp/WEB-INF/resources/ki.jnlp.jsp
diff --git a/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
index ec9b93c..ca5ff54 100644
--- a/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
+++ b/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
@@ -21,7 +21,7 @@
<html>
<head>
- <link type="text/css" rel="stylesheet" href="<c:url value="/jsecurity.css"/>"/>
+ <link type="text/css" rel="stylesheet" href="<c:url value="/ki.css"/>"/>
</head>
<body onload="document.forms[0].elements[0].focus();">
diff --git a/samples/spring/src/main/webapp/WEB-INF/resources/sampleIndex.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
index 29ab72a..c5cb678 100644
--- a/samples/spring/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
+++ b/samples/spring/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
@@ -21,7 +21,7 @@
<html>
<head>
- <link type="text/css" rel="stylesheet" href="<c:url value="/jsecurity.css"/>"/>
+ <link type="text/css" rel="stylesheet" href="<c:url value="/ki.css"/>"/>
</head>
<body>
@@ -29,7 +29,7 @@
<div id="contentBox">
<img src="<c:url value="/logo.png"/>" style="margin-top:20px; border:0"/><br/>
- <h2>You have successfully logged in as <jsecurity:principal/>.</h2>
+ <h2>You have successfully logged in as <ki:principal/>.</h2>
Session ID: ${subjectSession.id}
@@ -41,17 +41,17 @@
</ul>
<p style="font-weight: bold;">
- <jsecurity:hasRole name="role1">You have role 1.<br/></jsecurity:hasRole>
- <jsecurity:lacksRole name="role1">You do not have role 1.<br/></jsecurity:lacksRole>
- <jsecurity:hasRole name="role2">You have role 2.<br/></jsecurity:hasRole>
- <jsecurity:lacksRole name="role2">You do not have role 2.<br/></jsecurity:lacksRole>
+ <ki:hasRole name="role1">You have role 1.<br/></ki:hasRole>
+ <ki:lacksRole name="role1">You do not have role 1.<br/></ki:lacksRole>
+ <ki:hasRole name="role2">You have role 2.<br/></ki:hasRole>
+ <ki:lacksRole name="role2">You do not have role 2.<br/></ki:lacksRole>
</p>
<p style="font-weight: bold;">
- <jsecurity:hasPermission name="permission1">You have permission 1.<br/></jsecurity:hasPermission>
- <jsecurity:lacksPermission name="permission1">You do not have permission 1.<br/></jsecurity:lacksPermission>
- <jsecurity:hasPermission name="permission2">You have permission 2.<br/></jsecurity:hasPermission>
- <jsecurity:lacksPermission name="permission2">You do not have permission 2.<br/></jsecurity:lacksPermission>
+ <ki:hasPermission name="permission1">You have permission 1.<br/></ki:hasPermission>
+ <ki:lacksPermission name="permission1">You do not have permission 1.<br/></ki:lacksPermission>
+ <ki:hasPermission name="permission2">You have permission 2.<br/></ki:hasPermission>
+ <ki:lacksPermission name="permission2">You do not have permission 2.<br/></ki:lacksPermission>
</p>
@@ -63,7 +63,7 @@
<p>
- Click <a href="<c:url value="/s/jsecurity.jnlp?sessionId=${subjectSession.id}"/>">here</a> to launch webstart
+ Click <a href="<c:url value="/s/ki.jnlp?sessionId=${subjectSession.id}"/>">here</a> to launch webstart
application.
</p>
diff --git a/samples/spring/src/main/webapp/WEB-INF/sample-servlet.xml b/samples/spring/src/main/webapp/WEB-INF/sample-servlet.xml
index 1df1d9b..44f3972 100644
--- a/samples/spring/src/main/webapp/WEB-INF/sample-servlet.xml
+++ b/samples/spring/src/main/webapp/WEB-INF/sample-servlet.xml
@@ -29,7 +29,7 @@
<property name="mappings">
<props>
<prop key="index">indexController</prop>
- <prop key="jsecurity.jnlp">jnlpController</prop>
+ <prop key="ki.jnlp">jnlpController</prop>
<prop key="login">loginController</prop>
<prop key="logout">logoutController</prop>
<prop key="unauthorized">loginController</prop>
@@ -56,7 +56,7 @@
<bean name="logoutController" class="org.apache.ki.samples.spring.web.LogoutController"/>
<bean id="jnlpController" class="org.apache.ki.samples.spring.web.JnlpController">
- <property name="jnlpView" value="jsecurity.jnlp"/>
+ <property name="jnlpView" value="ki.jnlp"/>
</bean>
<bean id="indexController" class="org.apache.ki.samples.spring.web.IndexController">
diff --git a/samples/spring/src/main/webapp/WEB-INF/spring.tld b/samples/spring/src/main/webapp/WEB-INF/spring.tld
deleted file mode 100644
index 1959c95..0000000
--- a/samples/spring/src/main/webapp/WEB-INF/spring.tld
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
- ~ 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 taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
-
- <tlib-version>1.1.1</tlib-version>
-
- <jsp-version>1.2</jsp-version>
-
- <short-name>Spring</short-name>
-
- <uri>http://www.springframework.org/tags</uri>
-
- <description>Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller</description>
-
-
- <tag>
-
- <name>htmlEscape</name>
- <tag-class>org.springframework.web.servlet.tags.HtmlEscapeTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Sets default HTML escape value for the current page.
- Overrides a "defaultHtmlEscape" context-param in web.xml, if any.
- </description>
-
- <attribute>
- <name>defaultHtmlEscape</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>escapeBody</name>
- <tag-class>org.springframework.web.servlet.tags.EscapeBodyTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>javaScriptEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>message</name>
- <tag-class>org.springframework.web.servlet.tags.MessageTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Retrieves the message with the given code, or text if code isn't resolvable.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>code</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>arguments</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>text</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>javaScriptEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>theme</name>
- <tag-class>org.springframework.web.servlet.tags.ThemeTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Retrieves the theme message with the given code, or text if code isn't resolvable.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>code</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>arguments</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>text</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>javaScriptEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>hasBindErrors</name>
- <tag-class>org.springframework.web.servlet.tags.BindErrorsTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Provides Errors instance in case of bind errors.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <variable>
- <name-given>errors</name-given>
- <variable-class>org.springframework.validation.Errors</variable-class>
- </variable>
-
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>nestedPath</name>
- <tag-class>org.springframework.web.servlet.tags.NestedPathTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Sets a nested path to be used by the bind tag's path.
- </description>
-
- <variable>
- <name-given>nestedPath</name-given>
- <variable-class>java.lang.String</variable-class>
- </variable>
-
- <attribute>
- <name>path</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>bind</name>
- <tag-class>org.springframework.web.servlet.tags.BindTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Provides BindStatus object for the given bind path.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <variable>
- <name-given>status</name-given>
- <variable-class>org.springframework.web.servlet.support.BindStatus</variable-class>
- </variable>
-
- <attribute>
- <name>path</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>ignoreNestedPath</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>transform</name>
- <tag-class>org.springframework.web.servlet.tags.TransformTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Provides transformation of variables to Strings, using an appropriate
- custom PropertyEditor from BindTag (can only be used inside BindTag).
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-</taglib>
diff --git a/samples/spring/src/main/webapp/jsecurity.css b/samples/spring/src/main/webapp/ki.css
similarity index 100%
rename from samples/spring/src/main/webapp/jsecurity.css
rename to samples/spring/src/main/webapp/ki.css
diff --git a/samples/web/src/main/webapp/home.jsp b/samples/web/src/main/webapp/home.jsp
index 9cd85f4..f0037f2 100644
--- a/samples/web/src/main/webapp/home.jsp
+++ b/samples/web/src/main/webapp/home.jsp
@@ -26,17 +26,17 @@
<h1>Apache Ki Quickstart</h1>
-<p>Hi <jsec:guest>Guest</jsec:guest><jsec:user><jsec:principal/></jsec:user>!
- ( <jsec:user><a href="<c:url value="/logout.jsp"/>">Log out</a></jsec:user>
- <jsec:guest><a href="<c:url value="/login.jsp"/>">Log in</a> (sample accounts provided)</jsec:guest> )
+<p>Hi <ki:guest>Guest</ki:guest><ki:user><ki:principal/></ki:user>!
+ ( <ki:user><a href="<c:url value="/logout.jsp"/>">Log out</a></ki:user>
+ <ki:guest><a href="<c:url value="/login.jsp"/>">Log in</a> (sample accounts provided)</ki:guest> )
</p>
<p>Welcome to the Apache Ki Quickstart sample application.
This page represents the home page of any web application.</p>
-<jsec:user><p>Visit your <a href="<c:url value="/account"/>">account page</a>.</p></jsec:user>
-<jsec:guest><p>If you want to access the user-only <a href="<c:url value="/account"/>">account page</a>,
- you will need to log-in first.</p></jsec:guest>
+<ki:user><p>Visit your <a href="<c:url value="/account"/>">account page</a>.</p></ki:user>
+<ki:guest><p>If you want to access the user-only <a href="<c:url value="/account"/>">account page</a>,
+ you will need to log-in first.</p></ki:guest>
<h2>Roles</h2>
@@ -46,21 +46,21 @@
<h3>Roles you have</h3>
<p>
- <jsec:hasRole name="root">root<br/></jsec:hasRole>
- <jsec:hasRole name="president">president<br/></jsec:hasRole>
- <jsec:hasRole name="darklord">darklord<br/></jsec:hasRole>
- <jsec:hasRole name="goodguy">goodguy<br/></jsec:hasRole>
- <jsec:hasRole name="schwartz">schwartz<br/></jsec:hasRole>
+ <ki:hasRole name="root">root<br/></ki:hasRole>
+ <ki:hasRole name="president">president<br/></ki:hasRole>
+ <ki:hasRole name="darklord">darklord<br/></ki:hasRole>
+ <ki:hasRole name="goodguy">goodguy<br/></ki:hasRole>
+ <ki:hasRole name="schwartz">schwartz<br/></ki:hasRole>
</p>
<h3>Roles you DON'T have</h3>
<p>
- <jsec:lacksRole name="root">root<br/></jsec:lacksRole>
- <jsec:lacksRole name="president">president<br/></jsec:lacksRole>
- <jsec:lacksRole name="darklord">darklord<br/></jsec:lacksRole>
- <jsec:lacksRole name="goodguy">goodguy<br/></jsec:lacksRole>
- <jsec:lacksRole name="schwartz">schwartz<br/></jsec:lacksRole>
+ <ki:lacksRole name="root">root<br/></ki:lacksRole>
+ <ki:lacksRole name="president">president<br/></ki:lacksRole>
+ <ki:lacksRole name="darklord">darklord<br/></ki:lacksRole>
+ <ki:lacksRole name="goodguy">goodguy<br/></ki:lacksRole>
+ <ki:lacksRole name="schwartz">schwartz<br/></ki:lacksRole>
</p>
diff --git a/samples/web/src/main/webapp/include.jsp b/samples/web/src/main/webapp/include.jsp
index b1d7f28..9795418 100644
--- a/samples/web/src/main/webapp/include.jsp
+++ b/samples/web/src/main/webapp/include.jsp
@@ -19,4 +19,4 @@
<%@ page import="org.apache.ki.SecurityUtils" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="jsec" uri="http://ki.apache.org/tags" %>
\ No newline at end of file
+<%@ taglib prefix="ki" uri="http://ki.apache.org/tags" %>
\ No newline at end of file
diff --git a/samples/web/src/main/webapp/login.jsp b/samples/web/src/main/webapp/login.jsp
index 1439d9a..1979c40 100644
--- a/samples/web/src/main/webapp/login.jsp
+++ b/samples/web/src/main/webapp/login.jsp
@@ -26,7 +26,7 @@
<h2>Please Log in</h2>
-<jsec:guest>
+<ki:guest>
<p>Here are a few sample accounts to play with in the default text-based Realm (used for this
demo and test installs only). Do you remember the movie these names came from? ;)</p>
@@ -85,7 +85,7 @@
</tbody>
</table>
<br/><br/>
-</jsec:guest>
+</ki:guest>
<form action="" method="post">
<table align="left" border="0" cellspacing="0" cellpadding="3">
diff --git a/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java b/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java
index d46cbac..0fed8cd 100644
--- a/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java
+++ b/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java
@@ -52,7 +52,7 @@
* The following is a fully commented example that documents how to configure it:
* <p/>
* <pre><filter>
- * <filter-name>JSecurityFilter</filter-name>
+ * <filter-name>KiFilter</filter-name>
* <filter-class>org.apache.ki.web.servlet.KiFilter</filter-class>
* <init-param><param-name>config</param-name><param-value>
* #
@@ -221,7 +221,7 @@
* #
* #
* <filter-mapping>
- * <filter-name>JSecurityFilter</filter-name>
+ * <filter-name>KiFilter</filter-name>
* <url-pattern>/*</url-pattern>
* </filter-mapping></pre>
*
diff --git a/web/src/main/java/org/apache/ki/web/tags/ki.tld b/web/src/main/resources/META-INF/ki.tld
similarity index 100%
rename from web/src/main/java/org/apache/ki/web/tags/ki.tld
rename to web/src/main/resources/META-INF/ki.tld
