David Ostrovsky
2013-04-06 f15f17a8035717d260eb77b766c7b9c748729170
build.xml
@@ -6,14 +6,14 @@
      Retrieve Moxie Toolkit
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   -->
   <property name="moxie.version" value="0.7.1" />
   <property name="moxie.version" value="0.8.0-SNAPSHOT" />
   <property name="moxie.url" value="http://gitblit.github.com/moxie/maven" />
   <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
   <property name="moxie.dir" value="${user.home}/.moxie" />
   <mkdir dir="${moxie.dir}" />
   <!-- Download Moxie from it's Maven repository to user.home -->
   <get src="${moxie.url}/org/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"
      dest="${moxie.dir}" skipexisting="true" verbose="true" />
      dest="${moxie.dir}/${moxie.jar}" skipexisting="true" verbose="true" />
   
   <!-- Register Moxie tasks -->
   <taskdef uri="antlib:org.moxie">
@@ -93,9 +93,9 @@
         <fileset dir="${project.distrib.dir}/data" />
      </copy>
      
      <!-- copy gitblit.properties to the WEB-INF directory.
      <!-- copy gitblit.properties to the source directory.
           this file is only used for parsing setting descriptions. -->
      <copy tofile="${project.src.dir}/WEB-INF/reference.properties" overwrite="true"
      <copy tofile="${project.src.dir}/reference.properties" overwrite="true"
         file="${project.distrib.dir}/data/gitblit.properties" />
      
      <!-- 
@@ -214,8 +214,10 @@
            <include name="LICENSE" />
            <include name="NOTICE" />
         </fileset>
         <!-- Distrib files -->
         <!-- Windows distrib files -->
         <zipfileset dir="${project.distrib.dir}/win" />
         <!-- Gitblit Authority data -->
         <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
         <!-- include all dependencies -->
         <dependencies prefix="ext" />
      </mx:zip>
@@ -227,8 +229,10 @@
            <include name="LICENSE" />
            <include name="NOTICE" />
         </fileset>
         <!-- Distrib files -->
         <!-- Linux/OSX distrib files -->
         <tarfileset dir="${project.distrib.dir}/linux" filemode="755" />
         <!-- Gitblit Authority data -->
         <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
         <!-- include all dependencies -->
         <dependencies prefix="ext" />
      </mx:tar>      
@@ -261,6 +265,26 @@
      <!-- Build the WAR web.xml from the prototype web.xml -->
      <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml" />
      <!-- 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.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.GitServlet" />
         <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.wicket.GitBlitWebApp" />
      </mx:genjar>
      <!-- Build the WAR file -->
      <mx:zip basedir="${war.dir}" destfile="${project.targetDirectory}/${distribution.warfile}" compress="true" >
         <!-- Resources in root -->
@@ -269,19 +293,11 @@
            <exclude name="*.mkd" />
         </fileset>
         <!-- WEB-INF directory -->
         <zipfileset fullpath="WEB-INF/reference.properties"
            file="${project.distrib.dir}/data/gitblit.properties" />
         <zipfileset prefix="WEB-INF" dir="${basedir}" >
            <include name="LICENSE" />
            <include name="NOTICE" />
         </zipfileset>
         <!-- Classes and classpath resources -->
         <zipfileset prefix="WEB-INF/classes" dir="${project.compileOutputDirectory}">
            <include name="**/*.class" />
            <include name="**/*.properties" />
            <include name="**/*.mkd" />
            <exclude name="WEB-INF" />
         </zipfileset>
         <zipfileset prefix="WEB-INF" file="${project.compileOutputDirectory}/WEB-INF/weblogic.xml" />
         <!-- include "war" tagged dependencies -->
         <dependencies prefix="WEB-INF/lib" tag="war" />
      </mx:zip>
@@ -298,7 +314,7 @@
   
      <!-- generate jar by traversing the class hierarchy of the specified
          classes, exclude any classes in classpath jars -->
      <mx:genjar tag="" excludeClasspathJars="true"
      <mx:genjar tag="" includeresources="false" excludeClasspathJars="true"
         destfile="${project.targetDirectory}/fedclient.jar">
         <mainclass name="com.gitblit.FederationClient" />
         <launcher paths="ext" />
@@ -358,17 +374,24 @@
      skip="server.*" />
      <!-- Gitblit classes -->
      <jar destfile="${webinf}/lib/gitblit.jar">
         <fileset dir="${project.compileOutputDirectory}">
            <exclude name="WEB-INF/" />
            <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/authority/**" />
         </fileset>
      </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.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.GitServlet" />
         <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.wicket.GitBlitWebApp" />
      </mx:genjar>
      <!-- Build Express Zip file -->
      <mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}">
@@ -383,9 +406,6 @@
            <exclude name="thumbs.db" />
            <exclude name="*.mkd" />
         </zipfileset>
         <!-- reference.properties -->
         <zipfileset fullpath="deployments/ROOT.war/WEB-INF/reference.properties"
            file="${project.distrib.dir}/data/gitblit.properties" />
         <!-- include "war" tagged dependencies -->
         <dependencies prefix="deployments/ROOT.war/WEB-INF/lib" tag="war" />
      </mx:zip>
@@ -403,7 +423,7 @@
      <!-- generate jar by traversing the class hierarchy of the specified
          classes, exclude any classes in classpath jars -->
      <mx:genjar tag="" excludeClasspathJars="true"
      <mx:genjar tag="" includeResources="false" excludeClasspathJars="true"
         destfile="${project.targetDirectory}/manager.jar">
         <resource file="${project.src.dir}/com/gitblit/client/splash.png" />
         <resource file="${project.resources.dir}/gitblt-favicon.png" />
@@ -518,11 +538,8 @@
            <include name="users.conf" />
            <include name="gitblit.properties" />
         </zipfileset>
         <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs">
            <include name="authority.conf" />
            <include name="mail.tmpl" />
            <include name="instructions.tmpl" />
         </zipfileset>
         <!-- Gitblit Authority data -->
         <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
         <!-- include "authority" tagged dependencies -->
         <dependencies prefix="ext" tag="authority" />
      </mx:zip>
@@ -544,7 +561,7 @@
      <delete dir="${javadoc.dir}" />
      <!-- Build API Library jar -->
      <mx:genjar tag="" excludeClasspathJars="true"
      <mx:genjar tag="" includeResources="false" excludeClasspathJars="true"
         destfile="${project.targetDirectory}/gbapi-${project.version}.jar">
         <class name="com.gitblit.Keys" />
         <class name="com.gitblit.client.GitblitClient" />
@@ -973,8 +990,10 @@
   -->
   <target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">
      <local name="project.jar" />
      <property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
      <mx:jar destfile="${project.jar}" includeresources="true" />
      <property name="project.jar"
           value="${project.outputDirectory}/gitblit.jar" />
                <property name="resourceFolderPrefix" value=""/>
      <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}"/>
      <exec executable="mvn">
         <arg value="install:install-file" />