use Ant import task instead of XML entity inclusion for shared properties in build...

diff --git a/HISTORY b/HISTORY
index e2dd73d..f511ee1 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,6 @@
-$Id: HISTORY,v 1.30 2006/02/14 09:28:28 maxcooper Exp $
-$Revision: 1.30 $
-$Date: 2006/02/14 09:28:28 $
+$Id: HISTORY,v 1.31 2006/02/15 08:23:52 maxcooper Exp $
+$Revision: 1.31 $
+$Date: 2006/02/15 08:23:52 $
 
 
 Security Filter v@PROJECT.VERSION@
@@ -13,6 +13,13 @@ changes made for each release.
 
 Changes since the last release:
 ===============================
+
+* Fixed issue where SecurityFilter was creating a uneccessarily session for unsecured pages,
+including the addition of an automated test:
+http://sourceforge.net/tracker/index.php?func=detail&aid=1056920&group_id=59484&atid=491164
+
+* Used ant import task in build files instead of entity inclusion
+
 * Fixed form-based login HTTP response code (was 401, now 200), including an automated test:
 http://sourceforge.net/tracker/index.php?func=detail&aid=935921&group_id=59484&atid=491164
 http://sourceforge.net/tracker/index.php?func=detail&aid=1143612&group_id=59484&atid=491164
@@ -23,10 +30,6 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=1143612&group_id=59484&
 value first, which follows the JUnit example. Also changed some calls to JUnit assert...
 methods to put the expected value first.
 
-* Fixed issue where SecurityFilter was creating a uneccessarily session for unsecured pages,
-including the addition of an automated test:
-http://sourceforge.net/tracker/index.php?func=detail&aid=1056920&group_id=59484&atid=491164
-
 
 Release 2.0, 2004-Dec-13
 ========================

diff --git a/build-webapps.xml b/build-webapps.xml
index f981984..4e7bd61 100644 (file)
--- a/build-webapps.xml
+++ b/build-webapps.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0"?>
 
 <!--
-$Id: build-webapps.xml,v 1.10 2005/02/22 11:02:04 maxcooper Exp $
-$Revision: 1.10 $
-$Date: 2005/02/22 11:02:04 $
+$Id: build-webapps.xml,v 1.11 2006/02/15 08:23:52 maxcooper Exp $
+$Revision: 1.11 $
+$Date: 2006/02/15 08:23:52 $
 -->
 
-<!DOCTYPE project [
-   <!ENTITY properties SYSTEM "file:./properties.xml">
-]>
-
 <project name="securityfilter-webapps" default="build">
-
-   <!-- import common properties -->
-   &properties;
+   <import file="properties.xml"/>
 
    <!-- import ant-contrib tasks -->
    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>

diff --git a/build.xml b/build.xml
index 34c726d..3a6d13a 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0"?>
 
 <!--
-$Id: build.xml,v 1.22 2005/02/22 11:02:07 maxcooper Exp $
-$Revision: 1.22 $
-$Date: 2005/02/22 11:02:07 $
+$Id: build.xml,v 1.23 2006/02/15 08:23:52 maxcooper Exp $
+$Revision: 1.23 $
+$Date: 2006/02/15 08:23:52 $
 -->
 
-<!DOCTYPE project [
-   <!ENTITY properties SYSTEM "file:./properties.xml">
-]>
 
-<project name="securityfilter" default="default">
 
-   <!-- import common properties -->
-   &properties;
+<project name="securityfilter" default="default">
+   <import file="properties.xml"/>
 
    <!-- ========== Default Target ================================================================================== -->
 

diff --git a/deploy.xml b/deploy.xml
index c0f9076..1eb14b9 100644 (file)
--- a/deploy.xml
+++ b/deploy.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0"?>
 
 <!--
-$Id: deploy.xml,v 1.5 2003/06/08 12:40:07 maxcooper Exp $
-$Revision: 1.5 $
-$Date: 2003/06/08 12:40:07 $
+$Id: deploy.xml,v 1.6 2006/02/15 08:23:52 maxcooper Exp $
+$Revision: 1.6 $
+$Date: 2006/02/15 08:23:52 $
 -->
 
-<!DOCTYPE project [
-   <!ENTITY properties SYSTEM "file:./properties.xml">
-]>
-
 <project name="Generic Tomcat Webapp Deployment" default="deploy">
 
-   &properties;
+   <import file="./properties.xml" />
 
    <target name="deploy">
       <echo>Deploying ${webapp.name}.war</echo>

diff --git a/properties.xml b/properties.xml
index f0225ab..1d49ef6 100644 (file)
--- a/properties.xml
+++ b/properties.xml
@@ -1,7 +1,7 @@
 <!--
-$Id: properties.xml,v 1.15 2005/02/22 10:55:44 maxcooper Exp $
-$Revision: 1.15 $
-$Date: 2005/02/22 10:55:44 $
+$Id: properties.xml,v 1.16 2006/02/15 08:23:52 maxcooper Exp $
+$Revision: 1.16 $
+$Date: 2006/02/15 08:23:52 $
 -->
 
 <!--
@@ -10,6 +10,7 @@ $Date: 2005/02/22 10:55:44 $
    This file is XML-included by Ant build files to get common properties.
 -->
 
+<project name="Properties file for securityfilter" default="">
 <!-- ========== Local/User Properties ============================================================================== -->
 
 <property file="build.properties"/>
@@ -134,3 +135,4 @@ $Date: 2005/02/22 10:55:44 $
    <filter token="PROJECT.VERSION" value="${project.version}"/>
 </filterset>
 
+</project>
\ No newline at end of file