Removed obsolete/legacy code from build script

diff --git a/build.xml b/build.xml
index 35e3192c561a613d0b9583242df650b1da520e1c..dd091dc64d8d65dbae816de4d295793f0f268056 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -62,22 +62,6 @@
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
        <target name="clean" depends="prepare" description="Cleanup all build artifacts and directories">\r
-               <!-- cleanup legacy build structure -->\r
-               <!-- this can be eliminated after 1.3.0 release -->\r
-               <delete>\r
-                       <fileset dir="${basedir}">\r
-                               <include name="*.zip" />\r
-                               <include name="*.war" />\r
-                               <include name="*.jar" />\r
-                       </fileset>\r
-               </delete>\r
-               <delete dir="${basedir}/deploy" failonerror="false" />\r
-               <delete dir="${basedir}/express" failonerror="false" />\r
-               <delete dir="${basedir}/jar" failonerror="false" />\r
-               <delete dir="${basedir}/javadoc" failonerror="false" />\r
-               <delete dir="${basedir}/site" failonerror="false" />\r
-               <delete dir="${basedir}/temp" failonerror="false" />\r
-               <delete dir="${basedir}/war" failonerror="false" />\r
                \r
                <!-- Clean build and target directories -->\r
                <mx:clean />\r
@@ -107,29 +91,7 @@
                     this file is only used if a local file is not provided. -->\r
                <copy tofile="${project.src.dir}/clientapps.json" overwrite="true"\r
                        file="${project.distrib.dir}/data/clientapps.json" />\r
-               \r
-               <!-- \r
-                       upgrade existing workspace to data directory\r
-                       this code can be eliminated after 1.3.0 release\r
-                -->\r
-               <move todir="${basedir}/data" overwrite="true" failonerror="false">\r
-                       <fileset dir="${basedir}">\r
-                               <include name="users.conf" />\r
-                               <include name="projects.conf" />\r
-                               <include name="gitblit.properties" />\r
-                               <include name="serverKeyStore.jks" />\r
-                               <include name="serverTrustStore.jks" />\r
-                       </fileset>\r
-               </move>\r
-               <move todir="${basedir}/data/certs" overwrite="true" failonerror="false">\r
-                       <fileset dir="${basedir}/certs" />\r
-               </move>\r
-               <move todir="${basedir}/data/git" overwrite="true" failonerror="false">\r
-                       <fileset dir="${basedir}/git" />\r
-               </move>\r
-               <move todir="${basedir}/data/proposals" overwrite="true" failonerror="false">\r
-                       <fileset dir="${basedir}/proposals" />\r
-               </move>\r
+\r
        </target>\r
 \r
 \r
@@ -525,76 +487,7 @@
                <!-- Cleanup -->\r
                <delete file="${project.targetDirectory}/manager.jar" />\r
        </target>\r
-       \r
-       \r
-       <!-- \r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
-               Build the stand-alone, Gitblit Authority\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
-       -->\r
-       <target name="buildAuthority" depends="compile" description="Builds the stand-alone Gitblit Authority">\r
-               <echo>Building Gitblit Authority ${project.version}</echo>\r
 \r
-               <!-- generate jar by traversing the class hierarchy of the specified\r
-                        classes, exclude any classes in "authority" classpath jars -->\r
-               <mx:genjar tag="authority" excludeClasspathJars="true" \r
-                       destfile="${project.targetDirectory}/authority.jar">\r
-                       <resource file="${project.src.dir}/com/gitblit/client/splash.png" />\r
-                       <resource file="${project.resources.dir}/gitblt-favicon.png" />\r
-                       <resource file="${project.resources.dir}/user_16x16.png" />\r
-                       <resource file="${project.resources.dir}/users_16x16.png" />\r
-                       <resource file="${project.resources.dir}/rosette_16x16.png" />\r
-                       <resource file="${project.resources.dir}/rosette_32x32.png" />\r
-                       <resource file="${project.resources.dir}/vcard_16x16.png" />\r
-                       <resource file="${project.resources.dir}/settings_16x16.png" />\r
-                       <resource file="${project.resources.dir}/settings_32x32.png" />\r
-                       <resource file="${project.resources.dir}/search-icon.png" />\r
-                       <resource file="${project.resources.dir}/mail_16x16.png" />\r
-                       <resource file="${project.resources.dir}/script_16x16.png" />\r
-                       <resource file="${project.resources.dir}/blank.png" />\r
-                       <resource file="${project.resources.dir}/bullet_green.png" />\r
-                       <resource file="${project.resources.dir}/bullet_orange.png" />\r
-                       <resource file="${project.resources.dir}/bullet_red.png" />\r
-                       <resource file="${project.resources.dir}/bullet_white.png" />\r
-                       <resource file="${project.resources.dir}/bullet_delete.png" />\r
-                       <resource file="${project.resources.dir}/bullet_key.png" />\r
-                       <resource file="${project.src.dir}/log4j.properties" />\r
-                       <resource>\r
-                               <!-- inlcude all translations -->\r
-                               <fileset dir="${project.src.dir}/com/gitblit/wicket">\r
-                                       <include name="*.properties" />\r
-                               </fileset>\r
-                       </resource>\r
-\r
-                       <mainclass name="com.gitblit.authority.Launcher" />\r
-                       <class name="com.gitblit.Keys" />\r
-                       <manifest>\r
-                               <attribute name="SplashScreen-Image" value="splash.png" />\r
-                       </manifest>\r
-               </mx:genjar>\r
-\r
-               <!-- Build Authority Zip file -->\r
-               <mx:zip destfile="${project.targetDirectory}/${authority.zipfile}">\r
-                       <fileset dir="${basedir}">\r
-                               <include name="LICENSE" />\r
-                               <include name="NOTICE" />\r
-                       </fileset>\r
-                       <fileset dir="${project.targetDirectory}">\r
-                               <include name="authority.jar" />\r
-                       </fileset>\r
-                       <zipfileset dir="${project.distrib.dir}/data" prefix="data">\r
-                               <include name="users.conf" />\r
-                               <include name="gitblit.properties" />\r
-                       </zipfileset>\r
-                       <!-- Gitblit Authority data -->\r
-                       <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />\r
-                       <!-- include "authority" tagged dependencies -->\r
-                       <dependencies prefix="ext" tag="authority" />\r
-               </mx:zip>\r
-                               \r
-               <!-- Cleanup -->\r
-               <delete file="${project.targetDirectory}/authority.jar" />\r
-       </target>\r
                                        \r
        <!-- \r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
@@ -829,7 +722,7 @@
                Build all binaries and site\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <target name="buildAll" depends="buildAuthority,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite" />          \r
+       <target name="buildAll" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite" />         \r
 \r
        \r
        <!--\r
@@ -1180,5 +1073,6 @@
                        <arg value="-DrepositoryId=${project.maven.repo.id}" />\r
                        <arg value="-DcreateChecksum=true" />\r
                </exec>\r
-       </target>                                       \r
+       </target>\r
+       \r
 </project>\r