ozeigermann 2005/01/19 05:06:58
Modified: wck build.properties.sample build.xml
Log:
Made location of web.xml configurable
Revision Changes Path
1.7 +1 -1 jakarta-slide/wck/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/wck/build.properties.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties.sample 19 Jan 2005 08:52:45 -0000 1.6
+++ build.properties.sample 19 Jan 2005 13:06:57 -0000 1.7
@@ -25,10 +25,10 @@
#license=LICENSE
#readme=README
-
#domain=conf/Domain.xml
#jaas.config=conf/jaas.config
#slide.properties=src/org/apache/slide/slide.properties
+#web.xml=
#additional.src.dir=
#additional.lib.dir=
1.9 +16 -15 jakarta-slide/wck/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/wck/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 19 Jan 2005 08:52:45 -0000 1.8
+++ build.xml 19 Jan 2005 13:06:57 -0000 1.9
@@ -16,20 +16,6 @@
<!-- Should Java compilations set the 'optimize' compiler option? -->
<property name="compile.target" value="1.3"/>
<!-- ===================================================================
-->
- <!-- Project Properties
-->
- <!-- ===================================================================
-->
- <property name="name" value="Jakarta-Slide-WebDAV-Construction-Kit"/>
- <property name="year" value="2004"/>
- <property name="version" value="1.0"/>
- <property name="release-notes" value="RELEASE-NOTES-1.0"/>
- <property name="project" value="jakarta-slide-wck"/>
- <property name="final.name" value="${project}-${version}"/>
- <property name="license" value="LICENSE"/>
- <property name="readme" value="README"/>
- <property name="domain" value="${basedir}/conf/Domain.xml"/>
- <property name="jaas.config" value="${basedir}/conf/jaas.config"/>
- <property name="slide.properties"
value="${basedir}/src/org/apache/slide/slide.properties"/>
- <!-- ===================================================================
-->
<!-- Dependencies Properties
-->
<!-- ===================================================================
-->
<property name="commons.transaction.version" value="1.1b2pre"/>
@@ -44,6 +30,21 @@
<property name="slide-jaas.jar"
value="${slide.lib.dir}/slide-jaas-${slide.version}.jar"/>
<property name="slide-stores.jar"
value="${slide.lib.dir}/slide-stores-${slide.version}.jar"/>
<!-- ===================================================================
-->
+ <!-- Project Properties
-->
+ <!-- ===================================================================
-->
+ <property name="name" value="Jakarta-Slide-WebDAV-Construction-Kit"/>
+ <property name="year" value="2004"/>
+ <property name="version" value="1.0"/>
+ <property name="release-notes" value="RELEASE-NOTES-1.0"/>
+ <property name="project" value="jakarta-slide-wck"/>
+ <property name="final.name" value="${project}-${version}"/>
+ <property name="license" value="LICENSE"/>
+ <property name="readme" value="README"/>
+ <property name="domain" value="${basedir}/conf/Domain.xml"/>
+ <property name="jaas.config" value="${basedir}/conf/jaas.config"/>
+ <property name="slide.properties"
value="${basedir}/src/org/apache/slide/slide.properties"/>
+ <property name="web.xml"
value="${slide.base.dir}/src/conf/webapp/web.xml"/>
+ <!-- ===================================================================
-->
<!-- Classpaths
-->
<!-- ===================================================================
-->
<path id="classpath">
@@ -134,7 +135,7 @@
<!-- rebuild kernel with slide.properties, because we want ours to
be used -->
<jar jarfile="dist/slide-kernel-${slide.version}.jar"
basedir="${slide.base.dir}/build/classes"
manifest="${slide.base.dir}/build/classes/MANIFEST.MF"
includes="LICENSE,NOTICE,org/apache/slide/**"
excludes="**/slide.properties,org/apache/slide/webdav/**,org/apache/slide/jaas/**,org/apache/slide/store/impl/**,org/apache/slide/store/util/**,org/apache/slide/store/txfile/**,org/apache/slide/store/txjndi/**,org/apache/slide/store/mem/**,org/apache/slide/search/basic/sample/**,org/apache/slide/index/**,org/apache/slide/util/logger/jdk14/**"/>
<filter token="AUTH" value=""/>
- <copy file="${slide.base.dir}/src/conf/webapp/web.xml" todir="build"
filtering="true" overwrite="yes" />
+ <copy file="${web.xml}" todir="build" filtering="true"
overwrite="yes" />
<war warfile="dist/slide.war" webxml="build/web.xml">
<fileset file="${domain}" />
<lib dir="${slide.lib.dir}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
