James Moger
2013-07-13 889e695280f9b82cc31aeb5e8a28b60f8cd6c260
build.xml
@@ -101,6 +101,11 @@
           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 clientapps.json to the source directory.
           this file is only used if a local file is not provided. -->
      <copy tofile="${project.src.dir}/clientapps.json" overwrite="true"
         file="${project.distrib.dir}/data/clientapps.json" />
      
      <!-- 
         upgrade existing workspace to data directory
@@ -139,8 +144,8 @@
             outputclass="com.gitblit.Keys"
             todir="${project.src.dir}" />
      <!-- Compile project incrementally -->
      <mx:javac scope="compile" clean="false" />
      <!-- Compile project -->
      <mx:javac scope="compile" clean="true" />
      
   </target>
@@ -267,7 +272,9 @@
      <prepareDataDirectory toDir="${webinf}/data" />
      <!-- Build the WAR web.xml from the prototype web.xml -->
      <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml" />
      <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml">
         <replace token="@gb.version@" value="${project.version}" />
      </mx:webxml>
      <!-- Gitblit jar -->
      <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
@@ -279,6 +286,7 @@
         <class name="com.gitblit.FederationServlet" />
         <class name="com.gitblit.GitFilter" />
         <class name="com.gitblit.git.GitServlet" />
         <class name="com.gitblit.LogoServlet" />
         <class name="com.gitblit.PagesFilter" />
         <class name="com.gitblit.PagesServlet" />
         <class name="com.gitblit.RobotsTxtServlet" />
@@ -286,7 +294,13 @@
         <class name="com.gitblit.RpcServlet" />
         <class name="com.gitblit.SyndicationFilter" />
         <class name="com.gitblit.SyndicationServlet" />
         <class name="com.gitblit.SparkleShareInviteServlet" />
         <class name="com.gitblit.wicket.GitBlitWebApp" />
         <!-- Manually include alternative User Services -->
         <class name="com.gitblit.LdapUserService" />
         <class name="com.gitblit.RedmineUserService" />
         <class name="com.gitblit.SalesforceUserService" />
         <class name="com.gitblit.WindowsUserService" />
      </mx:genjar>
      <!-- Build the WAR file -->
@@ -374,8 +388,10 @@
      <!-- Build the Express web.xml from the prototype web.xml and gitblit.properties -->
      <!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->
      <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml"
      propertiesFile="${project.distrib.dir}/data/gitblit.properties"
      skip="server.*" />
         propertiesFile="${project.distrib.dir}/data/gitblit.properties"
         skip="server.*">
         <replace token="@gb.version@" value="${project.version}" />
      </mx:webxml>
      <!-- Gitblit classes -->
      <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">
@@ -387,6 +403,7 @@
         <class name="com.gitblit.FederationServlet" />
         <class name="com.gitblit.GitFilter" />
         <class name="com.gitblit.git.GitServlet" />
         <class name="com.gitblit.LogoServlet" />
         <class name="com.gitblit.PagesFilter" />
         <class name="com.gitblit.PagesServlet" />
         <class name="com.gitblit.RobotsTxtServlet" />
@@ -394,7 +411,13 @@
         <class name="com.gitblit.RpcServlet" />
         <class name="com.gitblit.SyndicationFilter" />
         <class name="com.gitblit.SyndicationServlet" />
         <class name="com.gitblit.SparkleShareInviteServlet" />
         <class name="com.gitblit.wicket.GitBlitWebApp" />
         <!-- Manually include alternative User Services -->
         <class name="com.gitblit.LdapUserService" />
         <class name="com.gitblit.RedmineUserService" />
         <class name="com.gitblit.SalesforceUserService" />
         <class name="com.gitblit.WindowsUserService" />
      </mx:genjar>
      <!-- Build Express Zip file -->
