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:20:38 UTC
svn commit: r752385 - in /incubator/jsecurity/trunk: core/src/org/apache/ki/
core/src/org/apache/ki/authc/ core/src/org/apache/ki/authz/
core/src/org/apache/ki/authz/permission/ core/src/org/apache/ki/cache/
core/src/org/apache/ki/codec/ core/src/org/a...
Author: adc
Date: Wed Mar 11 06:20:37 2009
New Revision: 752385
URL: http://svn.apache.org/viewvc?rev=752385&view=rev
Log:
KI-66 intermediate changes
Added:
incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java (contents, props changed)
- copied, changed from r752382, incubator/jsecurity/trunk/core/src/org/apache/ki/JSecurityException.java
Removed:
incubator/jsecurity/trunk/core/src/org/apache/ki/JSecurityException.java
Modified:
incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java
incubator/jsecurity/trunk/core/src/org/apache/ki/config/TextConfiguration.java
incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java
incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java
incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java
incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java (from r752382, incubator/jsecurity/trunk/core/src/org/apache/ki/JSecurityException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java&p1=incubator/jsecurity/trunk/core/src/org/apache/ki/JSecurityException.java&r1=752382&r2=752385&rev=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/JSecurityException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java Wed Mar 11 06:20:37 2009
@@ -29,12 +29,12 @@
* @author Les Hazlewood
* @since 0.1
*/
-public class JSecurityException extends RuntimeException implements Serializable {
+public class KiException extends RuntimeException implements Serializable {
/**
* Creates a new JSecurityException.
*/
- public JSecurityException() {
+ public KiException() {
super();
}
@@ -43,7 +43,7 @@
*
* @param message the reason for the exception
*/
- public JSecurityException(String message) {
+ public KiException(String message) {
super(message);
}
@@ -52,7 +52,7 @@
*
* @param cause the underlying Throwable that caused this exception to be thrown.
*/
- public JSecurityException(Throwable cause) {
+ public KiException(Throwable cause) {
super(cause);
}
@@ -62,7 +62,7 @@
* @param message the reason for the exception
* @param cause the underlying Throwable that caused this exception to be thrown.
*/
- public JSecurityException(String message, Throwable cause) {
+ public KiException(String message, Throwable cause) {
super(message, cause);
}
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.authc;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
@@ -27,7 +27,7 @@
* @author Les Hazlewood
* @since 0.1
*/
-public class AuthenticationException extends JSecurityException {
+public class AuthenticationException extends KiException {
/**
* Creates a new AuthenticationException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.authz;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
@@ -27,7 +27,7 @@
* @author Les Hazlewood
* @since 0.1
*/
-public class AuthorizationException extends JSecurityException {
+public class AuthorizationException extends KiException {
/**
* Creates a new AuthorizationException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.authz.permission;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
@@ -28,7 +28,7 @@
* @author Jeremy Haile
* @since 0.9
*/
-public class InvalidPermissionStringException extends JSecurityException {
+public class InvalidPermissionStringException extends KiException {
private String permissionString;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.cache;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
@@ -28,7 +28,7 @@
* @author Les Hazlewood
* @since 0.2
*/
-public class CacheException extends JSecurityException {
+public class CacheException extends KiException {
/**
* Creates a new <code>CacheException</code>.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.codec;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
* Root exception related to issues during encoding or decoding.
@@ -26,7 +26,7 @@
* @author Les Hazlewood
* @since 0.9
*/
-public class CodecException extends JSecurityException {
+public class CodecException extends KiException {
/**
* Creates a new <code>CodecException</code>.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.config;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
* Root exception indicating there was a problem parsing or processing the JSecurity configuration.
@@ -26,7 +26,7 @@
* @author Les Hazlewood
* @since 0.9
*/
-public class ConfigurationException extends JSecurityException {
+public class ConfigurationException extends KiException {
/**
* Creates a new ConfigurationException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java Wed Mar 11 06:20:37 2009
@@ -30,7 +30,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
import org.apache.ki.io.IniResource;
import org.apache.ki.io.ResourceUtils;
import org.apache.ki.mgt.DefaultSecurityManager;
@@ -88,7 +88,7 @@
this.configUrl = configUrl;
}
- public void init() throws JSecurityException {
+ public void init() throws KiException {
if (configUrl != null) {
if (ResourceUtils.resourceExists(configUrl)) {
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/TextConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/TextConfiguration.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/TextConfiguration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/TextConfiguration.java Wed Mar 11 06:20:37 2009
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
import org.apache.ki.io.ResourceException;
import org.apache.ki.mgt.SecurityManager;
import org.apache.ki.util.Initializable;
@@ -73,7 +73,7 @@
}
}
- public void init() throws JSecurityException {
+ public void init() throws KiException {
SecurityManager securityManager = getSecurityManager();
if (securityManager == null) {
String config = getConfig();
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,8 @@
*/
package org.apache.ki.io;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
+
/**
* Root exception when a problem occurs acquiring or processing a resource.
@@ -26,7 +27,7 @@
* @author Les Hazlewood
* @since 0.9
*/
-public class ResourceException extends JSecurityException {
+public class ResourceException extends KiException {
/**
* Creates a new ResourceException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,8 @@
*/
package org.apache.ki.io;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
+
/**
* Root exception for problems either serializing or de-serializing data.
@@ -26,7 +27,7 @@
* @author Les Hazlewood
* @since Apr 23, 2008 8:58:22 AM
*/
-public class SerializationException extends JSecurityException {
+public class SerializationException extends KiException {
/**
* Creates a new SerializationException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/package-info.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/package-info.java Wed Mar 11 06:20:37 2009
@@ -19,6 +19,6 @@
/**
* 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.JSecurityException JSecurityException}.
+ * {@link org.apache.ki.KiException JSecurityException}.
*/
package org.ki;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java Wed Mar 11 06:20:37 2009
@@ -31,7 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
import org.apache.ki.cache.CacheManager;
import org.apache.ki.io.ResourceUtils;
import org.apache.ki.util.Destroyable;
@@ -261,7 +261,7 @@
}
} catch (IOException e) {
- throw new JSecurityException("Error reading properties path [" + resourcePath + "]. " +
+ throw new KiException("Error reading properties path [" + resourcePath + "]. " +
"Initializing of the realm from this file failed.", e);
} finally {
ResourceUtils.close(is);
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java Wed Mar 11 06:20:37 2009
@@ -20,7 +20,8 @@
import java.io.Serializable;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
+
/**
* General security exception attributed to problems during interaction with the system during
@@ -29,7 +30,7 @@
* @author Les Hazlewood
* @since 0.1
*/
-public class SessionException extends JSecurityException {
+public class SessionException extends KiException {
private Serializable sessionId;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.subject;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
@@ -27,7 +27,7 @@
* @author Jeremy Haile
* @since 0.1
*/
-public class SubjectException extends JSecurityException {
+public class SubjectException extends KiException {
/**
* Creates a new SubjectException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.util;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
* JSecurity container-agnostic interface that indicates that this object requires initialization.
@@ -33,8 +33,8 @@
/**
* Initializes this object.
*
- * @throws JSecurityException if an exception occurs during initialization.
+ * @throws org.apache.ki.KiException if an exception occurs during initialization.
*/
- void init() throws JSecurityException;
+ void init() throws KiException;
}
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,8 @@
*/
package org.apache.ki.util;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
+
/**
* Runtime exception thrown by the framework when unable to instantiate a Class via reflection.
@@ -26,7 +27,7 @@
* @author Les Hazlewood
* @since 0.2
*/
-public class InstantiationException extends JSecurityException {
+public class InstantiationException extends KiException {
/**
* Creates a new InstantiationException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java Wed Mar 11 06:20:37 2009
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
@@ -35,22 +35,22 @@
private static final Log log = LogFactory.getLog(LifecycleUtils.class);
- public static void init(Object o) throws JSecurityException {
+ public static void init(Object o) throws KiException {
if (o instanceof Initializable) {
init((Initializable) o);
}
}
- public static void init(Initializable initializable) throws JSecurityException {
+ public static void init(Initializable initializable) throws KiException {
initializable.init();
}
/**
* @param c
- * @throws JSecurityException
+ * @throws org.apache.ki.KiException
* @since 0.9
*/
- public static void init(Collection c) throws JSecurityException {
+ public static void init(Collection c) throws KiException {
if (c == null || c.isEmpty()) {
return;
}
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,8 @@
*/
package org.apache.ki.util;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
+
/**
* Exception thrown when attempting to instantiate a Class via reflection, but a suitable constructor (depending
@@ -27,7 +28,7 @@
* @author Les Hazlewood
* @since 0.2
*/
-public class UnavailableConstructorException extends JSecurityException {
+public class UnavailableConstructorException extends KiException {
/**
* Creates a new UnavailableConstructorException.
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java Wed Mar 11 06:20:37 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ki.util;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
/**
@@ -28,7 +28,7 @@
* @author Les Hazlewood
* @since 0.1
*/
-public class UnknownClassException extends JSecurityException {
+public class UnknownClassException extends KiException {
/**
* Creates a new UnknownClassException.
Modified: incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java Wed Mar 11 06:20:37 2009
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ki.realm.Realm;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
import org.apache.ki.mgt.SecurityManager;
@@ -91,7 +91,7 @@
}
@Override
- public void init() throws JSecurityException {
+ public void init() throws KiException {
String beanName = getFilterConfig().getInitParameter(SECURITY_MANAGER_BEAN_NAME_PARAM_NAME);
if (beanName != null) {
setSecurityManagerBeanName(beanName);
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java?rev=752385&r1=752384&r2=752385&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java Wed Mar 11 06:20:37 2009
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ki.JSecurityException;
+import org.apache.ki.KiException;
import org.apache.ki.util.ClassUtils;
import javax.servlet.ServletRequest;
@@ -147,7 +147,7 @@
return (T) stringValue;
} catch (Exception e) {
String msg = "If the type is not String, you must specify the 'editorClass' property.";
- throw new JSecurityException(msg, e);
+ throw new KiException(msg, e);
}
} else {
PropertyEditor editor = (PropertyEditor) ClassUtils.newInstance(getEditorClass());
@@ -157,7 +157,7 @@
return (T) value;
} catch (ClassCastException e) {
String msg = "Returned value from PropertyEditor does not match the specified type.";
- throw new JSecurityException(msg, e);
+ throw new KiException(msg, e);
}
}
}