- added some properties to build-XRX for clarification reasons

XRX/build-XRX.xml

@@ -22,6 +22,11 @@
 
     <!-- betterFORM installation directories -->
     <property name="betterFORM.extension" value="${eXist.home}/extensions/betterform"/>
+    <property name="betterFORM.extension.target" value="${betterFORM.extension}/target"/>
+    <property name="betterFORM.extension.target.web-inf" value="${betterFORM.extension.target}/WEB-INF"/>
+
+    <!-- exist install dircs -->
+    <property name="exist.WEB-INF" value="${eXist.home}/webapp/WEB-INF"/>
 
     <!--Check for layout of betterform extension directory -->
     <condition property="betterFORM.libs" value="${betterFORM.extension}/src/main/lib">
@@ -69,18 +74,19 @@ Error: eXist is not installed in ${eXist.home}.
     <include file="build-utils-eXist.xml" as="db"/>
 
 
+
     <!-- Available properties -->
     <!-- betterFORM installed -->
-    <property name="betterFORM.install.marker" value="${eXist.home}/webapp/WEB-INF/betterFORM.installed"/>
+    <property name="betterFORM.install.marker" value="${eXist.WEB-INF}/betterFORM.installed"/>
 
-    <property name="betterFORM.config.patch.marker" value="${eXist.home}/webapp/WEB-INF/betterFORM.config.patched"/>
+    <property name="betterFORM.config.patch.marker" value="${eXist.WEB-INF}/betterFORM.config.patched"/>
     <available file="${betterFORM.config.patch.marker}" property="betterFORM.config.patched"/>
 
-    <property name="eXist.conf.patch.marker" value="${eXist.home}/webapp/WEB-INF/eXist.conf.patched"/>
+    <property name="eXist.conf.patch.marker" value="${eXist.WEB-INF}/eXist.conf.patched"/>
     <available file="${eXist.conf.patch.marker}" property="eXist.conf.patched"/>
 
     <!-- Exploded mode -->
-    <available file="${eXist.home}/webapp/WEB-INF/classes/de/betterform/agent/web/WebFactory.class" property="betterFORM.exploded.mode"/>
+    <available file="${eXist.WEB-INF}/classes/de/betterform/agent/web/WebFactory.class" property="betterFORM.exploded.mode"/>
     <!-- Single JAR mode -->
     <condition property="betterFORM.single.jar.mode">
         <or>
@@ -128,7 +134,7 @@ Error: eXist is not installed in ${eXist.home}.
             __== Patching betterFORM-config.xml ==__
         </echo>
         <copy file="${etc.dir}/MergeBetterformConfig.xsl" tofile="${eXist.home}/MergeBetterformConfig.xsl" failonerror="true"/>
-        <xslt in="${eXist.home}/webapp/WEB-INF/betterform-config.xml" out="${eXist.home}/webapp/WEB-INF/betterform-config.xml.out" force="true"
+        <xslt in="${eXist.WEB-INF}/betterform-config.xml" out="${eXist.WEB-INF}/betterform-config.xml.out" force="true"
               style="${eXist.home}/MergeBetterformConfig.xsl">
             <classpath refid="generator.libs"/>
             <param name="context" expression="betterform"/>
@@ -136,7 +142,7 @@ Error: eXist is not installed in ${eXist.home}.
         <delete file="${eXist.home}/MergeBetterformConfig.xsl"/>
 
 
-        <move file="${eXist.home}/webapp/WEB-INF/betterform-config.xml.out" tofile="${eXist.home}/webapp/WEB-INF/betterform-config.xml" overwrite="true"/>
+        <move file="${eXist.WEB-INF}/betterform-config.xml.out" tofile="${eXist.WEB-INF}/betterform-config.xml" overwrite="true"/>
         <touch file="${betterFORM.config.patch.marker}"/>
     </target>
 
@@ -145,14 +151,14 @@ Error: eXist is not installed in ${eXist.home}.
             __== Patching web.xml ==__
         </echo>
         <copy file="${etc.dir}/MergeDisplayNameAndErrorPage.xsl" tofile="${eXist.home}/MergeDisplayNameAndErrorPage.xsl" failonerror="true" overwrite="true"/>
-        <xslt in="${eXist.home}/webapp/WEB-INF/web.xml.tmpl" out="${eXist.home}/webapp/WEB-INF/web.xml.out" force="true"
+        <xslt in="${eXist.WEB-INF}/web.xml.tmpl" out="${eXist.WEB-INF}/web.xml.out" force="true"
               style="${eXist.home}/MergeDisplayNameAndErrorPage.xsl">
             <classpath refid="generator.libs"/>
         </xslt>
         <delete file="${eXist.home}/MergeDisplayNameAndErrorPage.xsl"/>
 
 
-        <move file="${eXist.home}/webapp/WEB-INF/web.xml.out" tofile="${eXist.home}/webapp/WEB-INF/web.xml" overwrite="true"/>
+        <move file="${eXist.WEB-INF}/web.xml.out" tofile="${eXist.WEB-INF}/web.xml" overwrite="true"/>
     </target>
 
     <target name="patch-eXist-config" unless="eXist.conf.patched">
@@ -326,12 +332,12 @@ Error: eXist is not installed in ${eXist.home}.
         <delete file="${betterFORM.jar.2}"/>
 
         <delete includeemptydirs="true">
-            <fileset dir="${eXist.home}/webapp/WEB-INF/classes" includes="**/*" excludes="CatalogManager.properties"/>
+            <fileset dir="${eXist.WEB-INF}/classes" includes="**/*" excludes="CatalogManager.properties"/>
         </delete>
 
 
