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 [4/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/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java Thu Mar 26 00:19:03 2009
@@ -1,106 +1,106 @@
-/*
- * 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.
- */
-package org.apache.ki.spring;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.ki.util.Destroyable;
-import org.apache.ki.util.Initializable;
-
-
-/**
- * <p>Bean post processor for Spring that automatically calls the <tt>init()</tt> and/or
- * <tt>destroy()</tt> methods on Apache Ki objects that implement the {@link org.apache.ki.util.Initializable}
- * or {@link org.apache.ki.util.Destroyable} interfaces, respectfully. This post processor makes it easier
- * to configure Apache Ki beans in Spring, since the user never has to worry about whether or not if they
- * have to specify init-method and destroy-method bean attributes.</p>
- *
- * <p><b>Warning: This post processor has no way to determine if <tt>init()</tt> or <tt>destroy()</tt> have
- * already been called, so if you define this post processor in your applicationContext, do not also call these
- * methods manually or via Spring's <tt>init-method</tt> or <tt>destroy-method</tt> bean attributes.</b></p>
- *
- * @author Jeremy Haile
- * @since 0.2
- */
-public class LifecycleBeanPostProcessor implements DestructionAwareBeanPostProcessor {
-
- /**
- * Private internal class log instance.
- */
- private static final Log log = LogFactory.getLog(LifecycleBeanPostProcessor.class);
-
- /**
- * Calls the <tt>init()</tt> methods on the bean if it implements {@link org.apache.ki.util.Initializable}
- *
- * @param object the object being initialized.
- * @param name the name of the bean being initialized.
- * @return the initialized bean.
- * @throws BeansException if any exception is thrown during initialization.
- */
- public Object postProcessBeforeInitialization(Object object, String name) throws BeansException {
- if (object instanceof Initializable) {
- try {
- if (log.isDebugEnabled()) {
- log.debug("Initializing bean [" + name + "]...");
- }
-
- ((Initializable) object).init();
- } catch (Exception e) {
- throw new FatalBeanException("Error initializing bean [" + name + "]", e);
- }
- }
- return object;
- }
-
-
- /**
- * Does nothing - merely returns the object argument immediately.
- */
- public Object postProcessAfterInitialization(Object object, String name) throws BeansException {
- // Does nothing after initialization
- return object;
- }
-
-
- /**
- * Calls the <tt>destroy()</tt> methods on the bean if it implements {@link org.apache.ki.util.Destroyable}
- *
- * @param object the object being initialized.
- * @param name the name of the bean being initialized.
- * @throws BeansException if any exception is thrown during initialization.
- */
- public void postProcessBeforeDestruction(Object object, String name) throws BeansException {
- if (object instanceof Destroyable) {
- try {
- if (log.isDebugEnabled()) {
- log.debug("Destroying bean [" + name + "]...");
- }
-
- ((Destroyable) object).destroy();
- } catch (Exception e) {
- throw new FatalBeanException("Error destroying bean [" + name + "]", e);
- }
- }
- }
+/*
+ * 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.
+ */
+package org.apache.ki.spring;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.FatalBeanException;
+import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.util.Destroyable;
+import org.apache.ki.util.Initializable;
+
+
+/**
+ * <p>Bean post processor for Spring that automatically calls the <tt>init()</tt> and/or
+ * <tt>destroy()</tt> methods on Ki objects that implement the {@link org.apache.ki.util.Initializable}
+ * or {@link org.apache.ki.util.Destroyable} interfaces, respectfully. This post processor makes it easier
+ * to configure Ki beans in Spring, since the user never has to worry about whether or not if they
+ * have to specify init-method and destroy-method bean attributes.</p>
+ *
+ * <p><b>Warning: This post processor has no way to determine if <tt>init()</tt> or <tt>destroy()</tt> have
+ * already been called, so if you define this post processor in your applicationContext, do not also call these
+ * methods manually or via Spring's <tt>init-method</tt> or <tt>destroy-method</tt> bean attributes.</b></p>
+ *
+ * @author Jeremy Haile
+ * @since 0.2
+ */
+public class LifecycleBeanPostProcessor implements DestructionAwareBeanPostProcessor {
+
+ /**
+ * Private internal class log instance.
+ */
+ private static final Log log = LogFactory.getLog(LifecycleBeanPostProcessor.class);
+
+ /**
+ * Calls the <tt>init()</tt> methods on the bean if it implements {@link org.apache.ki.util.Initializable}
+ *
+ * @param object the object being initialized.
+ * @param name the name of the bean being initialized.
+ * @return the initialized bean.
+ * @throws BeansException if any exception is thrown during initialization.
+ */
+ public Object postProcessBeforeInitialization(Object object, String name) throws BeansException {
+ if (object instanceof Initializable) {
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug("Initializing bean [" + name + "]...");
+ }
+
+ ((Initializable) object).init();
+ } catch (Exception e) {
+ throw new FatalBeanException("Error initializing bean [" + name + "]", e);
+ }
+ }
+ return object;
+ }
+
+
+ /**
+ * Does nothing - merely returns the object argument immediately.
+ */
+ public Object postProcessAfterInitialization(Object object, String name) throws BeansException {
+ // Does nothing after initialization
+ return object;
+ }
+
+
+ /**
+ * Calls the <tt>destroy()</tt> methods on the bean if it implements {@link org.apache.ki.util.Destroyable}
+ *
+ * @param object the object being initialized.
+ * @param name the name of the bean being initialized.
+ * @throws BeansException if any exception is thrown during initialization.
+ */
+ public void postProcessBeforeDestruction(Object object, String name) throws BeansException {
+ if (object instanceof Destroyable) {
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug("Destroying bean [" + name + "]...");
+ }
+
+ ((Destroyable) object).destroy();
+ } catch (Exception e) {
+ throw new FatalBeanException("Error destroying bean [" + name + "]", e);
+ }
+ }
+ }
}
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java Thu Mar 26 00:19:03 2009
@@ -37,18 +37,18 @@
/**
- * <p>Apache Ki configuration that relies on Spring to define and initialize the Apache Ki SecurityManager
- * instance (and all of its dependencies) and makes it available to the Apache KiFilter by performing a Spring bean
+ * <p>Ki configuration that relies on Spring to define and initialize the Ki SecurityManager
+ * instance (and all of its dependencies) and makes it available to the KiFilter by performing a Spring bean
* lookup. The URL/filter definitions are still .ini based and loaded according to the behavior of the parent class
* {@link org.apache.ki.web.config.IniWebConfiguration}</p>
* <p/>
- * That is, this class is offers a hybrid means of configuring Apache Ki in Spring apps deployed in a web container:
+ * That is, this class is offers a hybrid means of configuring Ki in Spring apps deployed in a web container:
* Spring XML config for the SecurityManager and its dependencies (realms, etc), and .ini format for configuring
* the filters and the url chains in web.xml, which many people like to maintain separation of concerns:
* the web/filter/url config stays in web.xml, whereas the SecurityManager config (really a business-tier concern)
* stays in Spring .xml files.
* <p/>
- * The behavior used to acquire the Apache Ki <code>SecurityManager</code> is as follows:
+ * The behavior used to acquire the Ki <code>SecurityManager</code> is as follows:
* <ol>
* <li>If a 'securityManagerBeanName' init-param is set, retrieve that sec manager from Spring.</li>
* <li>If not, look for beans of type {@link SecurityManager} - if there is one instance, use that.
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringKiFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringKiFilter.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringKiFilter.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringKiFilter.java Thu Mar 26 00:19:03 2009
@@ -22,7 +22,7 @@
/**
- * Extension of KiFilter that uses {@link SpringIniWebConfiguration} to configure Apache Ki in a Spring web
+ * Extension of KiFilter that uses {@link SpringIniWebConfiguration} to configure Ki in a Spring web
* environment.
* <p/>
* Using this class in web.xml essentially enables the following:
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/package-info.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,23 +1,23 @@
-/*
- * 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.
- */
-/**
- * <a href="http://www.springframework.org" target="_top">Spring Application Framework</a> support for enabling
- * Apache Ki in spring applications.
- */
+/*
+ * 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.
+ */
+/**
+ * <a href="http://www.springframework.org" target="_top">Spring Application Framework</a> support for enabling
+ * Ki in spring applications.
+ */
package org.apache.ki.spring;
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java Thu Mar 26 00:19:03 2009
@@ -83,7 +83,7 @@
ThreadContext.bindSessionId(sessionId);
} else {
if (log.isTraceEnabled()) {
- log.trace("RemoteInvocation did not contain a Apache Ki Session id attribute under " +
+ log.trace("RemoteInvocation did not contain a Ki Session id attribute under " +
"key [" + SecureRemoteInvocationFactory.SESSION_ID_KEY + "]. A Subject based " +
"on an existing Session will not be available during the method invocatin.");
}
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java Thu Mar 26 00:19:03 2009
@@ -37,7 +37,7 @@
* A {@link RemoteInvocationFactory} that passes the session ID to the server via a
* {@link RemoteInvocation} {@link RemoteInvocation#getAttribute(String) attribute}.
* This factory is the client-side part of
- * the Apache Ki Spring remoting invocation. A {@link SecureRemoteInvocationExecutor} should
+ * the Ki Spring remoting invocation. A {@link SecureRemoteInvocationExecutor} should
* be used to export the server-side remote services to ensure that the appropriate
* Subject and Session are bound to the remote thread during execution.
*
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/package-info.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,23 +1,23 @@
-/*
- * 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 to enable Spring-based remote method invocations to carry a Apache Ki session ID as part of the
- * invocation payload, allowing remote clients to perform security operations.
- */
+/*
+ * 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 to enable Spring-based remote method invocations to carry a Ki session ID as part of the
+ * invocation payload, allowing remote clients to perform security operations.
+ */
package org.apache.ki.spring.remoting;
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java Thu Mar 26 00:19:03 2009
@@ -26,7 +26,7 @@
import org.apache.ki.authz.aop.AnnotationsAuthorizingMethodInterceptor;
/**
- * Allows Apache Ki Annotations to work in any <a href="http://aopalliance.sourceforge.net/">AOP Alliance</a>
+ * Allows Ki Annotations to work in any <a href="http://aopalliance.sourceforge.net/">AOP Alliance</a>
* specific implementation environment (for example, Spring).
*
* @author Les Hazlewood
@@ -38,11 +38,11 @@
/**
* Creates a {@link MethodInvocation MethodInvocation} that wraps an
* {@link org.aopalliance.intercept.MethodInvocation org.aopalliance.intercept.MethodInvocation} instance,
- * enabling Apache Ki Annotations in <a href="http://aopalliance.sourceforge.net/">AOP Alliance</a> environments
+ * enabling Ki Annotations in <a href="http://aopalliance.sourceforge.net/">AOP Alliance</a> environments
* (Spring, etc).
*
* @param implSpecificMethodInvocation AOP Alliance {@link org.aopalliance.intercept.MethodInvocation MethodInvocation}
- * @return a Apache Ki {@link MethodInvocation MethodInvocation} instance that wraps the AOP Alliance instance.
+ * @return a Ki {@link MethodInvocation MethodInvocation} instance that wraps the AOP Alliance instance.
*/
protected org.apache.ki.aop.MethodInvocation createMethodInvocation(Object implSpecificMethodInvocation) {
final MethodInvocation mi = (MethodInvocation) implSpecificMethodInvocation;
@@ -80,7 +80,7 @@
}
/**
- * Creates a Apache Ki {@link MethodInvocation MethodInvocation} instance and then immediately calls
+ * Creates a Ki {@link MethodInvocation MethodInvocation} instance and then immediately calls
* {@link org.apache.ki.authz.aop.AuthorizingMethodInterceptor#invoke super.invoke}.
*
* @param methodInvocation the AOP Alliance-specific <code>methodInvocation</code> instance.
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java Thu Mar 26 00:19:03 2009
@@ -61,7 +61,7 @@
}
/**
- * Returns <tt>true</tt> if the method has any Apache Ki annotations, false otherwise.
+ * Returns <tt>true</tt> if the method has any Ki annotations, false otherwise.
* The annotations inspected are:
* <ul>
* <li>{@link org.apache.ki.authz.annotation.RequiresAuthentication RequiresAuthentication}</li>
@@ -71,9 +71,9 @@
* <li>{@link org.apache.ki.authz.annotation.RequiresPermissions RequiresPermissions}</li>
* </ul>
*
- * @param method the method to check for a Apache Ki annotation
- * @param targetClass the class potentially declaring Apache Ki annotations
- * @return <tt>true</tt> if the method has a Apache Ki annotation, false otherwise.
+ * @param method the method to check for a Ki annotation
+ * @param targetClass the class potentially declaring Ki annotations
+ * @return <tt>true</tt> if the method has a Ki annotation, false otherwise.
* @see org.springframework.aop.MethodMatcher#matches(java.lang.reflect.Method, Class)
*/
public boolean matches(Method method, Class targetClass) {
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/package-info.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,22 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * Spring AOP support for enabling Apache Ki annotations in Spring-configured applications.
- */
+/*
+ * 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.
+ */
+/**
+ * Spring AOP support for enabling Ki annotations in Spring-configured applications.
+ */
package org.apache.ki.spring.security.interceptor;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java Thu Mar 26 00:19:03 2009
@@ -75,7 +75,7 @@
attr.setCheckRequestParams(false);
//Peter (Apache Ki developer) said that Jetty didn't like the CookieAttribute.INDEFINITE value
// (Tomcat was ok with it), so just default to a few years for now. If anyone doesn't visit a site in 3 years
- // after last login, I doubt any Apache Ki users would mind their end-users to be forced to log in. - LAH.
+ // after last login, I doubt any Ki users would mind their end-users to be forced to log in. - LAH.
attr.setMaxAge(CookieAttribute.ONE_YEAR * 3);
this.identityAttribute = attr;
}
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java Thu Mar 26 00:19:03 2009
@@ -61,7 +61,7 @@
* Message displayed when a servlet request or response is not bound to the current thread context when expected.
*/
private static final String NOT_BOUND_ERROR_MESSAGE =
- "Make sure WebUtils.bind() is being called. (typically called by Apache KiFilter) " +
+ "Make sure WebUtils.bind() is being called. (typically called by KiFilter) " +
"This could also happen when running integration tests that don't properly call WebUtils.bind().";
public static final String SERVLET_REQUEST_KEY = ServletRequest.class.getName() + "_KI_THREAD_CONTEXT_KEY";
@@ -319,7 +319,7 @@
* {@link #getRequiredServletRequest() getRequiredServletRequest()} method always assumes a
* servlet-only environment.
* <p/>
- * <b>THIS IS NOT PART OF APACHE KI'S PUBLIC API.</b> It exists for Apache Ki implementation requirements only.
+ * <b>THIS IS NOT PART OF APACHE KI'S PUBLIC API.</b> It exists for Ki implementation requirements only.
*
* @return the current thread-bound {@code ServletRequest} or {@code null} if there is not one bound.
* @since 1.0
@@ -405,7 +405,7 @@
* {@link #getRequiredServletResponse() getRequiredServletResponse()} method always assumes a
* servlet-only environment.
* <p/>
- * <b>THIS IS NOT PART OF APACHE KI'S PUBLIC API.</b> It exists for Apache Ki implementation requirements only.
+ * <b>THIS IS NOT PART OF APACHE KI'S PUBLIC API.</b> It exists for Ki implementation requirements only.
*
* @return the current thread-bound {@code ServletResponse} or {@code null} if there is not one bound.
* @since 1.0
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,23 +1,23 @@
-/*
- * 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.
- */
-/**
- * Supporting implementation of Apache Ki's concept of a {@link org.apache.ki.web.attr.WebAttribute WebAttribute}, a
- * component that can save and recall an object beyond transient requests.
- */
+/*
+ * 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.
+ */
+/**
+ * Supporting implementation of Ki's concept of a {@link org.apache.ki.web.attr.WebAttribute WebAttribute}, a
+ * component that can save and recall an object beyond transient requests.
+ */
package org.apache.ki.web.attr;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java Thu Mar 26 00:19:03 2009
@@ -221,13 +221,13 @@
/**
* Creates a new, uninitialized <code>SecurityManager</code> instance that will be used to build up
- * the Apache Ki environment for the web application.
+ * the Ki environment for the web application.
* <p/>
* The default implementation simply returns
* <code>new {@link org.apache.ki.web.DefaultWebSecurityManager DefaultWebSecurityManager()};</code>
*
* @return a new, uninitialized <code>SecurityManager</code> instance that will be used to build up
- * the Apache Ki environment for the web application.
+ * the Ki environment for the web application.
*/
protected RealmSecurityManager newSecurityManagerInstance() {
return new DefaultWebSecurityManager();
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/WebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/WebConfiguration.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/WebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/WebConfiguration.java Thu Mar 26 00:19:03 2009
@@ -26,7 +26,7 @@
import org.apache.ki.config.Configuration;
/**
- * A <code>WebConfiguration</code> configures Apache Ki components in a web-enabled application.
+ * A <code>WebConfiguration</code> configures Ki components in a web-enabled application.
* <p/>
* In addition to enabling configuration of a <code>SecurityManager</code>, as required by the parent interface,
* it also allows configuration of arbitrary filter chains to be executed for any given request or URI/URL.
@@ -50,7 +50,7 @@
*
* @param request the incoming ServletRequest
* @param response the outgoing ServletResponse
- * @param originalChain the original <code>FilterChain</code> intercepted by the Apache KiFilter.
+ * @param originalChain the original <code>FilterChain</code> intercepted by the KiFilter.
* @return the filter chain that should be executed for the given request, or <code>null</code> if the
* original chain should be used.
*/
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/AccessControlFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/AccessControlFilter.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/AccessControlFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/AccessControlFilter.java Thu Mar 26 00:19:03 2009
@@ -62,7 +62,7 @@
/**
* Returns the login URL used to authenticate a user.
* <p/>
- * Most Apache Ki filters use this url
+ * Most Ki filters use this url
* as the location to redirect a user when the filter requires authentication. Unless overridden, the
* {@link #DEFAULT_LOGIN_URL DEFAULT_LOGIN_URL} is assumed, which can be overridden via
* {@link #setLoginUrl(String) setLoginUrl}.
@@ -76,7 +76,7 @@
/**
* Sets the login URL used to authenticate a user.
* <p/>
- * Most Apache Ki filters use this url as the location to redirect a user when the filter requires
+ * Most Ki filters use this url as the location to redirect a user when the filter requires
* authentication. Unless overridden, the {@link #DEFAULT_LOGIN_URL DEFAULT_LOGIN_URL} is assumed.
*
* @param loginUrl the login URL used to authenticate a user, used when redirecting users if authentication is required.
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/AnonymousFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/AnonymousFilter.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/AnonymousFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/AnonymousFilter.java Thu Mar 26 00:19:03 2009
@@ -32,7 +32,7 @@
* For example, if you had a user-only section of a website, you might want to require that access to
* any url in that section must be from an authenticated user.
* <p/>
- * Here is how that would look in the Apache KiFilter configuration:
+ * Here is how that would look in the KiFilter configuration:
* <p/>
* <code>[urls]<br/>
* /user/** = authc</code>
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java Thu Mar 26 00:19:03 2009
@@ -123,7 +123,7 @@
* <p/>
* Side note: As you can see from the header text, the HTTP Basic specification calls
* this the authentication 'realm', but we call this the 'applicationName' instead to avoid confusion with
- * Apache Ki's Realm constructs.
+ * Ki's Realm constructs.
*
* @param applicationName the name to use in the ServletResponse's 'WWW-Authenticate' header.
*/
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java Thu Mar 26 00:19:03 2009
@@ -47,7 +47,7 @@
/**
- * Main ServletFilter that configures and enables all Apache Ki functions within a web application.
+ * Main ServletFilter that configures and enables all Ki functions within a web application.
* <p/>
* The following is a fully commented example that documents how to configure it:
* <p/>
@@ -60,16 +60,16 @@
* # Everything else is just heavily commented to explain things in-depth. Feel free to delete any
* # comments that you don't want to read from your own configuration ;)
* #
- * # Any commented values below are Apache Ki's defaults. If you want to change any values, you only
+ * # Any commented values below are Ki's defaults. If you want to change any values, you only
* # need to uncomment the lines you want to change.
* <p/>
* [main]
- * # The 'main' section defines Apache Ki-wide configuration.
+ * # The 'main' section defines Ki-wide configuration.
* #
- * # Session Mode: By default, Apache Ki's Session infrastructure in a web environment will use the
+ * # Session Mode: By default, Ki's Session infrastructure in a web environment will use the
* # Servlet container's HttpSession. However, if you need to share session state across client types
* # (e.g. Web MVC plus Java Web Start or Flash), or are doing distributed/shared Sessions for
- * # Single Sign On, HttpSessions aren't good enough. You'll need to use Apache Ki's more powerful
+ * # Single Sign On, HttpSessions aren't good enough. You'll need to use Ki's more powerful
* # (and client-agnostic) session management. You can enable this by uncommenting the following line
* # and changing 'http' to 'ki'
* #
@@ -79,7 +79,7 @@
* [filters]
* # This section defines the 'pool' of all Filters available to the url path definitions in the [urls] section below.
* #
- * # The following commented values are already provided by Apache Ki by default and are immediately usable
+ * # The following commented values are already provided by Ki by default and are immediately usable
* # in the [urls] definitions below. If you like, you may override any values by uncommenting only the lines
* # you need to change.
* #
@@ -384,7 +384,7 @@
if (isHttpSessions() && (request instanceof KiHttpServletRequest) &&
(response instanceof HttpServletResponse)) {
//the KiHttpServletResponse exists to support URL rewriting for session ids. This is only needed if
- //using Apache Ki sessions (i.e. not simple HttpSession based sessions):
+ //using Ki sessions (i.e. not simple HttpSession based sessions):
toUse = wrapServletResponse((HttpServletResponse) response, (KiHttpServletRequest) request);
}
return toUse;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletRequest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletRequest.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletRequest.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletRequest.java Thu Mar 26 00:19:03 2009
@@ -40,7 +40,7 @@
//TODO - complete JavaDoc
- //The following 7 constants support the Apache Ki's implementation of the Servlet Specification
+ //The following 7 constants support the Ki's implementation of the Servlet Specification
public static final String COOKIE_SESSION_ID_SOURCE = "cookie";
public static final String URL_SESSION_ID_SOURCE = "url";
public static final String REFERENCED_SESSION_ID = KiHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID";
@@ -49,7 +49,7 @@
public static final String REFERENCED_SESSION_ID_SOURCE = KiHttpServletRequest.class.getName() + "REFERENCED_SESSION_ID_SOURCE";
public static final String SESSION_ID_NAME = KiHttpSession.DEFAULT_SESSION_ID_NAME;
/**
- * Key that may be used to alert that the request's referenced Apache Ki Session has expired prior to
+ * Key that may be used to alert that the request's referenced Ki Session has expired prior to
* request processing.
*/
public static final String EXPIRED_SESSION_KEY = KiHttpServletRequest.class.getName() + "_EXPIRED_SESSION_KEY";
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletResponse.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletResponse.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletResponse.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletResponse.java Thu Mar 26 00:19:03 2009
@@ -29,15 +29,15 @@
import javax.servlet.http.HttpSession;
/**
- * HttpServletResponse implementation to support URL Encoding of Apache Ki Session IDs.
+ * HttpServletResponse implementation to support URL Encoding of Ki Session IDs.
*
- * It is only used when using Apache Ki's native Session Management configuration (and not when using the Servlet
- * Container session configuration, which is Apache Ki's default in a web environment). Because the servlet container
- * already performs url encoding of its own session ids, instances of this class are only needed when using Apache Ki
+ * It is only used when using Ki's native Session Management configuration (and not when using the Servlet
+ * Container session configuration, which is Ki's default in a web environment). Because the servlet container
+ * already performs url encoding of its own session ids, instances of this class are only needed when using Ki
* native sessions.
*
* <p>Note that this implementation relies in part on source code from the Tomcat 6.x distribution for
- * encoding URLs for session ID URL Rewriting (we didn't want to re-invent the wheel). Since Apache Ki is also
+ * encoding URLs for session ID URL Rewriting (we didn't want to re-invent the wheel). Since Ki is also
* Apache 2.0 license, all regular licenses and conditions have remained in tact.
*
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpSession.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpSession.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpSession.java Thu Mar 26 00:19:03 2009
@@ -37,7 +37,7 @@
/**
- * Wrapper class that uses a Apache Ki session under the hood for all session operations instead of the
+ * Wrapper class that uses a Ki session under the hood for all session operations instead of the
* Servlet Container's session mechanism. This is preferred in heterogeneous client environments where the Session
* is used on both the business tier as well as in multiple client technologies (web, swing, flash, etc).
*
@@ -73,7 +73,7 @@
protected ServletContext servletContext = null;
protected HttpServletRequest currentRequest = null;
- protected Session session = null; //'real' Apache Ki Session
+ protected Session session = null; //'real' Ki Session
public KiHttpSession(Session session, HttpServletRequest currentRequest, ServletContext servletContext) {
if (session instanceof WebSession) {
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java Thu Mar 26 00:19:03 2009
@@ -86,14 +86,14 @@
* <tt>HttpRequest</tt> attempting
* to join a session (i.e. via {@link #getSession getSession} must have the same
* IP Address of the <tt>HttpRequest</tt> that started the session.
- *
+ * <p/>
* <p> If set to <tt>false</tt>, any <tt>HttpRequest</tt> with a reference to a valid
* session id may acquire that <tt>Session</tt>.
- *
+ * <p/>
* <p>Although convenient, this should only be enabled in environments where the
* system can <em>guarantee</em> that each IP address represents one and only one
* machine accessing the system.
- *
+ * <p/>
* <p>Public websites are not good candidates for enabling this
* feature since many browser clients often sit behind NAT routers (in
* which case many machines are viewed to come from the same IP, thereby making this
@@ -101,7 +101,7 @@
* client's IP in mid-session, making subsequent requests appear to come from a different
* location. Again, this feature should only be enabled where IP Addresses can be guaranteed a
* 1-to-1 relationship with a user's session.
- *
+ * <p/>
* <p>For the reasons specified above, this property is <tt>false</tt> by default.
*
* @return true if this factory will verify each HttpRequest joining a session
@@ -156,7 +156,7 @@
}
protected void validateSessionOrigin(ServletRequest request, Session session)
- throws HostUnauthorizedException {
+ throws HostUnauthorizedException {
InetAddress requestIp = WebUtils.getInetAddress(request);
InetAddress originIp = session.getHostAddress();
Serializable sessionId = session.getId();
@@ -164,25 +164,25 @@
if (originIp == null) {
if (requestIp != null) {
String msg = "No IP Address was specified when creating session with id [" +
- sessionId + "]. Attempting to access session from " +
- "IP [" + requestIp + "]. Origin IP and request IP must match.";
+ sessionId + "]. Attempting to access session from " +
+ "IP [" + requestIp + "]. Origin IP and request IP must match.";
throw new HostUnauthorizedException(msg);
}
} else {
if (requestIp != null) {
if (!requestIp.equals(originIp)) {
String msg = "Session with id [" + sessionId + "] originated from [" +
- originIp + "], but the current HttpServletRequest originated " +
- "from [" + requestIp + "]. Disallowing session access: " +
- "session origin and request origin must match to allow access.";
+ originIp + "], but the current HttpServletRequest originated " +
+ "from [" + requestIp + "]. Disallowing session access: " +
+ "session origin and request origin must match to allow access.";
throw new HostUnauthorizedException(msg);
}
} else {
String msg = "No IP Address associated with the current HttpServletRequest. " +
- "Session with id [" + sessionId + "] originated from " +
- "[" + originIp + "]. Request IP must match the session's origin " +
- "IP in order to gain access to that session.";
+ "Session with id [" + sessionId + "] originated from " +
+ "[" + originIp + "]. Request IP must match the session's origin " +
+ "IP in order to gain access to that session.";
throw new HostUnauthorizedException(msg);
}
}
@@ -206,12 +206,12 @@
Serializable id = cookieSessionIdAttribute.retrieveValue(request, response);
if (id != null) {
request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_SOURCE,
- KiHttpServletRequest.COOKIE_SESSION_ID_SOURCE);
+ KiHttpServletRequest.COOKIE_SESSION_ID_SOURCE);
} else {
id = getSessionIdRequestParamAttribute().retrieveValue(request, response);
if (id != null) {
request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_SOURCE,
- KiHttpServletRequest.URL_SESSION_ID_SOURCE);
+ KiHttpServletRequest.URL_SESSION_ID_SOURCE);
}
}
return id;
@@ -255,8 +255,7 @@
* if the caller is not authorized to access the session associated with the request.
*/
public final Session getSession(ServletRequest request, ServletResponse response)
- throws InvalidSessionException, AuthorizationException
- {
+ throws InvalidSessionException, AuthorizationException {
Session session;
try {
@@ -264,7 +263,7 @@
} catch (InvalidSessionException ise) {
if (log.isTraceEnabled()) {
log.trace("Request Session with id [" + ise.getSessionId() + "] is invalid, message: [" +
- ise.getMessage() + "]. Removing any associated session cookie...");
+ ise.getMessage() + "]. Removing any associated session cookie...");
}
getSessionIdCookieAttribute().removeValue(request, response);
@@ -294,8 +293,8 @@
}
} else {
if (log.isTraceEnabled()) {
- log.trace("No Apache Ki session id associated with the given " +
- "HttpServletRequest. A Session will not be returned.");
+ log.trace("No Ki session id associated with the given " +
+ "HttpServletRequest. A Session will not be returned.");
}
}
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/ServletContainerSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/ServletContainerSessionManager.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/ServletContainerSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/ServletContainerSessionManager.java Thu Mar 26 00:19:03 2009
@@ -38,8 +38,8 @@
* Servlet container's HttpSession.
* <p/>
* Despite its name, this implementation <em>does not</em> itself manage Sessions since the Servlet container
- * provides the actual management support. This class mainly exists to 'impersonate' a regular Apache Ki
- * <tt>SessionManager</tt> so it can be pluggable into a normal Apache Ki configuration in a pure web application.
+ * provides the actual management support. This class mainly exists to 'impersonate' a regular Ki
+ * <tt>SessionManager</tt> so it can be pluggable into a normal Ki configuration in a pure web application.
* <p/>
* Note that because this implementation relies on the {@link HttpSession HttpSession}, it is only functional in a
* servlet container. I.e. it is <em>NOT</em> capable of supporting Sessions any clients other than
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/WebSession.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/WebSession.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/WebSession.java Thu Mar 26 00:19:03 2009
@@ -134,7 +134,7 @@
private static String assertString(Object key) {
if (!(key instanceof String)) {
- String msg = "HttpSession based implementations of the Apache Ki Session interface requires attribute keys " +
+ String msg = "HttpSession based implementations of the Ki Session interface requires attribute keys " +
"to be String objects. The HttpSession class does not support anything other than String keys.";
throw new IllegalArgumentException(msg);
}
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,25 +1,25 @@
-/*
- * 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.
- */
-/**
- * Provides the Apache Ki JSP Tag Library implementations.
- * <p/>
- * Apache Ki JSP Tags can be used to evalute or not evaluate (show or not show) parts of a JSP page based on the
- * current user's authentication status and/or authorization (access control) abilities.
- */
+/*
+ * 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.
+ */
+/**
+ * Provides the Ki JSP Tag Library implementations.
+ * <p/>
+ * Ki JSP Tags can be used to evalute or not evaluate (show or not show) parts of a JSP page based on the
+ * current user's authentication status and/or authorization (access control) abilities.
+ */
package org.apache.ki.web.tags;