Rollback to Jetty 7.4.3 for now.

James Moger

2011-07-21 0d3e3ca5b85d7e81066030a5081ea3a9cbe76607

 build.xml

@@ -2,7 +2,8 @@
<project name="gitblit" default="compile" basedir=".">



   <!-- Google Code upload task -->

   <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpath="${basedir}/tools/ant-googlecode-0.0.3.jar" name="gcupload"/>

   <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" 
      classpath="${basedir}/tools/ant-googlecode-0.0.3.jar" name="gcupload"/>



   <!-- Project Properties -->

   <property name="project.jar" value="gitblit.jar" />

@@ -249,9 +250,21 @@
            <arg value="--substitute" />

            <arg value="%JGIT%=${jgit.version}" />



            <arg value="--load" />

            <arg value="--properties" />

            <arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" />



            <arg value="--nomarkdown" />

            <arg value="%BEGINCODE%:%ENDCODE%" />



            <arg value="--substitute" />

            <arg value="&quot;%BEGINCODE%=&lt;pre class='prettyprint lang-java'&gt;&quot;" />



            <arg value="--substitute" />

            <arg value="%ENDCODE%=&lt;/pre&gt;" />

				
            <arg value="--regex" />

            <arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />

		
         </java>

   </target>

   

@@ -423,9 +436,15 @@


         <arg value="--pageHeader" />

         <arg value="${basedir}/docs/site_header.html" />



			
         <arg value="--pageFooter" />

         <arg value="${basedir}/docs/site_footer.html" />



         <arg value="--analyticsSnippet" />

         <arg value="${basedir}/docs/site_analytics.html" />

				
         <arg value="--adSnippet" />

         <arg value="${basedir}/docs/site_ads.html" />



         <arg value="--alias" />

         <arg value="index=overview" />

@@ -448,10 +467,22 @@
         <arg value="--substitute" />

         <arg value="%JGIT%=${jgit.version}" />



         <arg value="--load" />

         <arg value="--properties" />

         <arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" />

			
         <arg value="--nomarkdown" />

         <arg value="%BEGINCODE%:%ENDCODE%" />



      </java>

         <arg value="--substitute" />

         <arg value="&quot;%BEGINCODE%=&lt;pre class='prettyprint lang-java'&gt;&quot;" />



         <arg value="--substitute" />

         <arg value="%ENDCODE%=&lt;/pre&gt;" />



         <arg value="--regex" />

         <arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />



      </java>	
   </target>

      



@@ -484,7 +515,7 @@
          projectname="gitblit" 

          filename="${distribution.zipfile}" 

          targetfilename="gitblit-${gb.version}.zip"

          summary="Standalone, integrated Gitblit server v${gb.version}"

          summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)"

          labels="Featured, Type-Package, OpSys-All" />

         

      <!-- Upload WAR file -->

@@ -494,7 +525,7 @@
           projectname="gitblit" 

           filename="${distribution.warfile}" 

           targetfilename="gitblit-${gb.version}.war"

           summary="Gitblit WAR v${gb.version} for your servlet container"

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

           labels="Featured, Type-Package, OpSys-All" />

   </target>