--- build/build.xml.noadmin	2011-09-16 23:27:18.165454850 +0300
+++ build/build.xml	2011-09-16 23:29:55.472149708 +0300
@@ -494,16 +494,6 @@
              outputDir="${jsp-examples.base}/WEB-INF/src"
              javaEncoding="UTF-8" />
 
-    <jasper2
-             package="admin"
-             compile="false"
-             validateXml="false"
-             uriroot="${admin.base}"
-             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-             addWebXmlMappings="true"
-             outputDir="${admin.base}/WEB-INF/src/admin"
-             javaEncoding="UTF-8" />
-
     <javac destdir="${ROOT.base}/WEB-INF/classes"
            optimize="off"
            debug="${compile.debug}"
@@ -560,30 +550,6 @@
       <exclude name="tags/**" />
     </javac>
 
-    <javac destdir="${admin.base}/WEB-INF/classes"
-           optimize="off"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           failonerror="false"
-           srcdir="${admin.base}/WEB-INF/src"
-           excludes="**/*.smap"
-           encoding="UTF-8">
-      <classpath>
-        <pathelement location="${java.home}/../lib/tools.jar"/>
-        <fileset dir="${tomcat.build}/server/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <fileset dir="${admin.base}/WEB-INF/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <fileset dir="${tomcat.build}/common/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <pathelement location="${tomcat.build}/classes"/>
-      </classpath>
-      <include name="admin/**" />
-    </javac>
   </target>
 
   <target name="build-catalina" depends="init" 
@@ -852,8 +818,6 @@
         <property name="flags.hide" value="true" />
     </ant>
 
-    <antcall target="build-admin" />
-
     <ant dir="${catalina.home}/webapps/manager" target="build-main">
         <property name="webapps.build" value="${tomcat.build}/server/webapps" />
         <property name="classes.dir" value="${tomcat.build}/classes" />
@@ -906,13 +870,6 @@
         filtering="true" encoding="ISO-8859-1" />
 
     <!-- Build JARs for webapps classes -->
-    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar">
-       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
-          <include name="**/*.class" />
-          <include name="**/*.properties" />
-       </fileset>
-    </jar>
     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar">
        <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
@@ -947,9 +904,7 @@
          todir="${tomcat.build}/conf/Catalina/localhost" />
     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
          todir="${tomcat.build}/conf/Catalina/localhost" />
-    <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
-         todir="${tomcat.build}/conf/Catalina/localhost" />
-
+    
   </target>
 
   <!-- ====================== Embed target =================== -->