--- Ice-3.5b/java/build.xml~	2012-12-13 05:15:12.000000000 +0800
+++ Ice-3.5b/java/build.xml	2012-12-16 15:00:21.824998305 +0800
@@ -32,9 +32,6 @@
         </javac>
         <jar jarfile="${lib.dir}/ant-ice.jar" basedir="${lib.dir}/ant">
             <include name="*.class"/>
-            <manifest>
-                <attribute name="Built-By" value="ZeroC, Inc."/>
-            </manifest>
         </jar>
     </target>
 
@@ -653,17 +650,12 @@
     <target name="icegridadmin-plain-jar" depends="icegridadmin-compile, ice-jar, icebox-jar, glacier2-jar, 
                                                    icestorm-jar, icegrid-jar" 
             if="build-icegridadmin-plain-jar" unless="ice.bin.dist">
-        <manifest file="${lib.dir}/icegridgui.mf">
-            <attribute name="Main-Class" value="IceGridGUI.Main"/>
-            <attribute name="Class-Path" value="Ice.jar IceBox.jar Glacier2.jar IceStorm.jar IceGrid.jar ${jgoodies.forms} ${jgoodies.looks} ${jgoodies.common} ../resources/ "/>
-        </manifest>
-        <jar jarfile="${lib.dir}/IceGridGUI.jar" manifest="${lib.dir}/icegridgui.mf" basedir="${lib.dir}">
+        <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="${lib.dir}">
             <include name="IceGridGUI/**"/>
         </jar>
         <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="resources" update="true">
             <include name="icons/**"/>
         </jar>
-        <delete file="${lib.dir}/icegridgui.mf" />
     </target>
 
     <target name="icegridadmin-pro-jar" depends="ice-jar, icebox-jar, glacier2-jar, icestorm-jar, icegrid-jar, 
@@ -761,10 +753,7 @@
 
     <target name="test" depends="test-compile, ice-compile"/>
 
-    <target name="all" depends="jar">
-      <ant inheritAll="false" dir="test"/>
-      <ant inheritAll="false" dir="demo"/>
-    </target>
+    <target name="all" depends="jar"/>
 
     <target name="install-common">
         <mkdir dir="${prefix}"/>