Fix compare page exception when a submodule changes (issue-375)

James Moger

2014-03-03 eb0f7ea03074bb45c67d2ad877af3c5c85e6b3fc

 build.xml

@@ -8,7 +8,7 @@
      documentation @ http://gitblit.github.io/moxie

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <property name="moxie.version" value="0.9.0" />

   <property name="moxie.version" value="0.9.1" />

   <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />

   <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />

   <property name="moxie.dir" value="${user.home}/.moxie" />

@@ -247,34 +247,7 @@
      </mx:webxml>



      <!-- Gitblit jar -->

      <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">

         <!-- Specify all web.xml servlets and filters -->

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

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

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

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

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

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

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

         <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.GitblitWicketFilter" />

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

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

      </mx:genjar>

      <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />



      <!-- Build the WAR file -->

      <mx:zip basedir="${war.dir}" destfile="${project.targetDirectory}/${distribution.warfile}" compress="true" >

@@ -306,7 +279,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}/fedclient.jar">

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

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

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

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

         <launcher paths="ext" />

@@ -368,34 +342,7 @@
      </mx:webxml>



      <!-- Gitblit classes -->

      <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">

         <!-- Specify all web.xml servlets and filters -->

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

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

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

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

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

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

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

         <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.GitblitWicketFilter" />

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

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

      </mx:genjar>

      <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />



      <!-- Build Express Zip file -->

      <mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}">

@@ -600,16 +547,24 @@
                  <page name="upgrade Express" src="upgrade_express.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" />

               <page name="client app menus" src="setup_clientmenus.mkd" />

               <menu name="Server Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">

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

                  <page name="client app menus" src="setup_clientmenus.mkd" />

                  <page name="bugtraq" src="setup_bugtraq.mkd" />

                  <page name="mirrors" src="setup_mirrors.mkd" />

                  <page name="scaling" src="setup_scaling.mkd" />

                  <divider />

                  <page name="Gitblit as a viewer" src="setup_viewer.mkd" />

               </menu>

               <divider />

               <page name="Gitblit as a viewer" src="setup_viewer.mkd" />

               <divider />

               <page name="git client setup" src="setup_client.mkd" />

               <menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">

                  <page name="git client setup" src="setup_client.mkd" />

                  <page name="eclipse plugin" src="eclipse_plugin.mkd" />

               </menu>

               <divider />

               <page name="federation" src="federation.mkd" />

               <divider />

@@ -916,16 +871,24 @@
                     <page name="upgrade Express" src="upgrade_express.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" />

                  <page name="client app menus" src="setup_clientmenus.mkd" />

                  <menu name="Server Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">

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

                     <page name="client app menus" src="setup_clientmenus.mkd" />

                     <page name="bugtraq" src="setup_bugtraq.mkd" />

                     <page name="mirrors" src="setup_mirrors.mkd" />

                     <page name="scaling" src="setup_scaling.mkd" />

                     <divider />

                     <page name="Gitblit as a viewer" src="setup_viewer.mkd" />

                  </menu>

                  <divider />

                  <page name="Gitblit as a viewer" src="setup_viewer.mkd" />

                  <divider />

                  <page name="git client setup" src="setup_client.mkd" />

                  <menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">

                     <page name="git client setup" src="setup_client.mkd" />

                     <page name="eclipse plugin" src="eclipse_plugin.mkd" />

                  </menu>

                  <divider />

                  <page name="federation" src="federation.mkd" />

                  <divider />

@@ -1010,6 +973,9 @@
               <include name="localclone.groovy" />

               <include name="fogbugz.groovy" />

               <include name="thebuggenie.groovy" />

               <include name="fisheye.groovy" />

               <include name="redmine-fetch.groovy" />

               <include name="subgit.groovy" />

            </fileset>

         </copy>

      </sequential>