You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/05/15 10:17:06 UTC
cvs commit: jakarta-slide build.xml build.properties.sample
remm 01/05/15 01:17:05
Modified: . build.xml build.properties.sample
Log:
- Provides a simple configuration parameter in build.properties that (if
uncommented) causes the WAR to be built with a web.xml that has
authentication on by default.
Patch submitted by Peter Hawkins.
Revision Changes Path
1.86 +14 -1 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- build.xml 2001/05/15 07:59:10 1.85
+++ build.xml 2001/05/15 08:16:55 1.86
@@ -62,6 +62,12 @@
<!-- =================================================================== -->
+ <!-- Overridden when authentication is -->
+ <!-- =================================================================== -->
+ <property name="authenticate" value="!--" />
+
+
+ <!-- =================================================================== -->
<!-- Patterns -->
<!-- =================================================================== -->
<!-- patternset describing files to be copied from the doc directory -->
@@ -738,8 +744,15 @@
<!-- =================================================================== -->
<target name="webapp-dist" depends="dist">
+ <filter token="AUTH" value="${authenticate}"/>
+ <copy todir="${slide.dist}/conf" filtering="true" overwrite="yes" >
+ <fileset dir="src/conf/webapp">
+ <include name="web.xml"/>
+ </fileset>
+ </copy>
+
<war warfile="${webapp.dist}/slide.war"
- webxml="src/conf/webapp/web.xml">
+ webxml="${slide.dist}/conf/web.xml">
<fileset dir="src/conf/webapp">
<include name="**/Domain.xml" />
</fileset>
1.2 +9 -1 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 2001/04/29 07:37:43 1.1
+++ build.properties.sample 2001/05/15 08:16:59 1.2
@@ -6,8 +6,16 @@
# Make any changes you need, and rename this file to
# "build.properties"
#
-# $Id: build.properties.sample,v 1.1 2001/04/29 07:37:43 remm Exp $
+# $Id: build.properties.sample,v 1.2 2001/05/15 08:16:59 remm Exp $
# -------------------------------------------------------------------
+
+
+# -------------------------------------------------------------------
+# CONFIGURATION OPTIONS
+# -------------------------------------------------------------------
+
+# Uncomment the following line to set user authentication on by default
+#authenticate
# -------------------------------------------------------------------