changeset in /hg/icedtea6: Add netscape.* classes to rt.jar when...
Deepak Bhole
dbhole at redhat.com
Wed Nov 5 19:52:22 PST 2008
changeset 6c81f8c8aab3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6c81f8c8aab3
description:
Add netscape.* classes to rt.jar when building with an alternate jar application.
diffstat:
2 files changed, 63 insertions(+), 43 deletions(-)
ChangeLog | 5 +
patches/icedtea-copy-plugs.patch | 101 +++++++++++++++++++++-----------------
diffs (170 lines):
diff -r 4fbf310e08a0 -r 6c81f8c8aab3 ChangeLog
--- a/ChangeLog Wed Nov 05 16:23:59 2008 -0500
+++ b/ChangeLog Wed Nov 05 22:51:47 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-05 Deepak Bhole <dbhole at redhat
+2008-11-05 Deepak Bhole <dbhole at redhat.com>
+
+ * patches/icedtea-copy-plugs.patch: Add netscape.* classes to rt.jar when
+ building with an alternate jar application.
+
2008-11-05 Deepak Bhole <dbhole at redhat.com>
* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Correct
diff -r 4fbf310e08a0 -r 6c81f8c8aab3 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch Wed Nov 05 16:23:59 2008 -0500
+++ b/patches/icedtea-copy-plugs.patch Wed Nov 05 22:51:47 2008 -0500
@@ -1,41 +1,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
-diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2007-10-12 04:01:56.000000000 -0400
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2007-10-12 17:17:28.000000000 -0400
-@@ -78,6 +78,9 @@
- */
- public long timeStamp ;
-
-+ // TODO: IcedTea: I am a stub.
-+ static public int trapAuthenticationFailure = 0;
-+
-
-
- /**
---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2008-02-14 16:23:01.000000000 -0500
-+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2008-02-14 16:22:15.000000000 -0500
-@@ -1628,7 +1628,7 @@
- }
-
- private static String[] getAnnotationValue(Constructor<?> constructor) {
-- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
-+ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
- return (annotation != null)
- ? annotation.value()
- : null;
---- penjdk6/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-02-12 04:05:12.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-02-14 17:27:39.000000000 -0500
-@@ -1154,7 +1154,7 @@
- Set<BitSet> getterIndexSets = newSet();
- for (Constructor<?> constr : annotatedConstrList) {
- String[] propertyNames =
-- constr.getAnnotation(propertyNamesClass).value();
-+ ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
-
- Type[] paramTypes = constr.getGenericParameterTypes();
- if (paramTypes.length != propertyNames.length) {
---- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig 2008-05-30 09:50:36.000000000 +0200
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-06-01 23:18:11.000000000 +0200
-@@ -49,33 +49,30 @@
+diff -urN openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk
+--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-08-28 04:10:47.000000000 -0400
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-11-05 17:20:46.000000000 -0500
+@@ -49,33 +49,32 @@
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
com/sun/jmx/snmp/SnmpDefinitions.class \
com/sun/jmx/snmp/SnmpOid.class \
@@ -72,13 +38,15 @@ diff -urN openjdk.orig/jdk/src/share/cla
+
+PLUG_NETX_CLASS_NAMES = net
+
++PLUG_NETSCAPE_CLASS_NAMES = netscape
++
PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
-PLUG_CLASS_AREAS = jmf
-+PLUG_CLASS_AREAS = jmf gnu javax netx
++PLUG_CLASS_AREAS = jmf gnu javax netx netscape
PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
# Create jargs file command
-@@ -93,11 +90,32 @@
+@@ -93,11 +92,39 @@
@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
$(ECHO) "$$i" >> $@; \
done
@@ -97,6 +65,11 @@ diff -urN openjdk.orig/jdk/src/share/cla
+ @for i in $(PLUG_NETX_CLASS_NAMES) ; do \
+ $(ECHO) "$$i" >> $@ ; \
+ done
++$(PLUG_TEMPDIR)/netscape.clist:
++ @$(prep-target)
++ @for i in $(PLUG_NETSCAPE_CLASS_NAMES) ; do \
++ $(ECHO) "$$i" >> $@ ; \
++ done
$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
@$(prep-target)
$(CAT) $(PLUG_CLISTS) > $@
@@ -108,10 +81,12 @@ diff -urN openjdk.orig/jdk/src/share/cla
+ $(plug-create-jargs)
+$(PLUG_TEMPDIR)/netx.jargs: $(PLUG_TEMPDIR)/netx.clist
+ $(plug-create-jargs)
++$(PLUG_TEMPDIR)/netscape.jargs: $(PLUG_TEMPDIR)/netscape.clist
++ $(plug-create-jargs)
$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
$(plug-create-jargs)
-@@ -125,9 +143,9 @@
+@@ -125,9 +152,9 @@
# Import classes command
define import-binary-plug-classes
@@ -123,7 +98,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
endef # import-binary-plug-classes
else # IMPORT_BINARY_PLUGS
-@@ -153,11 +171,20 @@
+@@ -153,11 +180,23 @@
import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
@@ -133,6 +108,8 @@ diff -urN openjdk.orig/jdk/src/share/cla
+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/javax.clist)
+import-binary-plug-netx-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/netx.clist
+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/netx.clist)
++import-binary-plug-netscape-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/netscape.clist
++ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/netscape.clist)
# Import all classes from the jar file
@@ -141,7 +118,45 @@ diff -urN openjdk.orig/jdk/src/share/cla
+ import-binary-plug-jmf-classes \
+ import-binary-plug-gnu-classes \
+ import-binary-plug-javax-classes \
-+ import-binary-plug-netx-classes
++ import-binary-plug-netx-classes \
++ import-binary-plug-netscape-classes
# Binary plug start/complete messages
+diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-08-28 04:12:12.000000000 -0400
++++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-11-05 17:18:36.000000000 -0500
+@@ -1154,7 +1154,7 @@
+ Set<BitSet> getterIndexSets = newSet();
+ for (Constructor<?> constr : annotatedConstrList) {
+ String[] propertyNames =
+- constr.getAnnotation(propertyNamesClass).value();
++ ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
+
+ Type[] paramTypes = constr.getGenericParameterTypes();
+ if (paramTypes.length != propertyNames.length) {
+diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-08-28 04:12:14.000000000 -0400
++++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-11-05 17:18:36.000000000 -0500
+@@ -78,6 +78,9 @@
+ */
+ public long timeStamp ;
+
++ // TODO: IcedTea: I am a stub.
++ static public int trapAuthenticationFailure = 0;
++
+
+
+ /**
+diff -urN openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
+--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2008-08-28 04:12:48.000000000 -0400
++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2008-11-05 17:18:36.000000000 -0500
+@@ -1628,7 +1628,7 @@
+ }
+
+ private static String[] getAnnotationValue(Constructor<?> constructor) {
+- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
++ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
+ return (annotation != null)
+ ? annotation.value()
+ : null;
More information about the distro-pkg-dev
mailing list