Merge pull request #36 from Mrbytes/master

James Moger

2012-09-14 381cd5df2956c0b3b757e6d8e16f268a7c4babd1

 build.xml

@@ -122,7 +122,16 @@
         <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">

@@ -700,6 +709,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>