Attachment #157813 for bug #159780




                 if (paramTypes.length != propertyNames.length) {
--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-28 04:39:40.000000000 -0500
+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-29 14:28:47.000000000 -0500
@@ -49,33 +49,30 @@
 com/sun/jmx/snmp/SnmpDataTypeEnums.class \
 com/sun/jmx/snmp/SnmpDefinitions.class \
 com/sun/jmx/snmp/SnmpOid.class \

 com/sun/jmx/snmp/SnmpParameters.class \
 com/sun/jmx/snmp/SnmpPduPacket.class \
 com/sun/jmx/snmp/SnmpPeer.class \
+com/sun/jmx/snmp/SnmpSession.class \
 com/sun/jmx/snmp/SnmpTimeticks.class \
 com/sun/jmx/snmp/SnmpVarBind.class \
 com/sun/jmx/snmp/SnmpVarBindList.class \

-com/sun/jmx/snmp/daemon/WaitQ.class
+com/sun/jmx/snmp/daemon/SnmpSession.class
 
 PLUG_SOUND_CLASS_NAMES = \
 com/sun/media/sound/AbstractPlayer.class \
@@ -128,8 +119,14 @@
 
 # Class list temp files (used by both import and export of plugs)
 
+PLUG_GNU_CLASS_NAMES = gnu

+PLUG_NETX_CLASS_NAMES = net
+
 PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
-PLUG_CLASS_AREAS = jmf
+PLUG_CLASS_AREAS = jmf gnu javax netx
 PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
 
 # Create jargs file command
@@ -93,11 +90,32 @@
 	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
 	  $(ECHO) "$$i" >> $@; \
 	done
+$(PLUG_TEMPDIR)/gnu.clist:
+	@$(prep-target)

 $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
 	@$(prep-target)
 	$(CAT) $(PLUG_CLISTS) > $@
 $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
 	$(plug-create-jargs)
 $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
 	$(plug-create-jargs)
+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
+	$(plug-create-jargs)

 $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
 	$(plug-create-jargs)
 
@@ -125,9 +143,9 @@
 # Import classes command
 
 define import-binary-plug-classes

 endef # import-binary-plug-classes
 
 else # IMPORT_BINARY_PLUGS
@@ -153,11 +171,20 @@
 
 import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
 import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
+	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
+import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist

 # Import all classes from the jar file
 
 import-binary-plug-jar: \
-	     import-binary-plug-jmf-classes
+	     import-binary-plug-jmf-classes \
+	     import-binary-plug-sound-classes \
+	     import-binary-plug-gnu-classes \
+	     import-binary-plug-javax-classes \
+	     import-binary-plug-netx-classes
 
 # Binary plug start/complete messages
 

Lines 1-33 Link Here

(-)patches/icedtea-gervill.patch
1	# Adds the provides defined by gervill (and removes non-existing ones).	1	# Adds the provides defined by gervill (and removes non-existing ones).
2	# Gervill can be found in the overlays under	2	# Gervill can be found in the overlays under
3	# openjdk/jdk/src/share/classes/com/sun/media/sound	3	# openjdk/jdk/src/share/classes/com/sun/media/sound




OPENJDK_DATE = 30_may_2008
OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
OPENJDK_VERSION = b10

if NETX_PLUGIN
NETX_PATCH = patches/icedtea-netx-plugin.patch

	patches/icedtea-zero-build.patch \
	patches/icedtea-print-lsb-release.patch \
	patches/icedtea-jpegclasses.patch \
	patches/icedtea-xinerama.patch \
	patches/icedtea-arm-uname.patch \
	patches/icedtea-ia64-fdlibm.patch \
	patches/icedtea-LCMS-setTagData.patch \
	patches/icedtea-color-createcontext.patch \
	patches/icedtea-color-profiles.patch \
	patches/icedtea-fonts.patch \
	patches/icedtea-gervill.patch \
	patches/icedtea-directaudio-close-trick.patch \
	patches/icedtea-hat-spl-gpl.patch \
	patches/icedtea-sparc.patch \
	patches/icedtea-override-redirect-metacity.patch \
	$(GCC_PATCH) \

Return to bug 159780

Lines 35-41 Link Here

(-)patches/icedtea-copy-plugs.patch (-23 / +16 lines)
35	if (paramTypes.length != propertyNames.length) {	35	if (paramTypes.length != propertyNames.length) {
36	--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-28 04:39:40.000000000 -0500	36	--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-28 04:39:40.000000000 -0500
37	+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-29 14:28:47.000000000 -0500	37	+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-29 14:28:47.000000000 -0500
38	@@ -51,28 +51,19 @@	38	@@ -49,33 +49,30 @@
39	com/sun/jmx/snmp/SnmpDataTypeEnums.class \	39	com/sun/jmx/snmp/SnmpDataTypeEnums.class \
40	com/sun/jmx/snmp/SnmpDefinitions.class \	40	com/sun/jmx/snmp/SnmpDefinitions.class \
41	com/sun/jmx/snmp/SnmpOid.class \	41	com/sun/jmx/snmp/SnmpOid.class \
Lines 47-53 Link Here
47	com/sun/jmx/snmp/SnmpParameters.class \	47	com/sun/jmx/snmp/SnmpParameters.class \
48	com/sun/jmx/snmp/SnmpPduPacket.class \	48	com/sun/jmx/snmp/SnmpPduPacket.class \
49	com/sun/jmx/snmp/SnmpPeer.class \	49	com/sun/jmx/snmp/SnmpPeer.class \
50	+rt/com/sun/jmx/snmp/SnmpSession.class \	50	+com/sun/jmx/snmp/SnmpSession.class \
51	com/sun/jmx/snmp/SnmpTimeticks.class \	51	com/sun/jmx/snmp/SnmpTimeticks.class \
52	com/sun/jmx/snmp/SnmpVarBind.class \	52	com/sun/jmx/snmp/SnmpVarBind.class \
53	com/sun/jmx/snmp/SnmpVarBindList.class \	53	com/sun/jmx/snmp/SnmpVarBindList.class \
Lines 64-73 Link Here
64	-com/sun/jmx/snmp/daemon/WaitQ.class	64	-com/sun/jmx/snmp/daemon/WaitQ.class
65	+com/sun/jmx/snmp/daemon/SnmpSession.class	65	+com/sun/jmx/snmp/daemon/SnmpSession.class
66		66
67	PLUG_SOUND_CLASS_NAMES = \
68	com/sun/media/sound/AbstractPlayer.class \
69	@@ -128,8 +119,14 @@
70
71	# Class list temp files (used by both import and export of plugs)	67	# Class list temp files (used by both import and export of plugs)
72		68
73	+PLUG_GNU_CLASS_NAMES = gnu	69	+PLUG_GNU_CLASS_NAMES = gnu
Lines 77-90 Link Here
77	+PLUG_NETX_CLASS_NAMES = net	73	+PLUG_NETX_CLASS_NAMES = net
78	+	74	+
79	PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs	75	PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
80	-PLUG_CLASS_AREAS = jmf sound	76	-PLUG_CLASS_AREAS = jmf
81	+PLUG_CLASS_AREAS = jmf sound gnu javax netx	77	+PLUG_CLASS_AREAS = jmf gnu javax netx
82	PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)	78	PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
83		79
84	# Create jargs file command	80	# Create jargs file command
85	@@ -152,6 +149,21 @@	81	@@ -93,11 +90,32 @@
86	@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \	82	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
87	$(ECHO) "$$i" >> $@ ; \	83	$(ECHO) "$$i" >> $@; \
88	done	84	done
89	+$(PLUG_TEMPDIR)/gnu.clist:	85	+$(PLUG_TEMPDIR)/gnu.clist:
90	+ @$(prep-target)	86	+ @$(prep-target)
Lines 104-112 Link Here
104	$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)	100	$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
105	@$(prep-target)	101	@$(prep-target)
106	$(CAT) $(PLUG_CLISTS) > $@	102	$(CAT) $(PLUG_CLISTS) > $@
107	@@ -159,6 +171,12 @@	103	$(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
108	$(plug-create-jargs)
109	$(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
110	$(plug-create-jargs)	104	$(plug-create-jargs)
111	+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist	105	+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
112	+ $(plug-create-jargs)	106	+ $(plug-create-jargs)
Lines 117-123 Link Here
117	$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist	111	$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
118	$(plug-create-jargs)	112	$(plug-create-jargs)
119		113
120	@@ -188,9 +206,9 @@	114	@@ -125,9 +143,9 @@
121	# Import classes command	115	# Import classes command
122		116
123	define import-binary-plug-classes	117	define import-binary-plug-classes
Lines 129-138 Link Here
129	endef # import-binary-plug-classes	123	endef # import-binary-plug-classes
130		124
131	else # IMPORT_BINARY_PLUGS	125	else # IMPORT_BINARY_PLUGS
132	@@ -220,12 +238,21 @@	126	@@ -153,11 +171,20 @@
		127
		128	import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
133	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)	129	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
134	import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
135	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
136	+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist	130	+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
137	+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)	131	+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
138	+import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist	132	+import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
Lines 143-154 Link Here
143	# Import all classes from the jar file	137	# Import all classes from the jar file
144		138
145	import-binary-plug-jar: \	139	import-binary-plug-jar: \
146	import-binary-plug-jmf-classes \	140	- import-binary-plug-jmf-classes
147	- import-binary-plug-sound-classes	141	+ import-binary-plug-jmf-classes \
148	+ import-binary-plug-sound-classes \
149	+ import-binary-plug-gnu-classes \	142	+ import-binary-plug-gnu-classes \
150	+ import-binary-plug-javax-classes \	143	+ import-binary-plug-javax-classes \
151	+ import-binary-plug-netx-classes \	144	+ import-binary-plug-netx-classes
152		145
153	# Import native libraries	146	# Binary plug start/complete messages
154		147

Lines 1-6 Link Here

(-)Makefile.am.orig (-6 / +3 lines)
1	OPENJDK_DATE = 11_apr_2008	1	OPENJDK_DATE = 30_may_2008
2	OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c	2	OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
3	OPENJDK_VERSION = b09	3	OPENJDK_VERSION = b10
4		4
5	if NETX_PLUGIN	5	if NETX_PLUGIN
6	NETX_PATCH = patches/icedtea-netx-plugin.patch	6	NETX_PATCH = patches/icedtea-netx-plugin.patch
Lines 303-318 Link Here
303	patches/icedtea-zero-build.patch \	303	patches/icedtea-zero-build.patch \
304	patches/icedtea-print-lsb-release.patch \	304	patches/icedtea-print-lsb-release.patch \
305	patches/icedtea-jpegclasses.patch \	305	patches/icedtea-jpegclasses.patch \
306	patches/icedtea-xinerama.patch \
307	patches/icedtea-arm-uname.patch \	306	patches/icedtea-arm-uname.patch \
308	patches/icedtea-ia64-fdlibm.patch \	307	patches/icedtea-ia64-fdlibm.patch \
309	patches/icedtea-LCMS-setTagData.patch \	308	patches/icedtea-LCMS-setTagData.patch \
310	patches/icedtea-color-createcontext.patch \	309	patches/icedtea-color-createcontext.patch \
311	patches/icedtea-color-profiles.patch \
312	patches/icedtea-fonts.patch \	310	patches/icedtea-fonts.patch \
313	patches/icedtea-gervill.patch \	311	patches/icedtea-gervill.patch \
314	patches/icedtea-directaudio-close-trick.patch \	312	patches/icedtea-directaudio-close-trick.patch \
315	patches/icedtea-hat-spl-gpl.patch \
316	patches/icedtea-sparc.patch \	313	patches/icedtea-sparc.patch \
317	patches/icedtea-override-redirect-metacity.patch \	314	patches/icedtea-override-redirect-metacity.patch \
318	$(GCC_PATCH) \	315	$(GCC_PATCH) \