@@ -649,8 +672,27 @@
               <page name="features" src="features.mkd" />
               <page name="screenshots" src="screenshots.mkd" />
            </menu>
            <menu name="documentation">
               <page name="setup" src="setup.mkd" />
            <menu name="documentation" pager="true" pagerPlacement="bottom" pagerLayout="justified">
               <menu name="Gitblit GO" pager="true" pagerPlacement="bottom" pagerLayout="justified">
                  <page name="setup GO" src="setup_go.mkd" />
                  <page name="upgrade GO" src="upgrade_go.mkd" />
               </menu>
               <divider />
               <menu name="Gitblit WAR" pager="true" pagerPlacement="bottom" pagerLayout="justified">
                  <page name="setup WAR" src="setup_war.mkd" />
                  <page name="upgrade WAR" src="upgrade_war.mkd" />
               </menu>
               <divider />
               <page name="administration" src="administration.mkd" />
               <page name="authentication" src="setup_authentication.mkd" />
               <page name="push hooks" src="setup_hooks.mkd" />
               <page name="lucene indexing" src="setup_lucene.mkd" />
               <page name="reverse proxies" src="setup_proxy.mkd" />
               <divider />
               <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
               <divider />
               <page name="git client setup" src="setup_client.mkd" />
               <divider />
               <page name="federation" src="federation.mkd" />
               <divider />
               <page name="settings" src="properties.mkd" />
@@ -684,7 +726,8 @@
            </menu>
            
            <menu name="links">
               <link name="Demo" src="https://demo-gitblit.rhcloud.com" />
               <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
               <link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
               <divider />
               <link name="Github" src="${project.scmUrl}" />
               <link name="Issues" src="${project.issuesUrl}" />
@@ -886,11 +929,30 @@
                  <page name="features" src="features.mkd" />
               </menu>
               <menu name="documentation">
                  <page name="setup" src="setup.mkd" />
                  <menu name="Gitblit GO" pager="true" pagerPlacement="bottom" pagerLayout="justified">
                     <page name="setup GO" src="setup_go.mkd" />
                     <page name="upgrade GO" src="upgrade_go.mkd" />
                  </menu>
                  <divider />
                  <menu name="Gitblit WAR" pager="true" pagerPlacement="bottom" pagerLayout="justified">
                     <page name="setup WAR" src="setup_war.mkd" />
                     <page name="upgrade WAR" src="upgrade_war.mkd" />
                  </menu>
                  <divider />
                  <page name="administration" src="administration.mkd" />
                  <page name="authentication" src="setup_authentication.mkd" />
                  <page name="push hooks" src="setup_hooks.mkd" />
                  <page name="lucene indexing" src="setup_lucene.mkd" />
                  <page name="reverse proxies" src="setup_proxy.mkd" />
                  <divider />
                  <page name="Gitblit as a viewer" src="setup_viewer.mkd" />
                  <divider />
                  <page name="git client setup" src="setup_client.mkd" />
                  <divider />
                  <page name="federation" src="federation.mkd" />
                  <divider />
                  <page name="faq" src="faq.mkd" />
                  <page name="settings" src="properties.mkd" />
                  <page name="faq" src="faq.mkd" />
                  <divider />
                  <page name="design" src="design.mkd" />
                  <page name="rpc" src="rpc.mkd" />
@@ -900,7 +962,8 @@
                  <page name="older releases" src="releasehistory.mkd" />
               </menu>
               <menu name="links">
                  <link name="Demo" src="https://demo-gitblit.rhcloud.com" />
                  <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
                  <link name="Gitbilt Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
                  <divider />
                  <link name="Github" src="${project.scmUrl}" />
                  <link name="Issues" src="${project.issuesUrl}" />
@@ -948,7 +1011,13 @@
            <fileset dir="${project.distrib.dir}/data">
               <include name="users.conf" />
               <include name="projects.conf" />
               <include name="gitblit.properties" />
               <include name="gitblit.properties" />
            </fileset>
         </copy>
         <mkdir dir="@{toDir}/git" />
         <copy todir="@{toDir}/git" overwrite="false">
            <fileset dir="${project.distrib.dir}/data/git">
               <include name="project.mkd" />
            </fileset>
         </copy>
         <mkdir dir="@{toDir}/groovy" />