Lines 35-41
Link Here
|
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 |
|