Fixed bug in create/rename repository if the root group alias is specified ...

James Moger

2012-10-05 2c60de580f6452365a6f25c998b7dd1ca68f7181

 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,19 +550,18 @@
      <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>

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

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

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

         </fileset>

      </copy>

      </jar>



      <!-- Build Express Zip file -->

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

@@ -584,6 +593,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" />

@@ -600,6 +610,7 @@
         <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_ja.properties" />

@@ -612,6 +623,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 +704,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>

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

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

   </target>

</project>
</project>