From: dayash <dayash>
Date: Sat, 18 Jan 2003 07:30:59 +0000 (+0000)
Subject: static target now copies org.apache.catalina.util.Base64 class to WEB-INF/classes... 
X-Git-Tag: rel-2_0-alpha1~131
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e14e4bce5de9e54b0728c9073390b9e3cff122e8;p=securityfilter.git

static target now copies org.apache.catalina.util.Base64 class to WEB-INF/classes for securityfilter-example.war only,
Base64 class is required for decoding the user supplied credentials when using BASIC authentication scheme.
---

diff --git a/build-webapps.xml b/build-webapps.xml
index 107e06e..9d83b1a 100644
--- a/build-webapps.xml
+++ b/build-webapps.xml
@@ -1,181 +1,187 @@
 <project name="Security Filter Web Applications" default="compile" basedir=".">
 
 
-<!--
-        This is a build file that creates all of the web applications included
-        in a Security Filter distribution, using the generic "build-webapp.xml" 
-        script for the details
--->
+   <!--
+           This is a build file that creates all of the web applications included
+           in a Security Filter distribution, using the generic "build-webapp.xml"
+           script for the details
+   -->
 
 
-<!-- ========== Prerequisite Properties =================================== -->
+   <!-- ========== Prerequisite Properties =================================== -->
 
 
-<!--
-        These properties MUST be set on the "ant" command line, the "antrc"
-        properties file in your home directory, or from settings in a superior
-        build.xml script.
+   <!--
+           These properties MUST be set on the "ant" command line, the "antrc"
+           properties file in your home directory, or from settings in a superior
+           build.xml script.
 
-        build.home                    Base directory into which we are building
-                                      the Security Filter components.
+           build.home                    Base directory into which we are building
+                                         the Security Filter components.
+
+           compile.classpath             If specified, contains a set of JAR files
+                                         and/or directories to be added to the
+                                         compilation classpath.
 
