Added JCalendar 1.3.2 dependency

James Moger

2012-11-23 f09f249c0eacbc73592c4f656a9c34f6bc1df1cc

 build.xml

@@ -14,9 +14,12 @@
   <property name="project.build.dir" value="${basedir}/build" />

   <property name="project.deploy.dir" value="${basedir}/deploy" />

   <property name="project.war.dir" value="${basedir}/war" />

   <property name="project.jar.dir" value="${basedir}/jar" />

   <property name="project.site.dir" value="${basedir}/site" />

   <property name="project.resources.dir" value="${basedir}/resources" />   

   <property name="project.express.dir" value="${basedir}/express" />

   <property name="project.maven.repo.url" value="enter here your Maven repo URL" />

   <property name="project.maven.repo.id" value="gitblit.maven.repo" />

   <available property="hasBuildProps" file="${basedir}/build.properties"/>



   <!--

@@ -85,6 +88,8 @@
      </loadfile>   

      <property name="distribution.zipfile" value="gitblit-${gb.version}.zip" />

      <property name="distribution.warfile" value="gitblit-${gb.version}.war" />

      <property name="distribution.jarfile" value="gitblit-${gb.version}.jar" />

      <property name="distribution.pomfile" value="${basedir}/pom.xml" />

      <property name="fedclient.zipfile" value="fedclient-${gb.version}.zip" />

      <property name="manager.zipfile" value="manager-${gb.version}.zip" />

      <property name="gbapi.zipfile" value="gbapi-${gb.version}.zip" />

@@ -106,6 +111,14 @@
            <include name="users.conf" />

         </fileset>

      </copy>

		
      <!-- copy required distribution files to project folder -->

      <mkdir dir="${basedir}/certs" />

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

         <fileset dir="${basedir}/distrib">

            <include name="authority.conf" />

         </fileset>

      </copy>



      <!-- copy gitblit.properties to the WEB-INF folder.

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

@@ -123,7 +136,7 @@
         <include name="com/gitblit/utils/StringUtils.java" />         

      </javac>



      <java classpath="${project.build.dir}" classname="com.gitblit.build.Build">

      <java classpath="${project.build.dir}" classname="com.gitblit.build.Build" failonerror="true">

         <syspropertyset id="proxy.properties">

            <propertyref prefix="java.net.useSystemProxies"/>

            <propertyref prefix="http."/>

@@ -169,10 +182,22 @@
            <include name="**/*" />

            <exclude name="federation.properties" />

            <exclude name="openshift.mkd" />

            <exclude name="authority.conf" />

            <exclude name="*.tmpl" />

         </fileset>

         <fileset dir="${basedir}">

            <include name="LICENSE" />

            <include name="NOTICE" />

            <include name="authority*.jar" />

         </fileset>

      </copy>

		
      <!-- Certificate templates -->

      <mkdir dir="${project.deploy.dir}/certs"/>

      <copy todir="${project.deploy.dir}/certs">

         <fileset dir="${basedir}/distrib">

            <include name="*.tmpl" />

            <include name="authority.conf" />

         </fileset>

      </copy>



@@ -211,6 +236,7 @@
      <copy todir="${project.deploy.dir}/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="sendmail-html.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="localclone.groovy" />

@@ -380,6 +406,7 @@
      <copy todir="${project.war.dir}/WEB-INF/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="sendmail-html.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="localclone.groovy" />

@@ -441,6 +468,76 @@
   </target>



   

   <!--

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

      Build Gitblit JAR for usage in other projects plug-ins (i.e. Gerrit)

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

   -->

   <target name="buildJAR" depends="compile" description="Build Gitblit JAR">



      <echo>Building Gitblit JAR ${gb.version}</echo>



      <delete dir="${project.jar.dir}" />



      <!-- Gitblit classes -->

      <mkdir dir="${project.jar.dir}"/>

      <copy todir="${project.jar.dir}">

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

            <exclude name="WEB-INF/" />

            <exclude name="com/gitblit/tests/" />

            <exclude name="com/gitblit/build/**" />

            <exclude name="com/gitblit/client/**" />

            <exclude name="com/gitblit/AddIndexedBranch*.class" />

            <exclude name="com/gitblit/GitBlitServer*.class" />

            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />

         </fileset>

      </copy>



      <!-- Build the JAR file -->

      <jar basedir="${project.jar.dir}" destfile="${distribution.jarfile}" compress="true" />

   </target>



   <!--

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

      Build pom.xml for GitBlit JAR Maven module

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

   -->

   <target name="buildMaven" depends="buildJAR" description="Build pom.xml for Gitblit JAR Maven module">

      <copy tofile="${distribution.pomfile}" file="${distribution.pomfileTmplt}"/>

      <replace file="${distribution.pomfile}" token="@gb.version@" value="${gb.version}" />

   </target>



   <!--

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

      Install Gitblit JAR for usage as Maven module

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

   -->

   <target name="installMaven" depends="buildMaven" description="Install Gitblit JAR as Maven module">

      <exec executable="mvn">

         <arg value="install:install-file" />

         <arg value="-Dfile=${distribution.jarfile}" />

         <arg value="-DpomFile=${distribution.pomfile}" />

         <arg value="-DcreateChecksum=true" />

      </exec>

   </target>



   <!--

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

       Upload Gitblit JAR to remote Maven repository

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

    -->

   <target name="uploadMaven" depends="buildJAR" description="Upload Gitblit JAR to remote Maven repository">

      <exec executable="mvn">

         <arg value="deploy:deploy-file" />

         <arg value="-Dfile=${distribution.jarfile}" />

         <arg value="-DpomFile=${distribution.pomfile}" />

         <arg value="-Durl=${project.maven.repo.url}" />

         <arg value="-DrepositoryId=${project.maven.repo.id}" />

         <arg value="-DcreateChecksum=true" />

      </exec>

   </target>



   <!-- 

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

      Build the stand-alone, command-line Gitblit Federation Client

@@ -519,6 +616,7 @@
      <copy todir="${deployments.root}/WEB-INF/groovy">

         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="sendmail-html.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

         </fileset>

@@ -613,7 +711,10 @@
         <resource file="${basedir}/resources/commit_divide_16x16.png" />

         <resource file="${basedir}/resources/blank.png" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_es.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ko.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pl.properties" />



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

         <classfilter>