zeroc-ice (3.3.1-12) 10-java-policy.patch

Proguard ant task is not available in /usr/share/ant any more.  Now we must
specify the classpath to the proguard.jar library.

diff -Nur -x '*.orig' -x '*~' zeroc-ice/java/build.xml zeroc-ice.new/java/build.xml
--- zeroc-ice/java/build.xml	2009-03-29 11:06:22.835084655 +0200
+++ zeroc-ice.new/java/build.xml	2009-10-30 12:57:36.934244710 +0100
@@ -191,7 +191,7 @@
             <exclude name="*.jar"/>
             <manifest>
                 <attribute name="Built-By" value="ZeroC, Inc."/>
-                <attribute name="Class-Path" value="db.jar db-${db.version}.jar /usr/share/java/db-${db.version}.jar ../db.jar"/>
+                <attribute name="Class-Path" value="db.jar db-${db.version}.jar /usr/share/java/libdb4.8-java.jar ../db.jar"/>
             </manifest>
         </jar>
     </target>
@@ -206,7 +206,6 @@
 
     <condition property="build-icegridadmin-pro-jar">
         <and>
-            <available classname="proguard.ant.ProGuardTask" classpath="${env.CLASSPATH}" />
             <available file="${jgoodies.looks}" />
             <available file="${jgoodies.forms}" />
             <not><isset property="java2"/></not>
@@ -269,7 +268,7 @@
             <include name="icons/**"/>
         </jar>
         <delete file="${lib.dir}/icegridgui.mf" />
-        <taskdef resource="proguard/ant/task.properties"/>
+        <taskdef resource="proguard/ant/task.properties" classpath="/usr/share/java/proguard.jar"/>
 
         <proguard>
              -injars ${lib.dir}/IceGridGUItemp.jar
@@ -289,15 +288,22 @@
     <target name="jar" depends="ice-jar, icegridadmin-plain-jar, icegridadmin-pro-jar"/>
 
     <target name="all" depends="jar">
+<!--
         <ant inheritAll="false" dir="demo"/>
         <ant inheritAll="false" dir="test"/>
+-->
     </target>
 
     <target name="install-common">
         <mkdir dir="${prefix}"/>
-        <mkdir dir="${prefix}/lib"/>
+        <mkdir dir="${prefix}/share"/>
+        <mkdir dir="${prefix}/share/java"/>
+        <mkdir dir="${prefix}/share/ant"/>
+        <mkdir dir="${prefix}/share/ant/lib"/>
+<!--
         <copy file="${ice.dir}/LICENSE" todir="${prefix}"/>
         <copy file="${ice.dir}/ICE_LICENSE" todir="${prefix}"/>
+-->
     </target>
 
     <condition property="slice-installed">
@@ -314,24 +320,24 @@
     </target>
 
     <target name="install-icegridgui-jar" unless="java2">
-        <mkdir dir="${prefix}/help"/>
-        <copy file="${lib.dir}/IceGridGUI.jar" todir="${prefix}/lib"/>
-        <copy todir="${prefix}/help">
+        <mkdir dir="${prefix}/share/help"/>
+        <copy file="${lib.dir}/IceGridGUI.jar" todir="${prefix}/share/java"/>
+        <copy todir="${prefix}/share/help">
             <fileset dir="resources" includes="IceGridAdmin/**"/>
         </copy>
     </target>
 
     <target name="install-jar" unless="java2">
-        <copy file="${lib.dir}/Ice.jar" todir="${prefix}/lib"/>
+        <copy file="${lib.dir}/Ice.jar" todir="${prefix}/share/java"/>
     </target>
 
     <target name="install-java2-jar" if="java2">
-        <mkdir dir="${prefix}/lib/java2"/>
-        <copy file="${lib.dir}/Ice.jar" todir="${prefix}/lib/java2"/>
+        <mkdir dir="${prefix}/share/java/java2"/>
+        <copy file="${lib.dir}/Ice.jar" todir="${prefix}/share/java/java2"/>
     </target>
 
     <target name="install-tasks">
-        <copy file="${lib.dir}/ant-ice.jar" todir="${prefix}/lib"/>
+        <copy file="${lib.dir}/ant-ice.jar" todir="${prefix}/share/ant/lib"/>
     </target>
 
     <target name="install" depends="jar, install-common, install-jar, install-java2-jar, install-icegridgui-jar, install-tasks, install-slice">
diff -Nur -x '*.orig' -x '*~' zeroc-ice/java/config/build.properties zeroc-ice.new/java/config/build.properties
--- zeroc-ice/java/config/build.properties	2009-03-29 11:06:22.835084655 +0200
+++ zeroc-ice.new/java/config/build.properties	2009-10-30 12:36:49.622776408 +0100
@@ -36,7 +36,7 @@
 # These properties only need to be set if you want to build the
 # standalone jar for the IceGrid GUI.
 #
-jgoodies.forms  = /usr/share/java/forms-1.2.0.jar
-jgoodies.looks  = /usr/share/java/looks-2.1.4.jar
+jgoodies.forms  = /usr/share/java/forms.jar
+jgoodies.looks  = /usr/share/java/looks.jar
 #jgoodies.forms = C:/Ice-3.3.1-ThirdParty-VC80/lib/forms-1.2.0.jar
 #jgoodies.looks = C:/Ice-3.3.1-ThirdParty-VC80/lib/looks-2.1.4.jar
diff -Nur -x '*.orig' -x '*~' zeroc-ice/java/config/icegridgui.pro zeroc-ice.new/java/config/icegridgui.pro
--- zeroc-ice/java/config/icegridgui.pro	2009-03-29 11:06:22.838315162 +0200
+++ zeroc-ice.new/java/config/icegridgui.pro	2009-10-30 12:36:49.622776408 +0100
@@ -64,7 +64,6 @@
 -keep class IceInternal.SelectorHandler
 -keep class com.jgoodies.looks.plastic.PlasticXPLookAndFeel
 -keep class com.jgoodies.looks.plastic.PlasticFieldCaret
--keep class com.jgoodies.looks.windows.WindowsFieldCaret 
 -keep public class javax.**
 -keep interface javax.**
 -keep class * implements javax.**
diff -Nur -x '*.orig' -x '*~' zeroc-ice/java/src/IceGridGUI/ApplicationPane.java zeroc-ice.new/java/src/IceGridGUI/ApplicationPane.java
--- zeroc-ice/java/src/IceGridGUI/ApplicationPane.java	2009-03-29 11:06:22.838315162 +0200
+++ zeroc-ice.new/java/src/IceGridGUI/ApplicationPane.java	2009-10-30 12:36:49.622776408 +0100
@@ -28,7 +28,6 @@
 
 import com.jgoodies.looks.Options;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
 import com.jgoodies.forms.factories.Borders;
 
 import IceGrid.*;