Fixed Gitblit Authority failing to load realm.NNN.backingUserService (issue...

James Moger

2013-07-25 d5bdbdf6f0d54d4753f35a9b519fb7da2c2a9da7

 build.xml

@@ -185,6 +185,13 @@
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <target name="run" depends="compile" description="Run Gitblit GO">

        <!-- copy static files -->

        <copy todir="${basedir}/build/classes" overwrite="false">

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

                <exclude name="thumbs.db" />

                <exclude name="*.mkd" />

            </fileset>

        </copy>

      

      <!-- run the mainclass in a separate JVM -->

      <mx:run fork="true" />

@@ -280,6 +287,7 @@
      <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" />

@@ -295,12 +303,14 @@
         <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>



      <!-- Build the WAR file -->

@@ -335,6 +345,7 @@
      <mx:genjar tag="" includeresources="false" excludeClasspathJars="true"

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

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

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

         <launcher paths="ext" />

         <resource file="${project.compileOutputDirectory}/log4j.properties" />

      </mx:genjar>

@@ -397,6 +408,7 @@
      <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" />

@@ -412,12 +424,14 @@
         <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>



      <!-- Build Express Zip file -->

@@ -484,6 +498,11 @@
         </resource>



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

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

            <attribute name="SplashScreen-Image" value="splash.png" />

         </manifest>

@@ -547,6 +566,7 @@
         </resource>



         <mainclass name="com.gitblit.authority.Launcher" />

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

         <manifest>

            <attribute name="SplashScreen-Image" value="splash.png" />

         </manifest>

@@ -817,51 +837,72 @@
      Publish binaries to Google Code

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

   -->

   <target name="publishBinaries" description="Publish the Gitblit binaries to Google Code">

   <target name="publishBinaries" depends="prepare" description="Publish the Gitblit binaries to Google Code">



      <echo>Uploading Gitblit ${project.version} binaries</echo>



      <!-- Upload Gitblit GO Windows ZIP file -->

      <mx:gcupload 

          sourceFile="${distribution.zipfile}" 
          targetFile="gitblit-${project.version}.zip"

          description="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Windows)" />

         username="${googlecode.user}"

         password="${googlecode.password}"

         projectname="gitblit"

         filename="${project.targetDirectory}/${distribution.zipfile}" 
         targetFilename="gitblit-${project.version}.zip"

         summary="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Windows)" />



      <!-- Upload Gitblit GO Linux/Unix tar.gz file -->

      <mx:gcupload

          sourceFile="${distribution.tgzfile}" 
          targetFile="gitblit-${project.version}.tar.gz"

          description="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Linux/Unix)" />

         username="${googlecode.user}"

         password="${googlecode.password}"

         projectname="gitblit"

         filename="${project.targetDirectory}/${distribution.tgzfile}" 
         targetFilename="gitblit-${project.version}.tar.gz"

         summary="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Linux/Unix)" />



      <!-- Upload Gitblit WAR file -->

      <mx:gcupload 
           sourceFile="${distribution.warfile}" 
           targetFile="gitblit-${project.version}.war"

           description="Gitblit WAR v${project.version} (standard WAR webapp for servlet containers)" />

      <mx:gcupload

         username="${googlecode.user}"

         password="${googlecode.password}"

         projectname="gitblit"

         filename="${project.targetDirectory}/${distribution.warfile}" 
         targetFilename="gitblit-${project.version}.war"

         summary="Gitblit WAR v${project.version} (standard WAR webapp for servlet containers)" />



      <!-- Upload Gitblit FedClient -->

      <mx:gcupload 
         sourceFile="${fedclient.zipfile}" 
         targetFile="fedclient-${project.version}.zip"

         description="Gitblit Federation Client v${project.version} (command-line tool to clone data from federated Gitblit instances)" />

      <mx:gcupload

         username="${googlecode.user}"

         password="${googlecode.password}"

          projectname="gitblit"

         filename="${project.targetDirectory}/${fedclient.zipfile}" 
         targetFilename="fedclient-${project.version}.zip"

          summary="Gitblit Federation Client v${project.version} (command-line tool to clone data from federated Gitblit instances)" />



      <!-- Upload Gitblit Manager -->

      <mx:gcupload

         sourceFile="${manager.zipfile}" 
         targetFile="manager-${project.version}.zip"

         description="Gitblit Manager v${project.version} (Swing tool to remotely administer a Gitblit server)" />

         username="${googlecode.user}"

         password="${googlecode.password}"

         projectname="gitblit"

         filename="${project.targetDirectory}/${manager.zipfile}" 
         targetFilename="manager-${project.version}.zip"

         summary="Gitblit Manager v${project.version} (Swing tool to remotely administer a Gitblit server)" />



      <!-- Upload Gitblit API Library -->

      <mx:gcupload

         sourceFile="${gbapi.zipfile}" 
         targetFile="gbapi-${project.version}.zip"

         description="Gitblit API Library v${project.version} (JSON RPC library to integrate with your software)" />

         username="${googlecode.user}"

         password="${googlecode.password}"

         projectname="gitblit"

         filename="${project.targetDirectory}/${gbapi.zipfile}" 
         targetFilename="gbapi-${project.version}.zip"

         summary="Gitblit API Library v${project.version} (JSON RPC library to integrate with your software)" />



      <!-- Upload Gitblit Express for RedHat OpenShift -->

      <mx:gcupload 
         sourceFile="${express.zipfile}" 
         targetFile="express-${project.version}.zip"

         description="Gitblit Express v${project.version} (run Gitblit on RedHat's OpenShift cloud)" />

      <mx:gcupload

         username="${googlecode.user}"

         password="${googlecode.password}"

         projectname="gitblit"

         filename="${project.targetDirectory}/${express.zipfile}" 
         targetFilename="express-${project.version}.zip"

         summary="Gitblit Express v${project.version} (run Gitblit on RedHat's OpenShift cloud)" />



   </target>



@@ -891,7 +932,7 @@
      Tag a new version and prepare for the next development cycle.

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

   -->

   <target name="tagRelease" depends="prepare">

   <target name="tagRelease" depends="prepare" description="tag a new version and prepare for the next development cycle">

      <!-- release -->

      <property name="dryrun" value="false" />

      <mx:version stage="release" dryrun="${dryrun}" />