1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
|
--- a/java/src/IceGridGUI/ApplicationPane.java
+++ b/java/src/IceGridGUI/ApplicationPane.java
@@ -29,7 +29,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.*;
--- a/java/build.xml
+++ b/java/build.xml
@@ -26,7 +26,7 @@
<!-- This target cannot depend on init because the tasks may not be compiled yet -->
<target name="tasks" depends="config-init" unless="ice.bin.dist">
<mkdir dir="${lib.dir}/ant"/>
- <javac srcdir="${src.dir}/ant" destdir="${lib.dir}/ant" source="1.6" target="1.6" includes="**"
+ <javac srcdir="${src.dir}/ant" destdir="${lib.dir}/ant" source="1.6" target="1.6" includes="**"
deprecation="on">
<compilerarg value="${javac.lint}"/>
</javac>
@@ -263,6 +263,7 @@
<include name="Freeze/MapInternal/*.class"/>
<manifest>
<attribute name="Built-By" value="ZeroC, Inc."/>
+ <attribute name="Class-Path" value="/usr/share/java/db.jar"/>
</manifest>
</jar>
<jar jarfile="${lib.dir}/${freeze.jar.name}" basedir="${src.dir}" update="yes">
@@ -280,7 +281,7 @@
<depend srcdir=".:${src.dir}:${generated.dir}:${generated.test.dir}" destdir="${lib.dir}" cache="${cache.dir}">
<include name="Glacier2/**"/>
</depend>
- <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
+ <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
deprecation="on">
<include name="Glacier2/**"/>
<compilerarg value="${javac.lint}"/>
@@ -308,7 +309,7 @@
<depend srcdir=".:${src.dir}:${generated.dir}:${generated.test.dir}" destdir="${lib.dir}" cache="${cache.dir}">
<include name="IceBox/**"/>
</depend>
- <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
+ <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
deprecation="on">
<include name="IceBox/**"/>
<compilerarg value="${javac.lint}"/>
@@ -336,7 +337,7 @@
<depend srcdir=".:${src.dir}:${generated.dir}:${generated.test.dir}" destdir="${lib.dir}" cache="${cache.dir}">
<include name="IceStorm/**"/>
</depend>
- <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
+ <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
deprecation="on">
<include name="IceStorm/**"/>
<compilerarg value="${javac.lint}"/>
@@ -364,7 +365,7 @@
<depend srcdir=".:${src.dir}:${generated.dir}:${generated.test.dir}" destdir="${lib.dir}" cache="${cache.dir}">
<include name="IceGrid/**"/>
</depend>
- <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
+ <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
deprecation="on">
<include name="IceGrid/**"/>
<compilerarg value="${javac.lint}"/>
@@ -392,7 +393,7 @@
<depend srcdir=".:${src.dir}:${generated.dir}:${generated.test.dir}" destdir="${lib.dir}" cache="${cache.dir}">
<include name="IcePatch2/**"/>
</depend>
- <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
+ <javac srcdir="${src.dir}:${generated.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
deprecation="on">
<include name="IcePatch2/**"/>
<compilerarg value="${javac.lint}"/>
@@ -537,7 +538,7 @@
</fileset>
</slice2java>
- <slice2java checksum="test.Ice.checksum.Test.SliceChecksums" outputdir="${generated.test.dir}"
+ <slice2java checksum="test.Ice.checksum.Test.SliceChecksums" outputdir="${generated.test.dir}"
dependencyfile="${generated.test.dir}/.depend.Test">
<includepath>
<pathelement path="${slice.dir}" />
@@ -560,7 +561,7 @@
</fileset>
</slice2java>
- <slice2java checksum="test.Ice.checksum.server.Test.SliceChecksums" outputdir="${generated.test.dir}"
+ <slice2java checksum="test.Ice.checksum.server.Test.SliceChecksums" outputdir="${generated.test.dir}"
dependencyfile="${generated.test.dir}/.depend.Test">
<includepath>
<pathelement path="${slice.dir}" />
@@ -572,7 +573,7 @@
</slice2java>
</target>
- <target name="test-compile" depends="ice-compile, freeze-compile, glacier2-compile, icebox-compile,
+ <target name="test-compile" depends="ice-compile, freeze-compile, glacier2-compile, icebox-compile,
icestorm-compile, icegrid-compile, test-generate">
<mkdir dir="${lib.dir}"/>
<mkdir dir="${cache.dir}"/>
@@ -585,7 +586,7 @@
<exclude name="test/Ice/translator/"/>
<exclude name="test/Slice/generation/"/>
</depend>
- <javac srcdir=".:${generated.test.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
+ <javac srcdir=".:${generated.test.dir}" destdir="${lib.dir}" source="1.6" target="1.6" debug="${debug}"
deprecation="on" fork="true" memoryinitialsize="256m" memorymaximumsize="512m">
<exclude name="${generated.test.dir}/**"/>
<classpath>
@@ -605,7 +606,7 @@
<compilerarg value="${javac.lint}"/>
</javac>
</target>
-
+
<target name="test-plugins-jar" depends="test-compile,freeze-jar">
<jar jarfile="${lib.dir}/IceTestPlugins.jar" basedir="${lib.dir}">
<include name="test/Ice/plugin/plugins/**"/>
@@ -633,9 +634,9 @@
<jar jarfile="${lib.dir}/IceAndroidTest.jar" basedir="${lib.dir}">
<include name="test/Ice/**"/>
<include name="test/Util/**"/>
- <!--
+ <!--
Don't include some tests that aren't supported in Android, see comments
- in test/android/src/com/zeroc/testsuite/TestApp.java for details on
+ in test/android/src/com/zeroc/testsuite/TestApp.java for details on
non supported tests.
-->
<exclude name="test/Ice/background/**"/>
@@ -696,9 +697,9 @@
</and>
</condition>
- <target name="icegridadmin-plain-jar"
- depends="icegridadmin-compile, icegridadmin-compile-javafx, ice-jar, icebox-jar,
- glacier2-jar, icestorm-jar, icegrid-jar"
+ <target name="icegridadmin-plain-jar"
+ depends="icegridadmin-compile, icegridadmin-compile-javafx, 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"/>
@@ -713,11 +714,11 @@
<delete file="${lib.dir}/icegridgui.mf" />
</target>
- <target name="icegridadmin-pro-jar"
- depends="ice-jar, icebox-jar, glacier2-jar, icestorm-jar, icegrid-jar, icegridadmin-compile,
+ <target name="icegridadmin-pro-jar"
+ depends="ice-jar, icebox-jar, glacier2-jar, icestorm-jar, icegrid-jar, icegridadmin-compile,
icegridadmin-compile-javafx"
if="build-icegridadmin-pro-jar" unless="ice.bin.dist">
-
+
<condition property="library.jarfiles" value="vm.jar,rt.jar,security.jar,beans.jar,java.util.jar,ibmjssefw.jar,ibmcertpathfw.jar,logging.jar,jlm.jar,annotation.jar,jndi.jar">
<!-- Library jar files for IBM J9 (from SuSE Linux i586) -->
<and>
@@ -734,7 +735,7 @@
<equals arg1="${os.arch}" arg2="amd64"/>
</and>
</condition>
-
+
<condition property="library.jarfiles" value="rt.jar,jsse.jar,jfxrt.jar">
<and>
<isset property="javafx-available"/>
@@ -745,7 +746,7 @@
<condition property="library.jarfiles" value="rt.jar,jsse.jar">
<not><isset property="library.jarfiles"/></not>
</condition>
-
+
<pathconvert property="library.jars">
<filelist dir="${java.home}/lib" files="${library.jarfiles}"/>
<mapper>
@@ -763,7 +764,7 @@
<include name="metrics.cfg"/>
</jar>
- <taskdef resource="proguard/ant/task.properties"/>
+ <taskdef resource="proguard/ant/task.properties" classpath="/usr/share/java/proguard.jar"/>
<proguard>
-injars "${lib.dir}/IceGridGUItemp.jar"
@@ -791,8 +792,8 @@
<manifest file="${lib.dir}/icegridgui.mf">
<attribute name="Main-Class" value="IceGridGUI.Main"/>
</manifest>
- <jar jarfile="${lib.dir}/${icegridgui.jar.name}"
- manifest="${lib.dir}/icegridgui.mf"
+ <jar jarfile="${lib.dir}/${icegridgui.jar.name}"
+ manifest="${lib.dir}/icegridgui.mf"
basedir="${lib.dir}/tmp" update="true">
<include name="**"/>
</jar>
@@ -811,8 +812,8 @@
<delete file="${lib.dir}/${icegridgui.jar.name}"/>
<delete dir="${lib.dir}/tmp/META-INF"/>
- <fx:application id="IceGridGUI" name="IceGrid Admin"
- mainClass="IceGridGUI.Main"
+ <fx:application id="IceGridGUI" name="IceGrid Admin"
+ mainClass="IceGridGUI.Main"
fallbackClass="IceGridGUI.Fallback"
toolkit="swing"/>
@@ -822,7 +823,7 @@
<fx:jar destfile="${lib.dir}/dist/${icegridgui.jar.name}">
<!-- Details about application -->
<fx:application refid="IceGridGUI"/>
-
+
<!-- Define what auxilary resources are needed -->
<fx:resources refid="IceGridGUI.resources"/>
@@ -845,10 +846,10 @@
<copy file="${lib.dir}/dist/${icegridgui.jar.name}" todir="${lib.dir}"/>
<delete dir="${lib.dir}/tmp"/>
<delete dir="${lib.dir}/dist"/>
-
- <!-- Update Jar manifest to use our MainProxy class instead of
+
+ <!-- Update Jar manifest to use our MainProxy class instead of
com.javafx.main.Main -->
-
+
<jar file="${lib.dir}/${icegridgui.jar.name}" update="yes">
<manifest>
<attribute name="Built-By" value="ZeroC, Inc."/>
@@ -865,7 +866,7 @@
</and>
</condition>
- <target name="icegridadmin-bundle" depends="icegridadmin-pro-jar, icegridadmin-javafx-jar"
+ <target name="icegridadmin-bundle" depends="icegridadmin-pro-jar, icegridadmin-javafx-jar"
if="build-icegridadmin-bundle">
<!-- AppBundleTask available at http://java.net/projects/appbundler -->
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"/>
@@ -887,27 +888,27 @@
</bundleapp>
</target>
- <target name="compile" depends="ice-compile, icebox-compile, glacier2-compile, icestorm-compile, icegrid-compile,
+ <target name="compile" depends="ice-compile, icebox-compile, glacier2-compile, icestorm-compile, icegrid-compile,
freeze-compile, icepatch2-compile, icegridadmin-compile"/>
- <target name="dist-jar"
+ <target name="dist-jar"
depends="ice-jar, icebox-jar, glacier2-jar, icestorm-jar, icegrid-jar, freeze-jar, icepatch2-jar,
icegridadmin-plain-jar, icegridadmin-pro-jar, icegridadmin-javafx-jar, icegridadmin-bundle"/>
- <target name="jar" depends="dist-jar, test-jar, test-android-jar"/>
+ <target name="jar" depends="dist-jar"/>
<target name="test" depends="test-compile, ice-compile"/>
<target name="all" depends="jar">
- <ant inheritAll="false" dir="test"/>
- <ant inheritAll="false" dir="demo"/>
+ <!-- <ant inheritAll="false" dir="test"/> -->
+ <!-- <ant inheritAll="false" dir="demo"/> -->
</target>
<target name="install-common">
<mkdir dir="${DESTDIR}${prefix}"/>
<mkdir dir="${DESTDIR}${install_libdir}"/>
- <copy file="${ice.dir}/LICENSE${text.extension}" todir="${DESTDIR}${prefix}"/>
- <copy file="${ice.dir}/ICE_LICENSE${text.extension}" todir="${DESTDIR}${prefix}"/>
+ <!-- <copy file="${ice.dir}/LICENSE${text.extension}" todir="${DESTDIR}${prefix}"/> -->
+ <!-- <copy file="${ice.dir}/ICE_LICENSE${text.extension}" todir="${DESTDIR}${prefix}"/> -->
</target>
<condition property="slice-installed">
@@ -948,7 +949,7 @@
<copy file="${lib.dir}/${ant-ice.jar.name}" todir="${DESTDIR}${install_libdir}"/>
</target>
- <target name="install" depends="dist-jar, install-common, install-jar, install-tasks,
+ <target name="install" depends="dist-jar, install-common, install-jar, install-tasks,
install-slice, install-icegridgui-bundle">
</target>
@@ -957,8 +958,8 @@
<delete dir="${generated.test.dir}"/>
<delete deleteonexit="true" dir="${lib.dir}"/>
<delete dir="${cache.dir}"/>
- <ant inheritAll="false" dir="demo" target="clean"/>
- <ant inheritAll="false" dir="test" target="clean"/>
+ <!-- <ant inheritAll="false" dir="demo" target="clean"/> -->
+ <!-- <ant inheritAll="false" dir="test" target="clean"/> -->
</target>
</project>
--- a/java/config/build.properties
+++ b/java/config/build.properties
@@ -67,3 +67,6 @@
#jgoodies.common = /usr/share/java/jgoodies-common-${jgoodies-common.version}.jar
#jgoodies.forms = /usr/share/java/jgoodies-forms-${jgoodies-forms.version}.jar
#jgoodies.looks = /usr/share/java/jgoodies-looks-${jgoodies-looks.version}.jar
+jgoodies.common = /usr/share/java/jgoodies-common.jar
+jgoodies.forms = /usr/share/java/forms.jar
+jgoodies.looks = /usr/share/java/looks.jar
--- a/java/config/icegridgui.pro
+++ b/java/config/icegridgui.pro
@@ -12,7 +12,7 @@
public static void main(java.lang.String[]);
}
-# Following options are useful for debugging.
+# Following options are useful for debugging.
# -printseeds
# -verbose
@@ -48,7 +48,7 @@
java.lang.Object readResolve();
}
-# Your application may contain more items that need to be preserved;
+# Your application may contain more items that need to be preserved;
# typically classes that are dynamically created using Class.forName:
-keep public class Ice.** {
@@ -63,7 +63,6 @@
-keep interface IceGrid.**
-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.**
|