-        <delete file="${eXist.home}/webapp/WEB-INF/betterFORM.config.patched"/>
-        <delete file="${eXist.home}/webapp/WEB-INF/betterFORM.installed"/>
+        <delete file="${eXist.WEB-INF}/betterFORM.config.patched"/>
+        <delete file="${eXist.WEB-INF}/betterFORM.installed"/>
         <delete file="${betterFORM.extension}/main/lib/dwr-${dwr-version-new}.jar"/>
         <delete file="${eXist.home}/lib/endorsed/saxonhe-${saxon-version-new}.jar"/>
 
@@ -382,23 +388,23 @@ Error: eXist is not installed in ${eXist.home}.
         </echo>
         <ant antfile="${web.dir}/build.xml" target="clean" usenativebasedir="true" inheritall="false"/>
         <ant antfile="${web.dir}/build.xml" target="deploy-exploded" usenativebasedir="true" inheritall="false">
-            <property name="webapp.dir" value="${betterFORM.extension}/target"/>
+            <property name="webapp.dir" value="${betterFORM.extension.target}"/>
             <property name="should.not.copy.libs" value="YES MA´AM"/>
         </ant>
 
-        <move todir="${eXist.home}/webapp/WEB-INF/classes" overwrite="true">
-            <fileset dir="${betterFORM.extension}/target/WEB-INF/classes"/>
+        <move todir="${eXist.WEB-INF}/classes" overwrite="true">
+            <fileset dir="${betterFORM.extension.target.web-inf}/classes"/>
         </move>
 
         <echo>
             _== Moving needed files from betterFROM WEB-INF directory to eXist WEB-INF directory ==_
         </echo>
-        <move file="${betterFORM.extension}/target/WEB-INF/betterform-config.xml" tofile="${eXist.home}/webapp/WEB-INF/betterform-config.xml" overwrite="true"/>
-        <move file="${betterFORM.extension}/target/WEB-INF/betterform-version.info" tofile="${eXist.home}/webapp/WEB-INF/betterform-version.info" overwrite="true"/>
-        <move file="${betterFORM.extension}/target/WEB-INF/dwr.xml" tofile="${eXist.home}/webapp/WEB-INF/dwr.xml" overwrite="true"/>
-        <move file="${betterFORM.extension}/target/WEB-INF/dwr20.dtd" tofile="${eXist.home}/webapp/WEB-INF/dwr20.dtd" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/betterform-config.xml" tofile="${eXist.WEB-INF}/betterform-config.xml" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/betterform-version.info" tofile="${eXist.WEB-INF}/betterform-version.info" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/dwr.xml" tofile="${eXist.WEB-INF}/dwr.xml" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/dwr20.dtd" tofile="${eXist.WEB-INF}/dwr20.dtd" overwrite="true"/>
 
-        <delete dir="${betterFORM.extension}/target" includeemptydirs="true"/>
+        <delete dir="${betterFORM.extension.target}" includeemptydirs="true"/>
         <antcall target="patch-betterFORM-config"/>
     </target>
 
@@ -435,22 +441,22 @@ Error: eXist is not installed in ${eXist.home}.
         <ant antfile="${web.dir}/build.xml" target="clean" usenativebasedir="true" inheritall="false"/>
 
         <ant antfile="${web.dir}/build.xml" target="deploy" usenativebasedir="true" inheritall="false">
-            <property name="webapp.dir" value="${betterFORM.extension}/target"/>
+            <property name="webapp.dir" value="${betterFORM.extension.target}"/>
             <property name="should.not.copy.libs" value="YES MA´AM"/>
         </ant>
 
-        <move file="${betterFORM.extension}/target/WEB-INF/lib/betterform.jar" tofile="${betterFORM.libs}/betterform.jar" overwrite="true"/>
-        <move file="${betterFORM.extension}/target/WEB-INF/classes/ehcache.xml" todir="${eXist.home}/webapp/WEB-INF/classes/" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/lib/betterform.jar" tofile="${betterFORM.libs}/betterform.jar" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/classes/ehcache.xml" todir="${eXist.WEB-INF}/classes/" overwrite="true"/>
 
 
         <echo>
             _== Moving needed files from betterFROM WEB-INF directory to eXist WEB-INF directory ==_
         </echo>
-        <move file="${betterFORM.extension}/target/WEB-INF/betterform-config.xml" tofile="${eXist.home}/webapp/WEB-INF/betterform-config.xml" overwrite="true"/>
-        <move file="${betterFORM.extension}/target/WEB-INF/betterform-version.info" tofile="${eXist.home}/webapp/WEB-INF/betterform-version.info" overwrite="true"/>
-        <move file="${betterFORM.extension}/target/WEB-INF/dwr.xml" tofile="${eXist.home}/webapp/WEB-INF/dwr.xml" overwrite="true"/>
-        <move file="${betterFORM.extension}/target/WEB-INF/dwr20.dtd" tofile="${eXist.home}/webapp/WEB-INF/dwr20.dtd" overwrite="true"/>
-        <delete dir="${betterFORM.extension}/target" includeemptydirs="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/betterform-config.xml" tofile="${eXist.WEB-INF}/betterform-config.xml" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/betterform-version.info" tofile="${eXist.WEB-INF}/betterform-version.info" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/dwr.xml" tofile="${eXist.WEB-INF}/dwr.xml" overwrite="true"/>
+        <move file="${betterFORM.extension.target.web-inf}/dwr20.dtd" tofile="${eXist.WEB-INF}/dwr20.dtd" overwrite="true"/>
+        <delete dir="${betterFORM.extension.target}" includeemptydirs="true"/>
         <antcall target="patch-betterFORM-config"/>
     </target>