-        compile.classpath             If specified, contains a set of JAR files
-                                      and/or directories to be added to the
-                                      compilation classpath.
-
-        servlet.jar                   The pathname of the servlet API classes
-                                      that you wish to compile against.
-
-        securityfilter.libs           The directory containing 
-                                      securityfilter.jar file.
-
-        webapp.libs                   If specified, must be the pathname of a
-                                      directory from which all available
-                                      "*.jar" files are copied to the web
-                                      application's WEB-INF/lib directory.
--->
-
-<property name="build.home"           value="${basedir}/target"/>
-<property name="servlet.jar"          value="../jakarta-servletapi/lib/servlet.jar"/>
-<property name="securityfilter.libs"  value="${build.home}/library"/>
-
-
-
-<!-- ========== Initialization Properties ================================= -->
-
-
-<!--
-        These property values may optionally be overridden with property
-        settings from an "ant" command line, the "antrc" properties file
-        in your home directory, or from settings in a superior build.xml
-        script.
--->
-
-
-<!-- Should Java compilations set the debug compiler option? -->
-<property name="compile.debug"         value="true" />
-
-<!-- Should Java compilations set the deprecation compiler option? -->
-<property name="compile.deprecation"   value="false" />
-
-<!-- Should Java compilations set the optimize compiler option? -->
-<property name="compile.optimize"      value="true" />
-
-<!-- The base directory for distribution targets -->
-<property name="dist.home"             value="${basedir}/dist" />
-
-<!-- The directory into which the Security Filter JAR files have been created -->
-<property name="securityfilter.home"   value="${build.home}/library" />
-
-<!-- Directory where core securityfilter library configurations files are stored -->
-<property name="conf.share.dir" value="${basedir}/conf/share"/>
-
-
-<!-- ========== Executable Targets ======================================== -->
-
-
-<!--
-        The "static.generic" target causes the "static" target of each
-        individual web application to be executed.
--->
-<target name="static.generic">
-  <ant  antfile="build-webapp.xml"    target="static">
-    <property name="webapp.name"      value="blank"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="static">
-    <property name="webapp.name"      value="example"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="static">
-    <property name="webapp.name"      value="catalina-example"/>
-  </ant>
-</target>
-
-
-<!--
-        The "static" target causes non-generic static activity required
-        for specific tag libraries to be executed.
--->
-<target name="static" depends="static.generic"
-        description="Copy static resources for individual web applications">
-    <!-- Copy shared web content for the Security Filter example application -->
-    <copy todir="${build.home}/example">
-        <fileset dir="${basedir}/web/share" includes="**/*.jsp"/>
-    </copy>
-    <copy tofile="${build.home}/example/WEB-INF/web.xml"
-            file="${basedir}/web/share/WEB-INF/web.xml"/>
-    <!-- Copy shared web content for the Security Filter catalina-example application -->
-    <copy todir="${build.home}/catalina-example">
-        <fileset dir="${basedir}/web/share" includes="**/*.jsp"/>
-    </copy>
-    <copy tofile="${build.home}/catalina-example/WEB-INF/web.xml"
-            file="${basedir}/web/share/WEB-INF/web.xml"/>
-    <!-- Copy catalina.jar the Security Filter catalina-example application -->
-    <copy tofile="${build.home}/catalina-example/WEB-INF/lib/catalina.jar"
-            file="${catalina.jar}"/>
-</target>
-
-
-<!--
-        The "compile" target causes the "compile" target of each
-        individual web application to be executed.
--->
-<target name="compile">
-  <ant  antfile="build-webapp.xml"    target="compile">
-    <property name="webapp.name"      value="blank"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="compile">
-    <property name="webapp.name"      value="example"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="compile">
-    <property name="webapp.name"      value="catalina-example"/>
-  </ant>
-</target>
-
-
-<!--
-        The "dist" target causes the "dist" target of each
-        individual web application to be executed.
--->
-<target name="dist">
-  <ant  antfile="build-webapp.xml"    target="dist">
-    <property name="webapp.name"      value="blank"/>
-    <property name="webapp.war"       value="securityfilter-blank.war"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="dist">
-    <property name="webapp.name"      value="example"/>
-    <property name="webapp.war"       value="securityfilter-example.war"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="dist">
-    <property name="webapp.name"      value="catalina-example"/>
-    <property name="webapp.war"       value="securityfilter-catalina-example.war"/>
-  </ant>
-</target>
-
-
-<!--
-        The "clean.generic" target causes the "clean" target of each
-        individual web application to be executed.
--->
-<target name="clean.generic">
-  <ant  antfile="build-webapp.xml"    target="clean">
-    <property name="webapp.name"      value="blank"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="clean">
-    <property name="webapp.name"      value="example"/>
-  </ant>
-  <ant  antfile="build-webapp.xml"    target="clean">
-    <property name="webapp.name"      value="catalina-example"/>
-  </ant>
-</target>
-
-
-<!--
-        The "clean" target causes non-generic clean activity required
-        for specific tag libraries to be executed.
--->
-<target name="clean" depends="clean.generic"
-        description="Clean output for individual web applications">
-</target>
+           servlet.jar                   The pathname of the servlet API classes
+                                         that you wish to compile against.
+
+           securityfilter.libs           The directory containing
+                                         securityfilter.jar file.
+
+           webapp.libs                   If specified, must be the pathname of a
+                                         directory from which all available
+                                         "*.jar" files are copied to the web
+                                         application's WEB-INF/lib directory.
+   -->
+
+   <property name="build.home" value="${basedir}/target"/>
+   <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
+   <property name="securityfilter.libs" value="${build.home}/library"/>
+
+
+
+   <!-- ========== Initialization Properties ================================= -->
+
+
+   <!--
+           These property values may optionally be overridden with property
+           settings from an "ant" command line, the "antrc" properties file
+           in your home directory, or from settings in a superior build.xml
+           script.
+   -->
+
+
+   <!-- Should Java compilations set the debug compiler option? -->
+   <property name="compile.debug" value="true"/>
+
+   <!-- Should Java compilations set the deprecation compiler option? -->
+   <property name="compile.deprecation" value="false"/>
+
+   <!-- Should Java compilations set the optimize compiler option? -->
+   <property name="compile.optimize" value="true"/>
+
+   <!-- The base directory for distribution targets -->
+   <property name="dist.home" value="${basedir}/dist"/>
+
+   <!-- The directory into which the Security Filter JAR files have been created -->
+   <property name="securityfilter.home" value="${build.home}/library"/>
+
+   <!-- Directory where core securityfilter library configurations files are stored -->
+   <property name="conf.share.dir" value="${basedir}/conf/share"/>
+
+
+   <!-- ========== Executable Targets ======================================== -->
+
+
+   <!--
+           The "static.generic" target causes the "static" target of each
+           individual web application to be executed.
+   -->
+   <target name="static.generic">
+      <ant antfile="build-webapp.xml" target="static">
+         <property name="webapp.name" value="blank"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="static">
+         <property name="webapp.name" value="example"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="static">
+         <property name="webapp.name" value="catalina-example"/>
+      </ant>
+   </target>
+
+
+   <!--
+           The "static" target causes non-generic static activity required
+           for specific tag libraries to be executed.
+   -->
+   <target name="static" depends="static.generic"
+      description="Copy static resources for individual web applications">
+      <!-- Copy shared web content for the Security Filter example application -->
+      <copy todir="${build.home}/example">
+         <fileset dir="${basedir}/web/share" includes="**/*.jsp"/>
+      </copy>
+      <unjar src="${build.home}/catalina-example/WEB-INF/lib/catalina.jar" dest="${stage.lib.dir}"/>
+      <mkdir dir="${build.home}/example/WEB-INF/classes/org/apache/catalina/util"/>
+      <copy todir="${build.home}/example/WEB-INF/classes/org/apache/catalina/util"
+         file="${stage.lib.dir}/org/apache/catalina/util/Base64.class"/>
+      <deltree dir="${stage.lib.dir}/org"/>
+      <deltree dir="${stage.lib.dir}/META-INF"/>
+      <copy tofile="${build.home}/example/WEB-INF/web.xml"
+         file="${basedir}/web/share/WEB-INF/web.xml"/>
+      <!-- Copy shared web content for the Security Filter catalina-example application -->
+      <copy todir="${build.home}/catalina-example">
+         <fileset dir="${basedir}/web/share" includes="**/*.jsp"/>
+      </copy>
+      <copy tofile="${build.home}/catalina-example/WEB-INF/web.xml"
+         file="${basedir}/web/share/WEB-INF/web.xml"/>
+      <!-- Copy catalina.jar the Security Filter catalina-example application -->
+      <copy tofile="${build.home}/catalina-example/WEB-INF/lib/catalina.jar"
+         file="${catalina.jar}"/>
+   </target>
+
+
+   <!--
+           The "compile" target causes the "compile" target of each
+           individual web application to be executed.
+   -->
+   <target name="compile">
+      <ant antfile="build-webapp.xml" target="compile">
+         <property name="webapp.name" value="blank"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="compile">
+         <property name="webapp.name" value="example"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="compile">
+         <property name="webapp.name" value="catalina-example"/>
+      </ant>
+   </target>
+
+
+   <!--
+           The "dist" target causes the "dist" target of each
+           individual web application to be executed.
+   -->
+   <target name="dist">
+      <ant antfile="build-webapp.xml" target="dist">
+         <property name="webapp.name" value="blank"/>
+         <property name="webapp.war" value="securityfilter-blank.war"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="dist">
+         <property name="webapp.name" value="example"/>
+         <property name="webapp.war" value="securityfilter-example.war"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="dist">
+         <property name="webapp.name" value="catalina-example"/>
+         <property name="webapp.war" value="securityfilter-catalina-example.war"/>
+      </ant>
+   </target>
+
+
+   <!--
+           The "clean.generic" target causes the "clean" target of each
+           individual web application to be executed.
+   -->
+   <target name="clean.generic">
+      <ant antfile="build-webapp.xml" target="clean">
+         <property name="webapp.name" value="blank"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="clean">
+         <property name="webapp.name" value="example"/>
+      </ant>
+      <ant antfile="build-webapp.xml" target="clean">
+         <property name="webapp.name" value="catalina-example"/>
+      </ant>
+   </target>
+
+
+   <!--
+           The "clean" target causes non-generic clean activity required
+           for specific tag libraries to be executed.
+   -->
+   <target name="clean" depends="clean.generic"
+      description="Clean output for individual web applications">
+   </target>
 
 
 </project>