Combined-md5 password storage option

James Moger

2011-10-24 d5623a235d54b308280d90920238bf75a2880b84

 build.xml

@@ -104,6 +104,11 @@
         </fileset>

      </copy>



      <!-- 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"

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



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

          This downloads missing compile-time dependencies from Maven. -->



@@ -162,6 +167,7 @@
      <jar jarfile="${project.deploy.dir}/${project.jar}">

         <fileset dir="${project.build.dir}">

            <include name="**/*" />

            <exclude name="com/gitblit/client/**" />

         </fileset>

         <fileset dir="${project.resources.dir}">

            <exclude name="thumbs.db" />

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

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



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

      <!-- Copy web.xml, users.properties, and gitblit.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" />

@@ -365,6 +372,7 @@
            <exclude name="WEB-INF/web.xml" />

            <exclude name="com/gitblit/tests/" />

            <exclude name="com/gitblit/build/**" />

            <exclude name="com/gitblit/client/**" />

            <exclude name="com/gitblit/GitBlitServer*.class" />

            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />            

@@ -426,6 +434,9 @@
      <genjar jarfile="manager.jar">

         <resource file="${basedir}/src/com/gitblit/client/splash.png" />

         <resource file="${basedir}/resources/gitblt-favicon.png" />

         <resource file="${basedir}/resources/gitweb-favicon.png" />

         <resource file="${basedir}/resources/user_16x16.png" />

         <resource file="${basedir}/resources/settings_16x16.png" />

         <resource file="${basedir}/resources/lock_go_16x16.png" />

         <resource file="${basedir}/resources/lock_pull_16x16.png" />

         <resource file="${basedir}/resources/shield_16x16.png" />