KI-66 intermediate changes
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@752550 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 53b2c9e..6f05c31 100644
--- a/build.xml
+++ b/build.xml
@@ -231,16 +231,16 @@
</bottom>
<classpath refid="all.libs"/>
<!-- <packageset dir="${base.dir}/core/src">
- <include name="org/ki/**"/>
+ <include name="org/apache/ki/**"/>
</packageset>
<packageset dir="${root.base.dir}/support/ehcache/src">
- <include name="org/ki/**"/>
+ <include name="org/apache/ki/**"/>
</packageset>
<packageset dir="${root.base.dir}/support/spring/src">
- <include name="org/ki/**"/>
+ <include name="org/apache/ki/**"/>
</packageset>
<packageset dir="${root.base.dir}/support/quartz/src">
- <include name="org/ki/**"/>
+ <include name="org/apache/ki/**"/>
</packageset> -->
<link href="http://java.sun.com/j2se/1.5/docs/api"/>
<link href="http://java.sun.com/j2ee/1.4/docs/api"/>
diff --git a/changes.txt b/changes.txt
index 1ecee70..3b5f81f 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,8 +1,8 @@
[0.9 Final]
-* org.ki.spring.SpringWebConfiguration renamed to org.apache.ki.spring.SpringIniWebConfiguration
+* org.apache.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.apache.ki.web.servlet.ProxiedFilterChain to maintain parallel naming conventions with ProxiedSession.
+* org.apache.ki.web.servlet.FilterChainWrapper renamed to org.apache.ki.web.servlet.ProxiedFilterChain to maintain parallel naming conventions with ProxiedSession.
* org.apache.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).
* Added *AnnotationHandler implementations and refactored the AuthorizingAnnotationMethodInterceptor implementations
to delegate to internal AnnotationHandler instances for performing authorization checks based on annotations. This was
diff --git a/ivy.xml b/ivy.xml
index 7883546..378a9d2 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -20,7 +20,7 @@
<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
- <info organisation="org.ki" module="ki" revision="0.9.0" status="snapshot"
+ <info organisation="org.apache.ki" module="ki" revision="0.9.0" status="snapshot"
publication="20080814234001">
<license name="Apache License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.html"/>
<ivyauthor name="Les Hazlewood" url="http://www.leshazlewood.com"/>
@@ -87,7 +87,7 @@
<dependency org="org.easymock" name="easymockclassextension" rev="2.3" transitive="false" conf="test"/>
<dependency org="junit" name="junit" rev="4.4" transitive="false" conf="test"/>
- <dependency org="org.ki" name="docbook-libs" rev="1.0.0" transitive="false" conf="docbook">
+ <dependency org="org.jsecurity" name="docbook-libs" rev="1.0.0" transitive="false" conf="docbook">
<artifact name="docbook-libs" type="zip" ext="zip"/>
</dependency>
diff --git a/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java b/support/spring/test/org/ki/spring/SpringKiFilterTest.java
similarity index 98%
rename from support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
rename to support/spring/test/org/ki/spring/SpringKiFilterTest.java
index e393208..ca59399 100644
--- a/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
+++ b/support/spring/test/org/ki/spring/SpringKiFilterTest.java
@@ -37,7 +37,7 @@
* @author Les Hazlewood
* @since Jul 28, 2008 1:34:33 PM
*/
-public class SpringJSecurityFilterTest {
+public class SpringKiFilterTest {
@Test
public void testDefaultConfig() throws Exception {
