You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2009/03/26 01:19:15 UTC
svn commit: r758476 [3/4] - in /incubator/jsecurity/trunk: ./
core/src/main/java/org/apache/ki/ core/src/main/java/org/apache/ki/aop/
core/src/main/java/org/apache/ki/authc/
core/src/main/java/org/apache/ki/authc/credential/
core/src/main/java/org/apac...
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SessionsSecurityManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SessionsSecurityManager.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SessionsSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SessionsSecurityManager.java Thu Mar 26 00:19:03 2009
@@ -37,7 +37,7 @@
/**
- * Apache Ki support of a {@link SecurityManager} class hierarchy that delegates all
+ * Ki support of a {@link SecurityManager} class hierarchy that delegates all
* {@link org.apache.ki.session.Session session} operations to a wrapped {@link org.apache.ki.session.mgt.SessionManager SessionManager}
* instance. That is, this class implements the methods in the
* {@link SessionManager SessionManager} interface, but in reality, those methods are merely passthrough calls to
@@ -46,7 +46,7 @@
* The remaining {@code SecurityManager} methods not implemented by this class or its parents are left to be
* implemented by subclasses.
* <p/>
- * In keeping with the other classes in this hierarchy and Apache Ki's desire to minimize configuration whenever
+ * In keeping with the other classes in this hierarchy and Ki's desire to minimize configuration whenever
* possible, suitable default instances for all dependencies will be created upon instantiation.
*
* @author Les Hazlewood
@@ -158,7 +158,7 @@
"This might occur for example if you're trying to set the validation interval or auto session " +
"creation in a servlet container-backed session environment ('http' session mode). If that is " +
"the case however, that property is only useful when using 'ki' session mode and using " +
- "Apache Ki enterprise sessions which do not rely on a servlet container.";
+ "Ki enterprise sessions which do not rely on a servlet container.";
throw new IllegalStateException(msg);
}
}
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/package-info.java Thu Mar 26 00:19:03 2009
@@ -18,6 +18,6 @@
*/
/**
* Provides the master {@link org.apache.ki.mgt.SecurityManager SecurityManager} interface and a default implementation
- * hierarchy for managing all aspects of Apache Ki's functionality in an application.
+ * hierarchy for managing all aspects of Ki's functionality in an application.
*/
package org.apache.ki.mgt;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,24 +1,24 @@
-/*
- * 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.
- */
-/**
- * This package primarily exists as a root classpath distinction, but it does contain two core classes widely used
- * by applications, {@link org.apache.ki.SecurityUtils SecurityUtils} and
- * {@link org.apache.ki.KiException Apache KiException}.
- */
+/*
+ * 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.
+ */
+/**
+ * This package primarily exists as a root classpath distinction, but it does contain two core classes widely used
+ * by applications, {@link org.apache.ki.SecurityUtils SecurityUtils} and
+ * {@link org.apache.ki.KiException KiException}.
+ */
package org.ki;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/AuthenticatingRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/AuthenticatingRealm.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/AuthenticatingRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/AuthenticatingRealm.java Thu Mar 26 00:19:03 2009
@@ -206,7 +206,7 @@
* authentication token.
*
* <p>For most datasources, this means just 'pulling' authentication data for an associated subject/user and nothing
- * more and letting Apache Ki do the rest. But in some systems, this method could actually perform EIS specific
+ * more and letting Ki do the rest. But in some systems, this method could actually perform EIS specific
* log-in logic in addition to just retrieving data - it is up to the Realm implementation.
*
* <p>A <tt>null</tt> return value means that no account could be associated with the specified token.
@@ -224,11 +224,11 @@
* Default implementation that does nothing (no-op) and exists as a convenience mechanism in case subclasses
* wish to override it to implement realm-specific logout logic for the given user account logging out.</p>
* <p/>
- * In a single-realm Apache Ki configuration (most applications), the <code>principals</code> method
+ * In a single-realm Ki configuration (most applications), the <code>principals</code> method
* argument will be the same as that which is contained in the <code>AuthenticationInfo</code> object returned by the
* {@link #doGetAuthenticationInfo} method (that is, {@link AuthenticationInfo#getPrincipals info.getPrincipals()}).
* <p/>
- * In a multi-realm Apache Ki configuration, the given <code>principals</code> method
+ * In a multi-realm Ki configuration, the given <code>principals</code> method
* argument could contain principals returned by many realms. Therefore the subclass implementation would need
* to know how to extract the principal(s) relevant to only itself and ignore other realms' principals. This is
* usually done by calling {@link org.apache.ki.subject.PrincipalCollection#fromRealm(String) principals.fromRealm(name)},
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/Realm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/Realm.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/Realm.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/Realm.java Thu Mar 26 00:19:03 2009
@@ -43,13 +43,13 @@
* return <tt>false</tt>.
*
* <p>Because every application is different, security data such as users and roles can be
- * represented in any number of ways. Apache Ki tries to maintain a non-intrusive development philosophy whenever
+ * represented in any number of ways. Ki tries to maintain a non-intrusive development philosophy whenever
* possible - it does not require you to implement or extend any <tt>User</tt>, <tt>Group</tt> or <tt>Role</tt>
* interfaces or classes.
*
- * <p>Instead, Apache Ki allows applications to implement this interface to access environment-specific datasources
- * and data model objects. The implementation can then be plugged in to the application's Apache Ki configuration.
- * This modular technique abstracts away any environment/modeling details and allows Apache Ki to be deployed in
+ * <p>Instead, Ki allows applications to implement this interface to access environment-specific datasources
+ * and data model objects. The implementation can then be plugged in to the application's Ki configuration.
+ * This modular technique abstracts away any environment/modeling details and allows Ki to be deployed in
* practically any application environment.
*
* <p>Most users will not implement the <tt>Realm</tt> interface directly, but will extend one of the subclasses,
@@ -94,7 +94,7 @@
*
* <p>This method effectively represents a login attempt for the corresponding user with the underlying EIS datasource.
* Most implementations merely just need to lookup and return the account data only (as the method name implies)
- * and let Apache Ki do the rest, but implementations may of course perform eis specific login operations if so
+ * and let Ki do the rest, but implementations may of course perform eis specific login operations if so
* desired.
*
* @param token the application-specific representation of an account principal and credentials.
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/RealmFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/RealmFactory.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/RealmFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/RealmFactory.java Thu Mar 26 00:19:03 2009
@@ -21,10 +21,10 @@
import java.util.Collection;
/**
- * Enables Apache Ki end-users to configure and initialize one or more {@link Realm Realm} instances
+ * Enables Ki end-users to configure and initialize one or more {@link Realm Realm} instances
* in any manner desired.
* <p/>
- * This interface exists to support environments where end-users may not wish to use Apache Ki's default
+ * This interface exists to support environments where end-users may not wish to use Ki's default
* text-based configuration to create and configure realms, and instead wish to retrieve a realm configured in a
* proprietary manner. An implementation of this interface can access that proprietary mechanism to retrieve the
* already-created <tt>Realm</tt>s.
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/jndi/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/jndi/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/jndi/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/jndi/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,21 +1,21 @@
-/*
- * 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.
- */
-/**
- * Support for acquiring Realms from JNDI, particularly useful for configuring Apache Ki in JEE or EJB environments. */
+/*
+ * 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.
+ */
+/**
+ * Support for acquiring Realms from JNDI, particularly useful for configuring Ki in JEE or EJB environments. */
package org.apache.ki.realm.jndi;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/text/PropertiesRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/text/PropertiesRealm.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/text/PropertiesRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/text/PropertiesRealm.java Thu Mar 26 00:19:03 2009
@@ -136,7 +136,7 @@
} catch (Exception e) {
if (log.isInfoEnabled()) {
log.info("Unable to find a ki-users.properties file at location [" + this.resourcePath + "]. " +
- "Defaulting to Apache Ki's failsafe properties file (demo use only).");
+ "Defaulting to Ki's failsafe properties file (demo use only).");
}
this.resourcePath = FAILSAFE_RESOURCE_PATH;
loadProperties();
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/ValidatingSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/ValidatingSessionManager.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/ValidatingSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/ValidatingSessionManager.java Thu Mar 26 00:19:03 2009
@@ -67,8 +67,8 @@
* proactive systems, this {@link #validateSessions()} method should be invoked regularaly
* anyway to <em>guarantee</em> no orphans exist.
*
- * <p><b>Note:</b> Apache Ki supports automatic execution of this method at a regular interval
- * by using {@link SessionValidationScheduler}s. The Apache Ki default SecurityManager implementations
+ * <p><b>Note:</b> Ki supports automatic execution of this method at a regular interval
+ * by using {@link SessionValidationScheduler}s. The Ki default SecurityManager implementations
* needing session validation will create and use one by default if one is not provided by the
* application configuration.
*/
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/eis/MemorySessionDAO.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/eis/MemorySessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/eis/MemorySessionDAO.java Thu Mar 26 00:19:03 2009
@@ -48,7 +48,7 @@
* <li>If you need session information beyond their transient start/stop lifetimes, you should subclass this one and
* override the <tt>do*</tt> methods to perform CRUD operations using an EIS-tier API (e.g. Hibernate/JPA/JCR/etc).
* This class implementation does not retain sessions after they have been stopped or expired, so you would need to
- * override these methods to ensure Sessions can be accessed beyond Apache Ki's needs.</li>
+ * override these methods to ensure Sessions can be accessed beyond Ki's needs.</li>
* </ul>
*
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,36 +1,36 @@
-/*
- * 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.
- */
-/**
- * Components related to managing sessions, the time-based data contexts in which a Subject
- * interacts with an application.
- * <p/>
- * Sessions in Apache Ki are completely POJO-based and do not <em>require</em> an application to use Web-based
- * or EJB-based session management infrastructure - the client and/or server technoloy is irrelevent in
- * Apache Ki's architecture, allowing session management to be employed in the smallest standalone application
- * to the largest enterprise deployments.
- * <p/>
- * This design decision opens up a new world to Java applications - most notably the ability to participate in
- * a session regardless if the client is using HTTP, custom sockets, web services, or even non-Java progamming
- * languages. Aside from Apache Ki, there is currently no technology in Java today allows this heterogenous
- * client-session capability.
- * <p/>
- * Also because of this freedom, Apache Ki naturally supports Single Sign-On for any application as well, using
- * this heterogeneous session support.
- */
+/*
+ * 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.
+ */
+/**
+ * Components related to managing sessions, the time-based data contexts in which a Subject
+ * interacts with an application.
+ * <p/>
+ * Sessions in Ki are completely POJO-based and do not <em>require</em> an application to use Web-based
+ * or EJB-based session management infrastructure - the client and/or server technoloy is irrelevent in
+ * Ki's architecture, allowing session management to be employed in the smallest standalone application
+ * to the largest enterprise deployments.
+ * <p/>
+ * This design decision opens up a new world to Java applications - most notably the ability to participate in
+ * a session regardless if the client is using HTTP, custom sockets, web services, or even non-Java progamming
+ * languages. Aside from Ki, there is currently no technology in Java today allows this heterogenous
+ * client-session capability.
+ * <p/>
+ * Also because of this freedom, Ki naturally supports Single Sign-On for any application as well, using
+ * this heterogeneous session support.
+ */
package org.apache.ki.session;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/Subject.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/Subject.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/Subject.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/Subject.java Thu Mar 26 00:19:03 2009
@@ -30,13 +30,13 @@
/**
* A <tt>Subject</tt> represents state and security operations for a <em>single</em> application user.
* These operations include authentication (login/logout), authorization (access control), and
- * session access. It is Apache Ki's primary mechanism for single-user security functionality.
+ * session access. It is Ki's primary mechanism for single-user security functionality.
*
* <p>Note that there are many *Permission methods in this interface overloaded to accept String arguments instead of
* {@link Permission Permission} instances. They are a convenience allowing the caller to use a String representation of
* a {@link Permission Permission} if desired. The underlying Authorization subsystem implementations will usually
* simply convert these String values to {@link Permission Permission} instances and then just call the corresponding
- * type-safe method. (Apache Ki's default implementations do String-to-Permission conversion for these methods using
+ * type-safe method. (Ki's default implementations do String-to-Permission conversion for these methods using
* {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver}s.)
*
* <p>These overloaded *Permission methods <em>do</em> forego type-saftey for the benefit of convenience and simplicity,
@@ -55,15 +55,15 @@
* <p>The term <em>principal</em> is just a fancy security term for any identifying attribute(s) of an application
* user, such as a username, or user id, or public key, or anything else you might use in your application to
* identify a user. And although given names and family names (first/last) are technically principals as well,
- * Apache Ki expects the object(s) returned from this method to be uniquely identifying attibute(s) for
+ * Ki expects the object(s) returned from this method to be uniquely identifying attibute(s) for
* your application. This implies that things like given names and family names are usually poor candidates as
* return values since they are rarely guaranteed to be unique.</p>
*
* <p>Most single-Realm applications would return from this method a single unique principal as noted above
* (for example a String username or Long user id, etc, etc). Single-realm applications represent the large
- * majority of Apache Ki applications.</p>
+ * majority of Ki applications.</p>
*
- * <p>However, in <em>multi</em>-Realm configurations, which are fully supported by Apache Ki as well, it is
+ * <p>However, in <em>multi</em>-Realm configurations, which are fully supported by Ki as well, it is
* possible that the return value encapsulates more than one principal. Typically multi-realm applications need to
* retain the unique principals for <em>each</em> Realm so subsequent security checks against these Realms can
* utilize these multiple principals. In these cases, the object returned could be a Collection or any
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,27 +1,27 @@
-/*
- * 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.
- */
-/**
- * Components supporting the {@link org.apache.ki.subject.Subject Subject} interface, the most important concept in
- * Apache Ki's API.
- * <p/>
- * A <code>Subject</code> is <em>the</em> primary component when using Apache Ki programatically for single-user
- * security operations, and it is the handle to any accessible user security data. All single-user
- * authentication, authorization and session operations are performed via a <code>Subject</code> instance.
- */
+/*
+ * 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.
+ */
+/**
+ * Components supporting the {@link org.apache.ki.subject.Subject Subject} interface, the most important concept in
+ * Ki's API.
+ * <p/>
+ * A <code>Subject</code> is <em>the</em> primary component when using Ki programatically for single-user
+ * security operations, and it is the handle to any accessible user security data. All single-user
+ * authentication, authorization and session operations are performed via a <code>Subject</code> instance.
+ */
package org.apache.ki.subject;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/AntPathMatcher.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/AntPathMatcher.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/AntPathMatcher.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/AntPathMatcher.java Thu Mar 26 00:19:03 2009
@@ -50,7 +50,7 @@
*
* <p><b>N.B.</b>: This class was borrowed (with much appreciation) from the
* <a href="http://www.springframework.org">Spring Framework</a> with modifications. We didn't want to reinvent the
- * wheel of great work they've done, but also didn't want to force every Apache Ki user to depend on Spring</p>
+ * wheel of great work they've done, but also didn't want to force every Ki user to depend on Spring</p>
*
* <p>As per the Apache 2.0 license, the original copyright notice and all author and copyright information have
* remained in tact.</p>
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/CollectionUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/CollectionUtils.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/CollectionUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/CollectionUtils.java Thu Mar 26 00:19:03 2009
@@ -38,7 +38,7 @@
/**
* Simple method that just returns <code>Collections.EMPTY_SET</code>.
- * This exists to enable type-safe empty collections so other locations in Apache Ki code
+ * This exists to enable type-safe empty collections so other locations in Ki code
* do not need to worry about suppressing warnings.
*
* @param clazz the class of the collection type to return
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Destroyable.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Destroyable.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Destroyable.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Destroyable.java Thu Mar 26 00:19:03 2009
@@ -19,7 +19,7 @@
package org.apache.ki.util;
/**
- * Apache Ki container-agnostic interface that indicates that this object requires a callback during destruction.
+ * Ki container-agnostic interface that indicates that this object requires a callback during destruction.
*
* @author Les Hazlewood
* @author Jeremy Haile
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Initializable.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Initializable.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Initializable.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Initializable.java Thu Mar 26 00:19:03 2009
@@ -21,7 +21,7 @@
import org.apache.ki.KiException;
/**
- * Apache Ki container-agnostic interface that indicates that this object requires initialization.
+ * Ki container-agnostic interface that indicates that this object requires initialization.
*
* @author Les Hazlewood
* @author Jeremy Haile
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JavaEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JavaEnvironment.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JavaEnvironment.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JavaEnvironment.java Thu Mar 26 00:19:03 2009
@@ -20,10 +20,10 @@
/**
* Internal helper class used to find the Java/JDK version
- * that Apache Ki is operating within, to allow for automatically
+ * that Ki is operating within, to allow for automatically
* adapting to the present platform's capabilities.
*
- * <p>Note that Apache Ki does not support 1.2 or earlier JVMs - only 1.3 and later.
+ * <p>Note that Ki does not support 1.2 or earlier JVMs - only 1.3 and later.
*
* <p><em>This class was borrowed and heavily based upon a nearly identical version found in
* the <a href="http://www.springframework.org/">Spring Framework</a>, with minor modifications.
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JdbcUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JdbcUtils.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JdbcUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JdbcUtils.java Thu Mar 26 00:19:03 2009
@@ -30,7 +30,7 @@
* A set of static helper methods for managing JDBC API objects.
* <p/>
* <em>Note:</em> Some parts of this class were copied from the Spring Framework and then modified.
- * They were copied here to prevent Spring dependencies in the Apache Ki core API. The original license conditions
+ * They were copied here to prevent Spring dependencies in the Ki core API. The original license conditions
* (Apache 2.0) have been maintained.
*
* @author Jeremy Haile
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/UnknownClassException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/UnknownClassException.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/UnknownClassException.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/UnknownClassException.java Thu Mar 26 00:19:03 2009
@@ -22,7 +22,7 @@
/**
- * The Apache Ki framework's <code>RuntimeException</code> equivalent of the JDK's
+ * The Ki framework's <code>RuntimeException</code> equivalent of the JDK's
* <code>ClassNotFoundException</code>, to maintain a RuntimeException paradigm.
*
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/main/resources/org/apache/ki/realm/text/default-ki-users.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/resources/org/apache/ki/realm/text/default-ki-users.properties?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/resources/org/apache/ki/realm/text/default-ki-users.properties (original)
+++ incubator/jsecurity/trunk/core/src/main/resources/org/apache/ki/realm/text/default-ki-users.properties Thu Mar 26 00:19:03 2009
@@ -25,7 +25,7 @@
# which is probably of little value to a 'real' application.
#
# This file primarily exists as a failsafe mechanism in case you don't provide
-# any Realms to the Apache Ki SecurityManager at startup. It also serves as a
+# any Realms to the Ki SecurityManager at startup. It also serves as a
# simple and fun example. But you will want to provide one or more of your
# own Realms in a real application.
#
Modified: incubator/jsecurity/trunk/docs/reference/src/index.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/docs/reference/src/index.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/docs/reference/src/index.xml (original)
+++ incubator/jsecurity/trunk/docs/reference/src/index.xml Thu Mar 26 00:19:03 2009
@@ -62,9 +62,9 @@
<partintro id="ki-quickstart-intro">
<para>
This initial part of the reference documentation walks through the simplest quickstart application
- so that you may become familiarized Apache Ki's programming API and general concepts. While this
- application is probably the absolute simplest Apache Ki-enabled application that we know of,
- it should make you comfortable understanding what Apache Ki can do, and how it can help you create
+ so that you may become familiarized Ki's programming API and general concepts. While this
+ application is probably the absolute simplest Ki-enabled application that we know of,
+ it should make you comfortable understanding what Ki can do, and how it can help you create
more secure applications. The rest of the documentation will serve as your guide to help you move
from this simple example to even the most complicated enterprise applications.
</para>
@@ -82,7 +82,7 @@
<partintro id="ki-core-intro">
<para>
This part of the reference documentation covers
- Apache Ki's core architectural components that support
+ Ki's core architectural components that support
functionality in all environments, from
constrained Applets and cell phones to full n-tier
clustered enterprise applications.
@@ -148,7 +148,7 @@
<partintro id="ki-web-intro">
<para>
This part of the reference documentation covers
- Apache Ki's web support, specifically using Apache Ki in
+ Ki's web support, specifically using Ki in
a Servlet container for web-based applications.
</para>
<para>
@@ -188,7 +188,7 @@
<title>Integration</title>
<partintro id="ki-integration-intro">
<para>
- This part of the reference documentation covers Apache Ki's
+ This part of the reference documentation covers Ki's
integration with other technologies that might be
useful in application deployments.
</para>
Modified: incubator/jsecurity/trunk/docs/reference/src/preface.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/docs/reference/src/preface.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/docs/reference/src/preface.xml (original)
+++ incubator/jsecurity/trunk/docs/reference/src/preface.xml Thu Mar 26 00:19:03 2009
@@ -1,82 +1,82 @@
-<!--
- ~ 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.
- -->
-<preface>
- <title>Preface</title>
-
- <para>
- Securing a software application is a task that is almost always a necessity, but isn't
- something that we like to worry about very often. We're more focused on programming business logic,
- deadlines, performance, and many other things that are more directly related to things clients
- can see. Application security is often an afterthought and something that we do when we
- <quote>get around to it</quote>.
- </para>
-
- <para>
- While application security is usually a necessity, it would be nice if we could implement it whenever
- we want, and without it being too difficult. Actually, it
- <emphasis>shouldn't</emphasis>
- be difficult.
- In fact, it
- <emphasis>should</emphasis>
- be downright easy. It should also be as transparent and
- unintrusive as possible, so you don't have to change a lot of code to secure what you want.
- And above all, it should be extremely easy to understand, so when you do actually have to look at security
- code, it just makes sense.
- </para>
-
- <para>
- Apache Ki is a Java security framework that attempts to achieve these goals. The framework tries to
- give as much power and flexibility as possible, while still being
- <emphasis>really</emphasis>
- easy to understand and easy to use. It tries to be the most comprehensive and feature-rich security
- framework in the Java world so that you have everything you need at your fingertips.
- </para>
-
- <para>
- This document is the official refrence manual for the Apache Ki framework, and it aims to give you the
- most complete documentation on Apache Ki and all of its features. It is
- very much a work-in-progress, and we welcome suggestions and recommendations. If you have any,
- we'd very much appreciate your feedback on our forums at
- <ulink url="http://www.jsecurity.org/forum">http://www.jsecurity.org/forum</ulink>
- or
- mailing lists at
- <ulink url="http://www.jsecurity.org/mailinglists">http://www.jsecurity.org/mailinglists</ulink>
- .
- </para>
-
- <para>
- Before continuing on, we'd like to give credit where it is due for the format of this
- book. We sincerely appreciate all the work that Christian Bauer from the
- <ulink url="http://www.hibernate.org">Hibernate</ulink>
- team and
- Juergen Hoeller of the
- <ulink url="http://www.springframework.org">Spring</ulink>
- team did in ensuring this
- document could be created in PDF and HTML formats. Without their efforts, it would have been an agnoizing
- task for us to do ourselves.
- Thank you!
- </para>
-
- <para>
- So, without further adieu, let's move on to the documentation. Feel
- free knowing you can incorporate Apache Ki's rich features quickly and easily now, or perhaps maybe
- later when you<quote>get around to it</quote>.
- </para>
-
+<!--
+ ~ 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.
+ -->
+<preface>
+ <title>Preface</title>
+
+ <para>
+ Securing a software application is a task that is almost always a necessity, but isn't
+ something that we like to worry about very often. We're more focused on programming business logic,
+ deadlines, performance, and many other things that are more directly related to things clients
+ can see. Application security is often an afterthought and something that we do when we
+ <quote>get around to it</quote>.
+ </para>
+
+ <para>
+ While application security is usually a necessity, it would be nice if we could implement it whenever
+ we want, and without it being too difficult. Actually, it
+ <emphasis>shouldn't</emphasis>
+ be difficult.
+ In fact, it
+ <emphasis>should</emphasis>
+ be downright easy. It should also be as transparent and
+ unintrusive as possible, so you don't have to change a lot of code to secure what you want.
+ And above all, it should be extremely easy to understand, so when you do actually have to look at security
+ code, it just makes sense.
+ </para>
+
+ <para>
+ Apache Ki is a Java security framework that attempts to achieve these goals. The framework tries to
+ give as much power and flexibility as possible, while still being
+ <emphasis>really</emphasis>
+ easy to understand and easy to use. It tries to be the most comprehensive and feature-rich security
+ framework in the Java world so that you have everything you need at your fingertips.
+ </para>
+
+ <para>
+ This document is the official refrence manual for the Apache Ki framework, and it aims to give you the
+ most complete documentation on Ki and all of its features. It is
+ very much a work-in-progress, and we welcome suggestions and recommendations. If you have any,
+ we'd very much appreciate your feedback on our forums at
+ <ulink url="http://www.jsecurity.org/forum">http://www.jsecurity.org/forum</ulink>
+ or
+ mailing lists at
+ <ulink url="http://www.jsecurity.org/mailinglists">http://www.jsecurity.org/mailinglists</ulink>
+ .
+ </para>
+
+ <para>
+ Before continuing on, we'd like to give credit where it is due for the format of this
+ book. We sincerely appreciate all the work that Christian Bauer from the
+ <ulink url="http://www.hibernate.org">Hibernate</ulink>
+ team and
+ Juergen Hoeller of the
+ <ulink url="http://www.springframework.org">Spring</ulink>
+ team did in ensuring this
+ document could be created in PDF and HTML formats. Without their efforts, it would have been an agnoizing
+ task for us to do ourselves.
+ Thank you!
+ </para>
+
+ <para>
+ So, without further adieu, let's move on to the documentation. Feel
+ free knowing you can incorporate Ki's rich features quickly and easily now, or perhaps maybe
+ later when you<quote>get around to it</quote>.
+ </para>
+
</preface>
Modified: incubator/jsecurity/trunk/docs/reference/src/security-manager.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/docs/reference/src/security-manager.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/docs/reference/src/security-manager.xml (original)
+++ incubator/jsecurity/trunk/docs/reference/src/security-manager.xml Thu Mar 26 00:19:03 2009
@@ -23,7 +23,7 @@
<section id="security-manager-introduction">
<title>Introduction</title>
- <para>This chapter covers Apache Ki's notion of a Security Manager.</para>
+ <para>This chapter covers Ki's notion of a Security Manager.</para>
</section>
Modified: incubator/jsecurity/trunk/docs/reference/styles/html_chunk.xsl
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/docs/reference/styles/html_chunk.xsl?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/docs/reference/styles/html_chunk.xsl (original)
+++ incubator/jsecurity/trunk/docs/reference/styles/html_chunk.xsl Thu Mar 26 00:19:03 2009
@@ -104,7 +104,7 @@
<!--###################################################
Headers and Footers
################################################### -->
- <!-- let's have a Apache Ki and Anjin banner across the top of each page -->
+ <!-- let's have a Ki and Anjin banner across the top of each page -->
<xsl:template name="user.header.navigation">
<div style="background-color:white;border:none;height:73px;border:1px solid black;">
<a style="border:none;" href="http://www.jsecurity.org/" title="Apache Ki">
Modified: incubator/jsecurity/trunk/docs/reference/styles/tld.to.docbook.xsl
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/docs/reference/styles/tld.to.docbook.xsl?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/docs/reference/styles/tld.to.docbook.xsl (original)
+++ incubator/jsecurity/trunk/docs/reference/styles/tld.to.docbook.xsl Thu Mar 26 00:19:03 2009
@@ -55,9 +55,9 @@
</xsl:element>
<xsl:element name="para">
- <xsl:text>One of the view technologies you can use with Apache Ki
+ <xsl:text>One of the view technologies you can use with Ki
is Java Server Pages (JSPs). To help you implement views using Java Server Pages,
- Apache Ki provides you with some tags for evaluating errors, setting
+ Ki provides you with some tags for evaluating errors, setting
themes and outputting internationalized messages.
</xsl:text>
</xsl:element>
Modified: incubator/jsecurity/trunk/samples/quickstart/src/main/java/Quickstart.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/quickstart/src/main/java/Quickstart.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/quickstart/src/main/java/Quickstart.java (original)
+++ incubator/jsecurity/trunk/samples/quickstart/src/main/java/Quickstart.java Thu Mar 26 00:19:03 2009
@@ -43,8 +43,8 @@
public static void main( String[] args ) {
//Most applications would never instantiate a SecurityManager directly - you would instead configure
- //Apache Ki in web.xml or a container (JEE, Spring, etc).
- //But, since this is a quickstart, we just want you to get a feel for how the Apache Ki API looks, so this
+ //Ki in web.xml or a container (JEE, Spring, etc).
+ //But, since this is a quickstart, we just want you to get a feel for how the Ki API looks, so this
//is sufficient to have a simple working example:
DefaultSecurityManager securityManager = new DefaultSecurityManager();
@@ -55,7 +55,7 @@
SecurityUtils.setSecurityManager( securityManager );
- //now that a simple Apache Ki environment is set up, let's see what you can do:
+ //now that a simple Ki environment is set up, let's see what you can do:
//get the currently executing user:
Subject currentUser = SecurityUtils.getSubject();
Modified: incubator/jsecurity/trunk/samples/quickstart/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/quickstart/src/main/resources/log4j.properties?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/quickstart/src/main/resources/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/quickstart/src/main/resources/log4j.properties Thu Mar 26 00:19:03 2009
@@ -28,7 +28,7 @@
# Spring
log4j.logger.org.springframework=WARN
-# Default Apache Ki logging
+# Default Ki logging
log4j.logger.org.ki=TRACE
# Disable verbose logging
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties Thu Mar 26 00:19:03 2009
@@ -31,7 +31,7 @@
# Hibernate
log4j.logger.org.hibernate=WARN
-# Default Apache Ki logging
+# Default Ki logging
log4j.logger.org.ki=TRACE
# Disable verbose logging
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml Thu Mar 26 00:19:03 2009
@@ -36,7 +36,7 @@
<context:component-scan base-package="org.ki.samples.sprhib.security"/>
<context:component-scan base-package="org.ki.samples.sprhib.service"/>
- <!-- Spring AOP auto-proxy creation (required to support Apache Ki annotations) -->
+ <!-- Spring AOP auto-proxy creation (required to support Ki annotations) -->
<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
@@ -82,10 +82,10 @@
<!-- =========================================================
- Apache Ki Components
+ Ki Components
========================================================= -->
- <!-- Apache Ki's main business-tier object for web-enabled applications
+ <!-- Ki's main business-tier object for web-enabled applications
(use org.kifaultSecurityManager instead when there is no web environment)-->
<bean id="securityManager" class="org.apache.ki.web.DefaultWebSecurityManager">
<!-- Single realm app (realm configured next, below). If you have multiple realms, use the 'realms'
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml Thu Mar 26 00:19:03 2009
@@ -60,13 +60,13 @@
</filter>
<filter>
- <filter-name>Apache KiFilter</filter-name>
- <filter-class>org.apache.ki.spring.SpringApache KiFilter</filter-class>
+ <filter-name>KiFilter</filter-name>
+ <filter-class>org.apache.ki.spring.SpringKiFilter</filter-class>
<init-param>
<param-name>config</param-name>
<param-value>
- # The Apache KiFilter configuration is very powerful and flexible, while still remaining succinct.
+ # The KiFilter configuration is very powerful and flexible, while still remaining succinct.
# Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
#
# http://ki.apache.org/api/org/apache/ki/web/servlet/KiFilter.html
@@ -96,7 +96,7 @@
</filter-mapping>
<filter-mapping>
- <filter-name>Apache KiFilter</filter-name>
+ <filter-name>KiFilter</filter-name>
<url-pattern>/s/*</url-pattern>
</filter-mapping>
Modified: incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/BootstrapDataPopulator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/BootstrapDataPopulator.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/BootstrapDataPopulator.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/BootstrapDataPopulator.java Thu Mar 26 00:19:03 2009
@@ -30,7 +30,7 @@
/**
* A data populator that creates a set of security tables and test data that can be used by the
- * Apache Ki Spring sample application to demonstrate the use of the {@link org.apache.ki.realm.jdbc.JdbcRealm}
+ * Ki Spring sample application to demonstrate the use of the {@link org.apache.ki.realm.jdbc.JdbcRealm}
* The tables created by this class follow the default table and column names that {@link org.apache.ki.realm.jdbc.JdbcRealm} uses.
*
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartView.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartView.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartView.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartView.java Thu Mar 26 00:19:03 2009
@@ -35,7 +35,7 @@
/**
* Simple web start application that helps to demo single sign-on and
- * remoting authorization using Apache Ki. The injected <tt>SampleManager</tt>
+ * remoting authorization using Ki. The injected <tt>SampleManager</tt>
* is hosted by the Spring sample web application and remotely invoked
* when the buttons in this view are clicked.
*
Modified: incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/IndexController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/IndexController.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/IndexController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/IndexController.java Thu Mar 26 00:19:03 2009
@@ -33,7 +33,7 @@
import org.apache.ki.subject.Subject;
/**
- * Spring MVC controller responsible for rendering the Apache Ki Spring sample
+ * Spring MVC controller responsible for rendering the Ki Spring sample
* application index page.
*
* @author Jeremy Haile
Modified: incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/JnlpController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/JnlpController.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/JnlpController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/JnlpController.java Thu Mar 26 00:19:03 2009
@@ -31,7 +31,7 @@
import org.apache.ki.subject.Subject;
/**
- * Controller used to dynamically build a JNLP file used to launch the Apache Ki
+ * Controller used to dynamically build a JNLP file used to launch the Ki
* Spring WebStart sample application.
*
* @author Jeremy Haile
@@ -73,7 +73,7 @@
session = subject.getSession();
}
if (session == null) {
- String msg = "Expected a non-null Apache Ki session.";
+ String msg = "Expected a non-null Ki session.";
throw new IllegalArgumentException(msg);
}
Modified: incubator/jsecurity/trunk/samples/spring/src/main/resources/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/resources/ehcache.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/resources/ehcache.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/resources/ehcache.xml Thu Mar 26 00:19:03 2009
@@ -17,7 +17,7 @@
~ under the License.
-->
-<!-- EhCache XML configuration file used for Apache Ki spring sample application -->
+<!-- EhCache XML configuration file used for Ki spring sample application -->
<ehcache>
<!-- Sets the path to the directory where cache .data files are created.
@@ -74,10 +74,10 @@
diskExpiryThreadIntervalSeconds="120"
/>
- <!-- We want eternal="true" (with no timeToIdle or timeToLive settings) because Apache Ki manages session
+ <!-- We want eternal="true" (with no timeToIdle or timeToLive settings) because Ki manages session
expirations explicitly. If we set it to false and then set corresponding timeToIdle and timeToLive properties,
-ehcache would evict sessions without Apache Ki's knowledge, which would cause many problems
-(e.g. "My Apache Ki session timeout is 30 minutes - why isn't a session available after 2 minutes?"
+ehcache would evict sessions without Ki's knowledge, which would cause many problems
+(e.g. "My Ki session timeout is 30 minutes - why isn't a session available after 2 minutes?"
Answer - ehcache expired it due to the timeToIdle property set to 120 seconds.)
diskPersistent=true since we want an enterprise session management feature - ability to use sessions after
Modified: incubator/jsecurity/trunk/samples/spring/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/resources/log4j.properties?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/resources/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/resources/log4j.properties Thu Mar 26 00:19:03 2009
@@ -28,7 +28,7 @@
# Spring
log4j.logger.org.springframework=WARN
-# Default Apache Ki logging
+# Default Ki logging
log4j.logger.org.ki=TRACE
# Disable verbose logging
Modified: incubator/jsecurity/trunk/samples/spring/src/main/resources/webstart.spring.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/resources/webstart.spring.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/resources/webstart.spring.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/resources/webstart.spring.xml Thu Mar 26 00:19:03 2009
@@ -20,7 +20,7 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
- - Application context for Apache Ki WebStart sample application
+ - Application context for Ki WebStart sample application
-->
<beans>
Modified: incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/applicationContext.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/applicationContext.xml Thu Mar 26 00:19:03 2009
@@ -21,7 +21,7 @@
<beans>
- <!-- Sample RDBMS data source that would exist in any application - not Apache Ki related. -->
+ <!-- Sample RDBMS data source that would exist in any application - not Ki related. -->
<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
<property name="url" value="jdbc:hsqldb:mem:ki-spring"/>
@@ -32,13 +32,13 @@
<property name="dataSource" ref="dataSource"/>
</bean>
- <!-- Simulated business-tier "Manager", not Apache Ki related, just an example -->
+ <!-- Simulated business-tier "Manager", not Ki related, just an example -->
<bean id="sampleManager" class="org.apache.ki.samples.spring.DefaultSampleManager"/>
<!-- =========================================================
- Apache Ki Core Components - Not Spring Specific
+ Ki Core Components - Not Spring Specific
========================================================= -->
- <!-- Apache Ki's main business-tier object for web-enabled applications
+ <!-- Ki's main business-tier object for web-enabled applications
(use DefaultSecurityManager instead when there is no web environment)-->
<bean id="securityManager" class="org.apache.ki.web.DefaultWebSecurityManager">
<!-- Single realm app. If you have multiple realms, use the 'realms' property instead. -->
@@ -64,17 +64,17 @@
</bean>
<!-- =========================================================
- Apache Ki Spring-specific integration
+ Ki Spring-specific integration
========================================================= -->
<!-- Post processor that automatically invokes init() and destroy() methods
- for Spring-configured Apache Ki objects so you don't have to
+ for Spring-configured Ki objects so you don't have to
1) specify an init-method and destroy-method attributes for every bean
definition and
- 2) even know which Apache Ki objects require these methods to be
+ 2) even know which Ki objects require these methods to be
called. -->
<bean id="lifecycleBeanPostProcessor" class="org.apache.ki.spring.LifecycleBeanPostProcessor"/>
- <!-- Enable Apache Ki Annotations for Spring-configured beans. Only run after
+ <!-- Enable Ki Annotations for Spring-configured beans. Only run after
the lifecycleBeanProcessor has run: -->
<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"
depends-on="lifecycleBeanPostProcessor"/>
Modified: incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp Thu Mar 26 00:19:03 2009
@@ -19,7 +19,7 @@
<%@ page contentType="application/x-java-jnlp-file" %>
<?xml version="1.0" encoding="utf-8"?>
-<!-- JNLP File for Apache Ki Sample Application -->
+<!-- JNLP File for Ki Sample Application -->
<jnlp spec="1.0+" codebase="${codebaseUrl}">
<information>
<title>Apache Ki Sample Application</title>
Modified: incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp Thu Mar 26 00:19:03 2009
@@ -28,7 +28,7 @@
<div id="contentBox">
- <h1>Apache Ki Login</h1>
+ <h1>Ki Login</h1>
<p>
<span style="color: red;">
Modified: incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml Thu Mar 26 00:19:03 2009
@@ -62,7 +62,7 @@
<init-param>
<param-name>config</param-name>
<param-value>
- # The Apache KiFilter configuration is very powerful and flexible, while still remaining succinct.
+ # The KiFilter configuration is very powerful and flexible, while still remaining succinct.
# Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
#
# http://ki.apache.org/api/org/apache/ki/web/servlet/KiFilter.html
Modified: incubator/jsecurity/trunk/samples/standalone/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/standalone/src/main/resources/log4j.properties?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/standalone/src/main/resources/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/standalone/src/main/resources/log4j.properties Thu Mar 26 00:19:03 2009
@@ -28,7 +28,7 @@
# Spring
log4j.logger.org.springframework=WARN
-# Default Apache Ki logging
+# Default Ki logging
log4j.logger.org.ki=TRACE
# Disable verbose logging
Modified: incubator/jsecurity/trunk/samples/web/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/src/main/resources/log4j.properties?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/src/main/resources/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/web/src/main/resources/log4j.properties Thu Mar 26 00:19:03 2009
@@ -39,7 +39,7 @@
# =============================================================================
# Apache Ki
# =============================================================================
-# Apache Ki security framework
+# Ki security framework
log4j.logger.org.apache.ki.realm.text.PropertiesRealm=INFO
log4j.logger.org.apache.ki.cache.ehcache.EhCache=INFO
log4j.logger.org.apache.ki.io=INFO
Modified: incubator/jsecurity/trunk/samples/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/src/main/webapp/WEB-INF/web.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/web/src/main/webapp/WEB-INF/web.xml Thu Mar 26 00:19:03 2009
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<filter>
- <filter-name>Apache KiFilter</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>
- # The Apache KiFilter configuration is very powerful and flexible, while still remaining succinct.
+ # The KiFilter configuration is very powerful and flexible, while still remaining succinct.
# Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
#
# http://ki.apache.org/api/org/apache/ki/web/servlet/KiFilter.html
@@ -56,7 +56,7 @@
</filter>
<filter-mapping>
- <filter-name>Apache KiFilter</filter-name>
+ <filter-name>KiFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
Modified: incubator/jsecurity/trunk/samples/web/src/main/webapp/logout.jsp
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/src/main/webapp/logout.jsp?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/src/main/webapp/logout.jsp (original)
+++ incubator/jsecurity/trunk/samples/web/src/main/webapp/logout.jsp Thu Mar 26 00:19:03 2009
@@ -30,7 +30,7 @@
When a user logs out, any 'rememberMe' identity
should always be cleared. In a web application,
- Apache Ki uses a Cipher-encrypted Cookie to
+ Ki uses a Cipher-encrypted Cookie to
remember a user's identity by default, and it will
automatically delete the Cookie upon a logout.
Modified: incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java Thu Mar 26 00:19:03 2009
@@ -32,7 +32,7 @@
import org.apache.ki.cache.CacheException;
/**
- * Apache Ki {@link org.apache.ki.cache.Cache} implementation that wraps an {@link net.sf.ehcache.Ehcache} instance.
+ * Ki {@link org.apache.ki.cache.Cache} implementation that wraps an {@link net.sf.ehcache.Ehcache} instance.
*
* @author Jeremy Haile
* @author Les Hazlewood
@@ -52,7 +52,7 @@
/**
* Constructs a new EhCache instance with the given cache.
*
- * @param cache - delegate EhCache instance this Apache Ki cache instance will wrap.
+ * @param cache - delegate EhCache instance this Ki cache instance will wrap.
*/
public EhCache(net.sf.ehcache.Cache cache) {
if (cache == null) {
Modified: incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java Thu Mar 26 00:19:03 2009
@@ -33,12 +33,12 @@
import org.apache.ki.util.Initializable;
/**
- * Apache Ki <code>CacheManager</code> implementation utilizing the Ehcache framework for all cache functionality.
+ * Ki <code>CacheManager</code> implementation utilizing the Ehcache framework for all cache functionality.
* <p/>
* This class can {@link #setCacheManager(net.sf.ehcache.CacheManager) accept} a manually configured
* {@link net.sf.ehcache.CacheManager net.sf.ehcache.CacheManager} instance,
* or an <code>ehcache.xml</code> path location can be specified instead and one will be constructed. If neither are
- * specified, Apache Ki's failsafe <code><a href="./ehcache.xml">ehcache.xml</a></code> file will be used by default.
+ * specified, Ki's failsafe <code><a href="./ehcache.xml">ehcache.xml</a></code> file will be used by default.
*
* <p>This implementation requires EhCache 1.2 and above. Make sure EhCache 1.1 or earlier
* is not in the classpath or it will not work.</p>
@@ -178,7 +178,7 @@
}
if (name.equals(DEFAULT_ACTIVE_SESSIONS_CACHE_NAME)) {
if (log.isInfoEnabled()) {
- log.info("Creating " + DEFAULT_ACTIVE_SESSIONS_CACHE_NAME + " cache with default Apache Ki " +
+ log.info("Creating " + DEFAULT_ACTIVE_SESSIONS_CACHE_NAME + " cache with default Ki " +
"session cache settings.");
}
cache = buildDefaultActiveSessionsCache();
@@ -204,10 +204,10 @@
}
/**
- * Builds the default cache instance to use for Apache Ki's Session Cache when enterprise Sessions are
+ * Builds the default cache instance to use for Ki's Session Cache when enterprise Sessions are
* enabled.
*
- * @return the default cache instance to use for Apache Ki's Session Cache when enterprise Sessions are
+ * @return the default cache instance to use for Ki's Session Cache when enterprise Sessions are
* enabled.
* @throws CacheException if there is a problem constructing the Cache instance.
*/
@@ -233,8 +233,8 @@
* Ehcache will look for an <tt>ehcache.xml</tt> file at the root of the classpath. If one is not found,
* Ehcache will use its own failsafe configuration file.</p>
*
- * <p>Because Apache Ki cannot use the failsafe defaults (failsafe expunges cached objects after 2 minutes,
- * something not desireable for Apache Ki sessions), this class manages an internal default configuration for
+ * <p>Because Ki cannot use the failsafe defaults (failsafe expunges cached objects after 2 minutes,
+ * something not desireable for Ki sessions), this class manages an internal default configuration for
* this case.</p>
*
* @throws org.apache.ki.cache.CacheException
Modified: incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/package-info.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/package-info.java Thu Mar 26 00:19:03 2009
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- * <a href="http://ehcache.sourceforge.net" target="_top">Ehcache</a>-based implementations of Apache Ki's
+ * <a href="http://ehcache.sourceforge.net" target="_top">Ehcache</a>-based implementations of Ki's
* cache interfaces.
*/
package org.apache.ki.cache.ehcache;
Modified: incubator/jsecurity/trunk/support/ehcache/src/main/resources/org/apache/ki/cache/ehcache/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/main/resources/org/apache/ki/cache/ehcache/ehcache.xml?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/main/resources/org/apache/ki/cache/ehcache/ehcache.xml (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/main/resources/org/apache/ki/cache/ehcache/ehcache.xml Thu Mar 26 00:19:03 2009
@@ -72,10 +72,10 @@
diskExpiryThreadIntervalSeconds="120"
/>
- <!-- We want eternal="true" (with no timeToIdle or timeToLive settings) because Apache Ki manages session
+ <!-- We want eternal="true" (with no timeToIdle or timeToLive settings) because Ki manages session
expirations explicitly. If we set it to false and then set corresponding timeToIdle and timeToLive properties,
-ehcache would evict sessions without Apache Ki's knowledge, which would cause many problems
-(e.g. "My Apache Ki session timeout is 30 minutes - why isn't a session available after 2 minutes?"
+ehcache would evict sessions without Ki's knowledge, which would cause many problems
+(e.g. "My Ki session timeout is 30 minutes - why isn't a session available after 2 minutes?"
Answer - ehcache expired it due to the timeToIdle property set to 120 seconds.)
diskPersistent=true since we want an enterprise session management feature - ability to use sessions after