You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2009/03/11 07:46:00 UTC
svn commit: r752391 - in /incubator/jsecurity/trunk: ./
samples/spring-hibernate/web/WEB-INF/ samples/spring/etc/
samples/spring/webroot/WEB-INF/
support/ehcache/src/org/apache/ki/cache/ehcache/
support/quartz/src/org/apache/ki/session/mgt/quartz/ supp...
Author: adc
Date: Wed Mar 11 06:45:58 2009
New Revision: 752391
URL: http://svn.apache.org/viewvc?rev=752391&view=rev
Log:
KI-66 intermediate changes
Added:
incubator/jsecurity/trunk/support/spring/src/org/apache/
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java
- copied, changed from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java
- copied, changed from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java
- copied, changed from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringJSecurityFilter.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/package-info.java
- copied unchanged from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/package-info.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java (contents, props changed)
- copied, changed from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java (contents, props changed)
- copied, changed from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/package-info.java
- copied unchanged from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/package-info.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
- copied, changed from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java (contents, props changed)
- copied, changed from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
- copied unchanged from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/package-info.java
Removed:
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringJSecurityFilter.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/package-info.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/package-info.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/package-info.java
Modified:
incubator/jsecurity/trunk/changes.txt
incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml
incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/sprhib-servlet.xml
incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml
incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml
incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml
incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/web.xml
incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java
incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java
incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java
incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java
incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
Modified: incubator/jsecurity/trunk/changes.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/changes.txt?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/changes.txt (original)
+++ incubator/jsecurity/trunk/changes.txt Wed Mar 11 06:45:58 2009
@@ -1,6 +1,6 @@
[0.9 Final]
-* org.ki.spring.SpringWebConfiguration renamed to org.ki.spring.SpringIniWebConfiguration
+* org.ki.spring.SpringWebConfiguration renamed to org.apache.ki.spring.SpringIniWebConfiguration
* org.apache.ki.util.ThreadContext fixed to correctly work in child/spawned threads from a parent thread (sometimes surfaced in Tomcat environments)
* org.ki.web.servlet.FilterChainWrapper renamed to org.ki.web.servlet.ProxiedFilterChain to maintain parallel naming conventions with ProxiedSession.
* org.ki.web.attr.CookieAttribute#onRetrieveValue would return deleted cookies (maxAge of 0) on Tomcat. It now only returns a value if the cookie is non null and maxAge != 0 (-1 or positive only).
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml Wed Mar 11 06:45:58 2009
@@ -99,6 +99,6 @@
<!-- Post processor that automatically invokes init() and destroy() methods -->
- <bean id="lifecycleBeanPostProcessor" class="org.ki.spring.LifecycleBeanPostProcessor"/>
+ <bean id="lifecycleBeanPostProcessor" class="org.apache.ki.spring.LifecycleBeanPostProcessor"/>
</beans>
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/sprhib-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/sprhib-servlet.xml?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/sprhib-servlet.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/sprhib-servlet.xml Wed Mar 11 06:45:58 2009
@@ -33,7 +33,7 @@
<!-- Required for security annotations to work in this servlet -->
<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
- <bean class="org.ki.spring.security.interceptor.AuthorizationAttributeSourceAdvisor"/>
+ <bean class="org.apache.ki.spring.security.interceptor.AuthorizationAttributeSourceAdvisor"/>
<!-- Enable annotation-based controllers using @Controller annotations -->
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml Wed Mar 11 06:45:58 2009
@@ -61,7 +61,7 @@
<filter>
<filter-name>JSecurityFilter</filter-name>
- <filter-class>org.ki.spring.SpringJSecurityFilter</filter-class>
+ <filter-class>org.apache.ki.spring.SpringJSecurityFilter</filter-class>
<init-param>
<param-name>config</param-name>
<param-value>
Modified: incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml Wed Mar 11 06:45:58 2009
@@ -37,6 +37,6 @@
</bean>
<bean id="secureRemoteInvocationFactory"
- class="org.ki.spring.remoting.SecureRemoteInvocationFactory"/>
+ class="org.apache.ki.spring.remoting.SecureRemoteInvocationFactory"/>
</beans>
Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml Wed Mar 11 06:45:58 2009
@@ -72,19 +72,19 @@
definition and
2) even know which JSecurity objects require these methods to be
called. -->
- <bean id="lifecycleBeanPostProcessor" class="org.ki.spring.LifecycleBeanPostProcessor"/>
+ <bean id="lifecycleBeanPostProcessor" class="org.apache.ki.spring.LifecycleBeanPostProcessor"/>
<!-- Enable JSecurity Annotations for Spring-configured beans. Only run after
the lifecycleBeanProcessor has run: -->
<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"
depends-on="lifecycleBeanPostProcessor"/>
- <bean class="org.ki.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
+ <bean class="org.apache.ki.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
<property name="securityManager" ref="securityManager"/>
</bean>
<!-- Secure Spring remoting: Ensure any Spring Remoting method invocations can be associated
with a Subject for security checks. -->
- <bean id="secureRemoteInvocationExecutor" class="org.ki.spring.remoting.SecureRemoteInvocationExecutor">
+ <bean id="secureRemoteInvocationExecutor" class="org.apache.ki.spring.remoting.SecureRemoteInvocationExecutor">
<property name="securityManager" ref="securityManager"/>
</bean>
Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/web.xml?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/web.xml Wed Mar 11 06:45:58 2009
@@ -57,7 +57,7 @@
================================================================== -->
<filter>
<filter-name>JSecurityFilter</filter-name>
- <filter-class>org.ki.spring.SpringJSecurityFilter</filter-class>
+ <filter-class>org.apache.ki.spring.SpringJSecurityFilter</filter-class>
<init-param>
<param-name>config</param-name>
Modified: incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java Wed Mar 11 06:45:58 2009
@@ -18,17 +18,19 @@
*/
package org.apache.ki.cache.ehcache;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
import net.sf.ehcache.Element;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.ki.cache.Cache;
import org.apache.ki.cache.CacheException;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
/**
* JSecurity {@link org.apache.ki.cache.Cache} implementation that wraps an {@link net.sf.ehcache.Ehcache} instance.
*
Modified: incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java Wed Mar 11 06:45:58 2009
@@ -18,22 +18,20 @@
*/
package org.apache.ki.cache.ehcache;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.ki.cache.Cache;
import org.apache.ki.cache.CacheException;
import org.apache.ki.cache.CacheManager;
-import org.apache.ki.cache.ehcache.EhCache;
-
import org.apache.ki.io.ResourceUtils;
import org.apache.ki.session.mgt.eis.CachingSessionDAO;
import org.apache.ki.util.Destroyable;
-
import org.apache.ki.util.Initializable;
-import java.io.IOException;
-import java.io.InputStream;
-
/**
* JSecurity <code>CacheManager</code> implementation utilizing the Ehcache framework for all cache functionality.
* <p/>
Modified: incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java (original)
+++ incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java Wed Mar 11 06:45:58 2009
@@ -18,14 +18,16 @@
*/
package org.apache.ki.session.mgt.quartz;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.session.mgt.ValidatingSessionManager;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.session.mgt.ValidatingSessionManager;
+
/**
* A quartz job that basically just calls the {@link org.apache.ki.session.mgt.ValidatingSessionManager#validateSessions()}
* method on a configured session manager. The session manager will automatically be injected by the
Modified: incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java (original)
+++ incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java Wed Mar 11 06:45:58 2009
@@ -18,18 +18,19 @@
*/
package org.apache.ki.session.mgt.quartz;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.session.mgt.DefaultSessionManager;
-import org.apache.ki.session.mgt.SessionValidationScheduler;
-import org.apache.ki.session.mgt.ValidatingSessionManager;
-
import org.quartz.JobDetail;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
import org.quartz.impl.StdSchedulerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.session.mgt.DefaultSessionManager;
+import org.apache.ki.session.mgt.SessionValidationScheduler;
+import org.apache.ki.session.mgt.ValidatingSessionManager;
+
/**
* An implementation of the {@link org.apache.ki.session.mgt.SessionValidationScheduler SessionValidationScheduler} that uses Quartz to schedule a
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java (from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java&p1=incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java&r1=752389&r2=752391&rev=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java Wed Mar 11 06:45:58 2009
@@ -16,15 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring;
+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;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
/**
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java (from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java&p1=incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java&r1=752389&r2=752391&rev=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java Wed Mar 11 06:45:58 2009
@@ -16,26 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring;
+package org.apache.ki.spring;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.realm.Realm;
-
-import org.apache.ki.KiException;
-
-import org.apache.ki.mgt.SecurityManager;
+import java.util.Collection;
+import java.util.Map;
+import javax.servlet.ServletContext;
import org.ki.web.config.IniWebConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextException;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import javax.servlet.ServletContext;
-import java.util.Collection;
-import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ki.KiException;
import org.apache.ki.mgt.RealmSecurityManager;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.realm.Realm;
/**
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java (from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringJSecurityFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java&p1=incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringJSecurityFilter.java&r1=752389&r2=752391&rev=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringJSecurityFilter.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java Wed Mar 11 06:45:58 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring;
+package org.apache.ki.spring;
import org.ki.web.servlet.JSecurityFilter;
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java (from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java&p1=incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java&r1=752389&r2=752391&rev=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java Wed Mar 11 06:45:58 2009
@@ -16,17 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring.remoting;
+package org.apache.ki.spring.remoting;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+
+import org.springframework.remoting.support.DefaultRemoteInvocationExecutor;
+import org.springframework.remoting.support.RemoteInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.ki.mgt.SecurityManager;
import org.apache.ki.util.ThreadContext;
-import org.springframework.remoting.support.DefaultRemoteInvocationExecutor;
-import org.springframework.remoting.support.RemoteInvocation;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
/**
Propchange: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java (from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java&p1=incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java&r1=752389&r2=752391&rev=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java Wed Mar 11 06:45:58 2009
@@ -16,19 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring.remoting;
+package org.apache.ki.spring.remoting;
+
+import java.io.Serializable;
import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.remoting.support.DefaultRemoteInvocationFactory;
+import org.springframework.remoting.support.RemoteInvocation;
+import org.springframework.remoting.support.RemoteInvocationFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.ki.SecurityUtils;
import org.apache.ki.session.Session;
import org.apache.ki.subject.Subject;
-import org.springframework.remoting.support.DefaultRemoteInvocationFactory;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationFactory;
-
-import java.io.Serializable;
/**
Propchange: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java (from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java&p1=incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java&r1=752389&r2=752391&rev=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java Wed Mar 11 06:45:58 2009
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring.security.interceptor;
+package org.apache.ki.spring.security.interceptor;
+
+import java.lang.reflect.Method;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.ki.authz.aop.AnnotationsAuthorizingMethodInterceptor;
-import java.lang.reflect.Method;
+import org.apache.ki.authz.aop.AnnotationsAuthorizingMethodInterceptor;
/**
* Allows JSecurity Annotations to work in any <a href="http://aopalliance.sourceforge.net/">AOP Alliance</a>
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java (from r752389, incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java&p1=incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java&r1=752389&r2=752391&rev=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java Wed Mar 11 06:45:58 2009
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring.security.interceptor;
+package org.apache.ki.spring.security.interceptor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.lang.reflect.Method;
-import org.apache.ki.mgt.SecurityManager;
import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
import org.springframework.beans.factory.InitializingBean;
-import java.lang.reflect.Method;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ki.authz.annotation.RequiresAuthentication;
import org.apache.ki.authz.annotation.RequiresGuest;
import org.apache.ki.authz.annotation.RequiresPermissions;
import org.apache.ki.authz.annotation.RequiresRoles;
import org.apache.ki.authz.annotation.RequiresUser;
+import org.apache.ki.mgt.SecurityManager;
/**
Propchange: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java?rev=752391&r1=752390&r2=752391&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java (original)
+++ incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java Wed Mar 11 06:45:58 2009
@@ -18,16 +18,19 @@
*/
package org.ki.spring;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+
import static org.easymock.EasyMock.*;
-import org.apache.ki.mgt.SecurityManager;
-import org.ki.web.servlet.JSecurityFilter;
import org.junit.Test;
+import org.ki.web.servlet.JSecurityFilter;
import org.springframework.web.context.WebApplicationContext;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.spring.SpringIniWebConfiguration;
+import org.apache.ki.spring.SpringJSecurityFilter;
/**