Merged #110 "Support multiple/chained config files"

James Moger

2014-10-27 959ec25027f1bce091dcd9cc2d93c721ff2dc35d

 build.xml

@@ -82,10 +82,9 @@
         <fileset dir="${project.distrib.dir}/data" />

      </copy>

      

      <!-- copy gitblit.properties to the source directory.

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

      <copy tofile="${project.src.dir}/reference.properties" overwrite="true"

         file="${project.distrib.dir}/data/gitblit.properties" />

      <!-- copy defaults.properties to the source directory -->

      <copy tofile="${project.src.dir}/defaults.properties" overwrite="true"

         file="${project.distrib.dir}/data/defaults.properties" />



      <!-- copy clientapps.json to the source directory.

           this file is only used if a local file is not provided. -->

@@ -102,8 +101,8 @@
   -->

   <target name="compile" depends="setup" description="compiles Gitblit from source">

      

      <!-- Generate the Keys class from the properties file -->

      <mx:keys propertiesfile="${project.distrib.dir}/data/gitblit.properties"

      <!-- Generate the Keys class from the defaults.properties file -->

      <mx:keys propertiesfile="${project.distrib.dir}/data/defaults.properties"

             outputclass="com.gitblit.Keys"

             todir="${project.src.dir}" />



@@ -295,7 +294,7 @@
          classes, exclude any classes in classpath jars -->

      <mx:genjar tag="" includeresources="false" excludeClasspathJars="true"

         destfile="${project.targetDirectory}/fedclient.jar"

         excludes="**/.class,**/*.java, **/Thumbs.db, **/*.mkd, com/gitblit/wicket/**">

         excludes="**/.class, **/*.java, **/Thumbs.db, **/*.mkd, **/*.md, **/*.css, com/gitblit/wicket/**">

         <mainclass name="com.gitblit.FederationClient" />

         <class name="com.gitblit.Keys" />

         <launcher paths="ext" />

@@ -335,7 +334,8 @@
      <!-- generate jar by traversing the class hierarchy of the specified

          classes, exclude any classes in classpath jars -->

      <mx:genjar tag="" includeResources="false" excludeClasspathJars="true"

         destfile="${project.targetDirectory}/manager.jar">

         destfile="${project.targetDirectory}/manager.jar"

         excludes="**/.class, **/*.java, **/Thumbs.db, **/*.mkd, **/*.md, **/*.css, com/gitblit/wicket/**">

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

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

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

@@ -411,9 +411,10 @@


      <!-- Build API Library jar -->

      <mx:genjar tag="" includeResources="false" excludeClasspathJars="true"

         destfile="${project.targetDirectory}/gbapi-${project.version}.jar">

         destfile="${project.targetDirectory}/gbapi-${project.version}.jar"

         excludes="**/.class, **/*.java, **/Thumbs.db, **/*.mkd, **/*.md, **/*.css, com/gitblit/wicket/**">

         <mainclass name="com.gitblit.client.GitblitClient" />

         <class name="com.gitblit.Keys" />

         <class name="com.gitblit.client.GitblitClient" />

         <class name="com.gitblit.models.FederationModel" />

         <class name="com.gitblit.models.FederationProposal" />

         <class name="com.gitblit.models.FederationSet" />         

@@ -595,7 +596,7 @@
         

         <replace token="%GCURL%" value="${gc.url}" />

         

         <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />

         <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/defaults.properties" />

         

         <regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />

         <regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />

@@ -896,7 +897,7 @@
               </menu>

            </structure>

            

            <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />

            <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/defaults.properties" />

            

            <regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />

            <regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />

@@ -936,6 +937,7 @@
            <fileset dir="${project.distrib.dir}/data">

               <include name="users.conf" />

               <include name="projects.conf" />

               <include name="defaults.properties" />

               <include name="gitblit.properties" />               

            </fileset>

         </copy>