diff --git a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java b/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java
index 919b0256c2..fd12ffa005 100644
--- a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java
+++ b/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.FileSystemXmlApplicationContext;
import java.io.File;
+import java.io.IOException;
import java.security.Principal;
import java.security.cert.X509Certificate;
@@ -232,8 +233,8 @@ public class CatalinaAcegiUserRealm extends RealmBase {
+ xml.toString());
}
- FileSystemXmlApplicationContext ctx = new FileSystemXmlApplicationContext(xml
- .getAbsolutePath());
+ FileSystemXmlApplicationContext ctx = new FileSystemXmlApplicationContext(
+ "file://" + xml.getAbsolutePath());
Map beans = ctx.getBeansOfType(AuthenticationManager.class, true, true);
if (beans.size() == 0) {
diff --git a/ant.sh b/ant.sh
new file mode 100644
index 0000000000..eeb63fca42
--- /dev/null
+++ b/ant.sh
@@ -0,0 +1 @@
+$JAVA_HOME/bin/java -cp lib/ant/ant.jar:lib/ant/ant-launcher.jar:lib/ant/ant-junit.jar:lib/junit/junit.jar:lib/clover/clover.jar:$JAVA_HOME/lib/tools.jar org.apache.tools.ant.Main $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/integration-test/build.xml b/integration-test/build.xml
index dd2d5befc1..a50efbd160 100644
--- a/integration-test/build.xml
+++ b/integration-test/build.xml
@@ -210,23 +210,23 @@ Tomcat ${tomcat-5.version}: Run: ${jakarta-tomcat-5.run} Errored: ${jakart
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -240,7 +240,7 @@ Tomcat ${tomcat-5.version}: Run: ${jakarta-tomcat-5.run} Errored: ${jakart
-
+
@@ -249,7 +249,7 @@ Tomcat ${tomcat-5.version}: Run: ${jakarta-tomcat-5.run} Errored: ${jakart
-
+
@@ -293,7 +293,7 @@ Tomcat ${tomcat-5.version}: Run: ${jakarta-tomcat-5.run} Errored: ${jakart
-
+
@@ -358,7 +358,7 @@ Tomcat ${tomcat-5.version}: Run: ${jakarta-tomcat-5.run} Errored: ${jakart
-
+
diff --git a/readme.txt b/readme.txt
index db3d9cd534..8c61bfe0a8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -12,6 +12,29 @@ The Spring Framework (http://www.springframework.org).
For a detailed list of features and access to the latest release, please visit
http://acegisecurity.sourceforge.net.
+-------------------------------------------------------------------------------
+ANT HELP
+-------------------------------------------------------------------------------
+
+Acegi Security includes several Apache Ant build.xml files. This eases Clover
+integration and use of JUnit from the command line. We recommend you use the
+provided build.bat or build.sh script (as appropriate to your platform).
+
+With Windows, run the main build file "tests" target like this:
+ ant tests
+
+With Windows, run the Contacts sample "warfile" target like this:
+ ant -buildfile samples\contacts\build.xml warfile
+
+With Linux/Unix, run the main build file "tests" target like this:
+ ./ant.sh tests
+
+With Linux/Unix, run the Contacts sample "warfile" target like this:
+ ./ant.sh -buildfile samples/contacts/build.xml warfile
+
+Each example should be run from the root of the Acegi Security project
+directory.
+
-------------------------------------------------------------------------------
QUICK START
-------------------------------------------------------------------------------
@@ -49,5 +72,8 @@ discussions. You can join at:
https://lists.sourceforge.net/lists/listinfo/acegisecurity-developer.
+Links to mailing list archives and other useful resources are available from
+http://acegisecurity.sourceforge.net.
+
$Id$