Preliminary implementation of server-side forking (issue 137)

James Moger

2012-09-29 1e1b85270f93b3bca624c99b478f3a9a23be2395

 build.xml

@@ -117,12 +117,21 @@


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

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

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}">

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}" includeantruntime="false">

         <include name="com/gitblit/build/Build.java" />         

         <include name="com/gitblit/Constants.java" />

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

         <syspropertyset id="proxy.properties">

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

            <propertyref prefix="http."/>

            <propertyref prefix="https."/>

            <propertyref prefix="ftp."/>

            <propertyref prefix="socksProxy"/>

         </syspropertyset>

      </java>



      <!-- Compile Project -->

      <path id="master-classpath">

@@ -131,7 +140,7 @@
         </fileset>

         <pathelement path="${project.build.dir}" />            

      </path>

      <javac debug="true" destdir="${project.build.dir}" failonerror="false">

      <javac debug="true" destdir="${project.build.dir}" failonerror="false" includeantruntime="false">

         <src path="${basedir}/src" />

         <classpath refid="master-classpath" />

      </javac>

@@ -186,6 +195,7 @@
      <copy todir="${project.deploy.dir}/ext">

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

            <exclude name="junit*.jar" />

            <exclude name="hamcrest*.jar" />

            <exclude name="commons-net*.jar" />

            <exclude name="*-sources.jar" />

            <exclude name="*-javadoc.jar" />

@@ -203,6 +213,8 @@
         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

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

            <include name="localclone.groovy" />

         </fileset>

      </copy>

   

@@ -227,9 +239,8 @@
         <copy todir="${docs.output.dir}">

            <!-- Copy selected Gitblit resources -->

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

               <include name="bootstrap.140.css" />

               <include name="bootstrap.gb.css" />

               <include name="markdown.css" />

               <include name="bootstrap/**/*" />

               <include name="gitblit.css" />

               <include name="gitblt_25_white.png" />

               <include name="gitblt-favicon.png" />

               <include name="lock_go_16x16.png" />

@@ -371,6 +382,8 @@
         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

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

            <include name="localclone.groovy" />

         </fileset>

      </copy>



@@ -404,7 +417,9 @@
            <exclude name="jcommander*.jar" />

            <exclude name="jetty*.jar" />

            <exclude name="junit*.jar" />

            <exclude name="hamcrest*.jar" />

            <exclude name="servlet*.jar" />

            <exclude name="javax.servlet*.jar" />

         </fileset>

      </copy>



@@ -416,6 +431,7 @@
            <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" />

@@ -445,6 +461,7 @@
            <exclude name="org.slf4j." />

            <exclude name="com.beust." />

            <exclude name="com.google." />

            <exclude name="com.unboundid." />

         </classfilter>

         <classpath refid="master-classpath" />

         <manifest>

@@ -505,6 +522,7 @@
         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

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

         </fileset>

      </copy>

               

@@ -539,13 +557,14 @@
            <exclude name="jcommander*.jar" />

            <exclude name="jetty*.jar" />

            <exclude name="junit*.jar" />

            <exclude name="hamcrest*.jar" />

            <exclude name="servlet*.jar" />

            <exclude name="javax.servlet*.jar" />

         </fileset>

      </copy>



      <!-- Gitblit classes -->

      <mkdir dir="${deployments.root}/WEB-INF/classes"/>

      <copy todir="${deployments.root}/WEB-INF/classes">

      <jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar">

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

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

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

@@ -555,7 +574,7 @@
            <exclude name="com/gitblit/Launcher*.class" />

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

         </fileset>

      </copy>

      </jar>



      <!-- Build Express Zip file -->

      <zip destfile="${express.zipfile}">

@@ -577,6 +596,7 @@
         <resource file="${basedir}/src/com/gitblit/client/splash.png" />

         <resource file="${basedir}/resources/gitblt-favicon.png" />

         <resource file="${basedir}/resources/gitweb-favicon.png" />

         <resource file="${basedir}/resources/git-orange-16x16.png" />

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

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

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

@@ -595,6 +615,7 @@
         <resource file="${basedir}/resources/commit_merge_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_ja.properties" />



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

         <classfilter>

@@ -604,6 +625,7 @@
            <exclude name="org.slf4j." />

            <exclude name="com.beust." />

            <exclude name="com.google." />

            <exclude name="com.unboundid." />

         </classfilter>

         <classpath refid="master-classpath" />

         <manifest>

@@ -690,6 +712,9 @@
               <include name="rome*.jar" />

               <exclude name="rome*-sources.jar" />

               <exclude name="rome*-javadoc.jar" />

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

               <exclude name="jdom*-sources.jar" />

               <exclude name="jdom*-javadoc.jar" />

            </fileset>

         </zip>

      </target>

@@ -710,9 +735,8 @@
      <copy todir="${project.site.dir}">

         <!-- Copy selected Gitblit resources -->

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

            <include name="bootstrap.140.css" />

            <include name="bootstrap.gb.css" />

            <include name="markdown.css" />

            <include name="bootstrap/**/*" />

            <include name="gitblit.css" />

            <include name="gitblt_25_white.png" />

            <include name="gitblt-favicon.png" />

            <include name="lock_go_16x16.png" />

@@ -983,4 +1007,4 @@
      <delete dir="${project.war.dir}" />

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

   </target>

</project>
</project>