Working edit settings RPC. Web.xml is not directly modified.

1 files changed, 6 insertions, 3 deletions

diff --git a/build.xml b/build.xml
index 107fac37..4a5c8867 100644
--- a/build.xml
+++ b/build.xml
@@ -106,7 +106,7 @@
 

 		<!-- copy gitblit.properties to the WEB-INF folder.

 		     this file is only used for parsing setting descriptions. -->

-		<copy todir="${basedir}/src/WEB-INF" overwrite="true"

+		<copy tofile="${basedir}/src/WEB-INF/reference.properties" overwrite="true"

 			file="${basedir}/distrib/gitblit.properties" />

 

 		<!-- Compile the build tool and execute it.

@@ -311,11 +311,10 @@
 		

 		<delete dir="${project.war.dir}" />		

 

-		<!-- Copy web.xml, users.properties, and gitblit.properties to WEB-INF -->

+		<!-- Copy web.xml and users.properties to WEB-INF -->

 		<copy todir="${project.war.dir}/WEB-INF">

 			<fileset dir="${basedir}/distrib">

 			 	<include name="users.properties" />

-				<include name="gitblit.properties" />

 			</fileset>

 			<fileset dir="${basedir}/src/WEB-INF">

 			 	<include name="web.xml" />

@@ -326,6 +325,10 @@
 			</fileset>

 		</copy>

 		

+		<!-- Copy gitblit.properties as reference.properties -->

+		<copy tofile="${project.war.dir}/WEB-INF/reference.properties" 

+			file="${basedir}/distrib/gitblit.properties"/>

+		

 		<!-- Build the docs for the WAR build -->

 		<antcall target="buildDocs" inheritall="true" inheritrefs="true">

 			<param name="docs.output.dir" value="${project.war.dir}/WEB-INF/docs" />