Support Team canAdmin, canCreate, and canFork (issue 36)

James Moger

2012-10-10 7f70511e9a13f4801e4e941affad6fc7b579c79d

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

@@ -185,10 +194,10 @@
      <mkdir dir="${project.deploy.dir}/ext"/>

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

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

            <exclude name="src/**" />

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

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

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

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

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

         </fileset>

      </copy>

      

@@ -402,11 +411,11 @@
      <mkdir dir="${project.war.dir}/WEB-INF/lib"/>

      <copy todir="${project.war.dir}/WEB-INF/lib">

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

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

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

            <exclude name="src/**" />

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

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

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

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

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

         </classfilter>

         <classpath refid="master-classpath" />

         <manifest>

@@ -540,11 +550,11 @@
      <mkdir dir="${deployments.root}/WEB-INF/lib"/>

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

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

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

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

            <exclude name="src/**" />

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

@@ -600,9 +610,13 @@
         <resource file="${basedir}/resources/search-icon.png" />

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

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

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

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

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

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

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

         </classfilter>

         <classpath refid="master-classpath" />

         <manifest>

@@ -692,12 +707,10 @@
               <include name="NOTICE" />

            </fileset>

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

               <exclude name="src/**" />

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

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

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

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

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

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

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

            </fileset>

         </zip>

      </target>