Linux compatibility fixes.

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) {

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

integration-test/build.xml

@@ -210,23 +210,23 @@ Tomcat ${tomcat-5.version}:	Run: ${jakarta-tomcat-5.run}	Errored: ${jakart
   		<delete dir="${reports.dir}/jetty-${jetty.version}"/>
 
 		<!-- Execute non-container adapter unit tests in normal environment-->
-		<copy file="${contacts.filter.war}" todir="${tmp.dir}/jetty-${jetty.version}/webapps" overwrite="true"/>
+		<copy file="${contacts.filter.war}" todir="${tmp.dir}/Jetty-${jetty.version}/webapps" overwrite="true"/>
 		<antcallback target="-perform-test-jetty" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
 			<param name="test.includes" value="**/FilterContactsTests.class"/>
 			<param name="wait.for.url" value="http://localhost:8080/contacts"/>
 		</antcallback>
 
 		<!-- Setup container adapter environment and execute unit tests -->
-		<copy file="${config.dir}/jetty-${jetty.version}/jetty.xml" todir="${tmp.dir}/jetty-${jetty.version}/etc" overwrite="true"/>
-		<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jetty-${jetty.version}/etc" overwrite="true"/>
-		<copy file="${dist.lib.dir}/acegi-security-jetty-ext.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/jakarta-commons/commons-logging.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/jakarta-commons/commons-codec.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/burlap.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/hessian.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${contacts.ca.war}" todir="${tmp.dir}/jetty-${jetty.version}/webapps" overwrite="true"/>
+		<copy file="${config.dir}/jetty-${jetty.version}/jetty.xml" todir="${tmp.dir}/Jetty-${jetty.version}/etc" overwrite="true"/>
+		<copy file="${acegisecurity.xml}" todir="${tmp.dir}/Jetty-${jetty.version}/etc" overwrite="true"/>
+		<copy file="${dist.lib.dir}/acegi-security-jetty-ext.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
+		<copy file="${lib.dir}/aopalliance/aopalliance-1.0.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
+		<copy file="${lib.dir}/jakarta-commons/commons-logging.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
+		<copy file="${lib.dir}/jakarta-commons/commons-codec.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
+		<copy file="${lib.dir}/caucho/burlap.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
+		<copy file="${lib.dir}/caucho/hessian.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
+		<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
+		<copy file="${contacts.ca.war}" todir="${tmp.dir}/Jetty-${jetty.version}/webapps" overwrite="true"/>
 		<antcallback target="-perform-test-jetty" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
 			<param name="test.includes" value="**/ContainerAdapterContactsTests.class"/>
 			<param name="wait.for.url" value="http://localhost:8080/contacts-container-adapter"/>
@@ -240,7 +240,7 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;Errored: ${jakart
 
 	<target name="-perform-test-jetty">
 		<parallel>
-			<java fork="true" dir="${tmp.dir}/jetty-${jetty.version}/" classpath="${tmp.dir}/jetty-${jetty.version}/start.jar" classname="org.mortbay.start.Main">
+			<java fork="true" dir="${tmp.dir}/Jetty-${jetty.version}/" classpath="${tmp.dir}/Jetty-${jetty.version}/start.jar" classname="org.mortbay.start.Main">
 			</java>
 			<sequential>
                 <waitfor maxwait="60" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
@@ -249,7 +249,7 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;Errored: ${jakart
 				<antcallback target="-runtests" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
 					<param name="product" value="jetty-${jetty.version}"/>
 				</antcallback>
-		  		<java fork="true" dir="${tmp.dir}/jetty-${jetty.version}/" classpath="${tmp.dir}/jetty-${jetty.version}/stop.jar" classname="org.mortbay.stop.Main"/>
+		  		<java fork="true" dir="${tmp.dir}/Jetty-${jetty.version}/" classpath="${tmp.dir}/Jetty-${jetty.version}/stop.jar" classname="org.mortbay.stop.Main"/>
         	</sequential>
 		</parallel>
 	</target>
@@ -293,7 +293,7 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;Errored: ${jakart
 		<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/conf" overwrite="true"/>
 		<copy file="${dist.lib.dir}/acegi-security-catalina-server.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/server/lib" overwrite="true"/>
 		<copy file="${dist.lib.dir}/acegi-security-catalina-common.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
-		<copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
+		<copy file="${lib.dir}/aopalliance/aopalliance-1.0.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
 		<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
 		<copy file="${lib.dir}/jakarta-commons/commons-codec.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
 		<copy file="${lib.dir}/caucho/burlap.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
@@ -358,7 +358,7 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;Errored: ${jakart
 		<copy file="${config.dir}/jboss-${jboss.version}/login-config.xml" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/>
 		<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/>
 		<copy file="${dist.lib.dir}/acegi-security-jboss-lib.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
-		<copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
+		<copy file="${lib.dir}/aopalliance/aopalliance-1.0.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
 		<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
 		<copy file="${lib.dir}/jakarta-commons/commons-codec.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
 		<copy file="${lib.dir}/caucho/burlap.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>

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$