/hg/icedtea6: NetX/plugin build sync (3/3): Remove binary plug i...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 16 08:40:34 PDT 2010
changeset 1bbce8b0b0a1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1bbce8b0b0a1
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 16 15:39:34 2010 +0000
NetX/plugin build sync (3/3): Remove binary plug import.
2010-03-16 Andrew John Hughes <ahughes at redhat.com>
NetX/plugin build sync (3/3):
* patches/icedtea-copy-plugs.patch: Remove plug-related
segments and move remainder to patches/ecj/getannotation-
cast.patch
* rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java,
* rt/com/sun/jmx/snmp/SnmpDefinitions.java,
* rt/com/sun/jmx/snmp/SnmpOid.java,
* rt/com/sun/jmx/snmp/SnmpOidRecord.java,
* rt/com/sun/jmx/snmp/SnmpOidTable.java,
* rt/com/sun/jmx/snmp/SnmpOidTableSupport.java,
* rt/com/sun/jmx/snmp/SnmpParameters.java,
* rt/com/sun/jmx/snmp/SnmpPduPacket.java,
* rt/com/sun/jmx/snmp/SnmpPeer.java,
* rt/com/sun/jmx/snmp/SnmpSession.java,
* rt/com/sun/jmx/snmp/SnmpTimeticks.java,
* rt/com/sun/jmx/snmp/SnmpVarBind.java,
* rt/com/sun/jmx/snmp/SnmpVarBindList.java,
* rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java,
* rt/com/sun/jmx/snmp/daemon/SnmpSession.java,
* rt/com/sun/media/sound/AbstractPlayer.java,
* rt/com/sun/media/sound/HeadspaceMixer.java,
* rt/com/sun/media/sound/HeadspaceSoundbank.java,
* rt/com/sun/media/sound/MixerClip.java,
* rt/com/sun/media/sound/MixerMidiChannel.java,
* rt/com/sun/media/sound/MixerSequencer.java,
* rt/com/sun/media/sound/MixerSourceLine.java,
* rt/com/sun/media/sound/MixerSynth.java,
* rt/com/sun/media/sound/MixerThread.java,
* rt/com/sun/media/sound/SimpleInputDevice.java,
* rt/com/sun/media/sound/SimpleInputDeviceProvider.java:
Remove old plug stubs.
* Makefile.am: (ICEDTEA_PLUGS): Removed.
(ICEDTEA_BOOTSTRAP_DIRS): Drop com/sun/jmx/snmp/agent.
(ICEDTEA_BOOTSTRAP_CLASSES): Add
javax/management/StandardMBean.java. (ICEDTEA_PATCHES):
Remove copy-plugs.patch. (ICEDTEA_ECJ_PATCHES): Add
getannotation-cast.patch. (ICEDTEA_ENV): Drop
IMPORT_BINARY_PLUGS. (ICEDTEA_ENV_ECJ): Likewise.
(icedtea.stamp): Don't depend on plugs.stamp. (icedtea-
debug.stamp): Likewise. (icedtea-ecj.stamp): Likewise.
(extra-class-files.stamp): Depend on netx.stamp and use
netx.build rather than plugs. (rt-source-files.txt): Don't
search $(abs_top_srcdir)/rt. (clean-rt): Revert to system
rt.jar. (plugs.stamp): Removed. (clean-plugs):
Removed.
* patches/ecj/getannotation-cast.patch: Remaining part of
copy-plugs.patch which provides a cast for getAnnotation for
older versions of GNU Classpath.
diffstat:
30 files changed, 91 insertions(+), 1899 deletions(-)
ChangeLog | 55 ++++
Makefile.am | 41 --
patches/ecj/getannotation-cast.patch | 24 +
patches/icedtea-copy-plugs.patch | 162 -----------
rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java | 52 ---
rt/com/sun/jmx/snmp/SnmpDefinitions.java | 83 ------
rt/com/sun/jmx/snmp/SnmpOid.java | 137 ---------
rt/com/sun/jmx/snmp/SnmpOidRecord.java | 53 ---
rt/com/sun/jmx/snmp/SnmpOidTable.java | 53 ---
rt/com/sun/jmx/snmp/SnmpOidTableSupport.java | 54 ---
rt/com/sun/jmx/snmp/SnmpParameters.java | 60 ----
rt/com/sun/jmx/snmp/SnmpPduPacket.java | 52 ---
rt/com/sun/jmx/snmp/SnmpPeer.java | 73 -----
rt/com/sun/jmx/snmp/SnmpSession.java | 65 ----
rt/com/sun/jmx/snmp/SnmpTimeticks.java | 74 -----
rt/com/sun/jmx/snmp/SnmpVarBind.java | 74 -----
rt/com/sun/jmx/snmp/SnmpVarBindList.java | 82 -----
rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java | 42 ---
rt/com/sun/jmx/snmp/daemon/SnmpSession.java | 66 ----
rt/com/sun/media/sound/AbstractPlayer.java | 45 ---
rt/com/sun/media/sound/HeadspaceMixer.java | 44 ---
rt/com/sun/media/sound/HeadspaceSoundbank.java | 45 ---
rt/com/sun/media/sound/MixerClip.java | 44 ---
rt/com/sun/media/sound/MixerMidiChannel.java | 45 ---
rt/com/sun/media/sound/MixerSequencer.java | 233 -----------------
rt/com/sun/media/sound/MixerSourceLine.java | 44 ---
rt/com/sun/media/sound/MixerSynth.java | 55 ----
rt/com/sun/media/sound/MixerThread.java | 44 ---
rt/com/sun/media/sound/SimpleInputDevice.java | 44 ---
rt/com/sun/media/sound/SimpleInputDeviceProvider.java | 45 ---
diffs (truncated from 2214 to 500 lines):
diff -r 6b7bf9f691c9 -r 1bbce8b0b0a1 ChangeLog
--- a/ChangeLog Tue Mar 16 10:29:49 2010 -0400
+++ b/ChangeLog Tue Mar 16 15:39:34 2010 +0000
@@ -1,3 +1,58 @@ 2010-03-16 Deepak Bhole <dbhole at redhat.
+2010-03-16 Andrew John Hughes <ahughes at redhat.com>
+
+ NetX/plugin build sync (3/3):
+ * patches/icedtea-copy-plugs.patch:
+ Remove plug-related segments and move
+ remainder to patches/ecj/getannotation-cast.patch
+ * rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java,
+ * rt/com/sun/jmx/snmp/SnmpDefinitions.java,
+ * rt/com/sun/jmx/snmp/SnmpOid.java,
+ * rt/com/sun/jmx/snmp/SnmpOidRecord.java,
+ * rt/com/sun/jmx/snmp/SnmpOidTable.java,
+ * rt/com/sun/jmx/snmp/SnmpOidTableSupport.java,
+ * rt/com/sun/jmx/snmp/SnmpParameters.java,
+ * rt/com/sun/jmx/snmp/SnmpPduPacket.java,
+ * rt/com/sun/jmx/snmp/SnmpPeer.java,
+ * rt/com/sun/jmx/snmp/SnmpSession.java,
+ * rt/com/sun/jmx/snmp/SnmpTimeticks.java,
+ * rt/com/sun/jmx/snmp/SnmpVarBind.java,
+ * rt/com/sun/jmx/snmp/SnmpVarBindList.java,
+ * rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java,
+ * rt/com/sun/jmx/snmp/daemon/SnmpSession.java,
+ * rt/com/sun/media/sound/AbstractPlayer.java,
+ * rt/com/sun/media/sound/HeadspaceMixer.java,
+ * rt/com/sun/media/sound/HeadspaceSoundbank.java,
+ * rt/com/sun/media/sound/MixerClip.java,
+ * rt/com/sun/media/sound/MixerMidiChannel.java,
+ * rt/com/sun/media/sound/MixerSequencer.java,
+ * rt/com/sun/media/sound/MixerSourceLine.java,
+ * rt/com/sun/media/sound/MixerSynth.java,
+ * rt/com/sun/media/sound/MixerThread.java,
+ * rt/com/sun/media/sound/SimpleInputDevice.java,
+ * rt/com/sun/media/sound/SimpleInputDeviceProvider.java:
+ Remove old plug stubs.
+ * Makefile.am:
+ (ICEDTEA_PLUGS): Removed.
+ (ICEDTEA_BOOTSTRAP_DIRS): Drop com/sun/jmx/snmp/agent.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add javax/management/StandardMBean.java.
+ (ICEDTEA_PATCHES): Remove copy-plugs.patch.
+ (ICEDTEA_ECJ_PATCHES): Add getannotation-cast.patch.
+ (ICEDTEA_ENV): Drop IMPORT_BINARY_PLUGS.
+ (ICEDTEA_ENV_ECJ): Likewise.
+ (icedtea.stamp): Don't depend on plugs.stamp.
+ (icedtea-debug.stamp): Likewise.
+ (icedtea-ecj.stamp): Likewise.
+ (extra-class-files.stamp): Depend on netx.stamp and
+ use netx.build rather than plugs.
+ (rt-source-files.txt): Don't search $(abs_top_srcdir)/rt.
+ (clean-rt): Revert to system rt.jar.
+ (plugs.stamp): Removed.
+ (clean-plugs): Removed.
+ * patches/ecj/getannotation-cast.patch:
+ Remaining part of copy-plugs.patch which
+ provides a cast for getAnnotation for older versions
+ of GNU Classpath.
+
2010-03-16 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
diff -r 6b7bf9f691c9 -r 1bbce8b0b0a1 Makefile.am
--- a/Makefile.am Tue Mar 16 10:29:49 2010 -0400
+++ b/Makefile.am Tue Mar 16 15:39:34 2010 +0000
@@ -42,8 +42,6 @@ ICEDTEA_BOOT_DIR= \
$(abs_top_builddir)/bootstrap/jdk1.6.0
ICEDTEA_RT = \
$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
-ICEDTEA_PLUGS = \
- $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
ICEDTEA_BUILD_DIR_ECJ = \
@@ -73,7 +71,6 @@ SOURCEPATH_DIRS = $(abs_top_builddir)/ge
# Sources used from OpenJDK.
ICEDTEA_BOOTSTRAP_DIRS = \
$(SHARE)/com/sun/jdi \
- $(SHARE)/com/sun/jmx/snmp/agent \
$(SHARE)/com/sun/net/httpserver \
$(SHARE)/com/sun/tools/jdi \
$(SHARE)/java/io \
@@ -91,8 +88,11 @@ ICEDTEA_BOOTSTRAP_DIRS = \
$(LANGTOOLS)/com/sun/mirror \
$(LANGTOOLS)/com/sun/tools/apt
+# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
+# PR43389 - javax.management.StandardMBean
ICEDTEA_BOOTSTRAP_CLASSES = \
- $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
+ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
+ $(SHARE)/javax/management/StandardMBean.java
# FIXME (javac): Settings for javac go here
@@ -241,7 +241,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-lucene-crash.patch \
patches/icedtea-version.patch \
patches/icedtea-version-hotspot.patch \
- patches/icedtea-copy-plugs.patch \
patches/icedtea-text-relocations.patch \
patches/icedtea-ssl.patch \
patches/icedtea-rmi_amd64.patch \
@@ -394,7 +393,8 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedte
patches/ecj/icedtea-spp.patch \
patches/ecj/icedtea-jopt.patch \
patches/ecj/icedtea-jaxp-dependency.patch \
- patches/ecj/bootver.patch
+ patches/ecj/bootver.patch \
+ patches/ecj/getannotation-cast.patch
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
@@ -429,7 +429,6 @@ PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKA
PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
ICEDTEA_ENV = \
- IMPORT_BINARY_PLUGS=true \
ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
ANT="$(ANT)" \
BUILD_NUMBER="$(OPENJDK_VERSION)" \
@@ -515,7 +514,6 @@ endif
# OpenJDK ecj build environment.
# FIXME (bootstrap): Remove duplication
ICEDTEA_ENV_ECJ = \
- IMPORT_BINARY_PLUGS=true \
ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
ANT="$(ANT)" \
BUILD_NUMBER="$(OPENJDK_VERSION)" \
@@ -1333,7 +1331,7 @@ clean-bootstrap-directory-symlink:
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/netx-dist.stamp stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
+ stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
extra-lib/about.jar stamps/cacao.stamp \
stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1432,7 +1430,7 @@ endif
touch stamps/icedtea.stamp
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/netx-dist.stamp stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
+ stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
extra-lib/about.jar stamps/cacao.stamp \
stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1555,7 +1553,7 @@ stamps/icedtea-debug-against-icedtea.sta
# ===================
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/netx-dist.stamp stamps/plugs.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \
+ stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \
stamps/rewrite-rhino.stamp stamps/plugin.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -1757,11 +1755,11 @@ extra-source-files.txt:
find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
stamps/extra-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
- extra-source-files.txt stamps/plugs.stamp
+ extra-source-files.txt stamps/netx.stamp
mkdir -p extra-lib
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
-source 1.5 \
- -sourcepath extra -cp $(ICEDTEA_RT):$(ICEDTEA_PLUGS) \
+ -sourcepath extra -cp netx.build:$(ICEDTEA_RT) \
-bootclasspath \'\' @extra-source-files.txt
cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
@@ -2199,8 +2197,6 @@ jtregcheck: jtreg check-hotspot check-la
# rt.jar additional class files.
rt-source-files.txt: $(OPENJDK_ECJ_TREE)
- find $(abs_top_srcdir)/rt -name '*.java' \
- | sort -u > $@
for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
do \
$(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
@@ -2225,6 +2221,7 @@ clean-rt:
rm -f stamps/rt-class-files.stamp
rm -f stamps/rt.stamp
rm -f rt-source-files.txt
+ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT)
stamps/rt.stamp: stamps/rt-class-files.stamp stamps/bootstrap-directory-ecj.stamp \
stamps/liveconnect.stamp
@@ -2254,20 +2251,6 @@ clean-tools-jar:
rm -f $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
fi
rm -f stamps/tools.stamp
-
-# rt-closed.jar
-stamps/plugs.stamp: stamps/rt.stamp stamps/tools.stamp stamps/netx.stamp \
- stamps/liveconnect.stamp
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $(ICEDTEA_PLUGS) \
- -C lib/rt com/sun/jmx/snmp $(LIVECONNECT_DIR) \
- -C netx.build net -C netx.build javax/jnlp ;
- mkdir -p stamps
- touch stamps/plugs.stamp
-
-clean-plugs: clean-plugs clean-copy clean-rt
- rm -f $(ICEDTEA_PLUGS)
- cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT)
- rm -f stamps/plugs.stamp
# Target Aliases
# ===============
diff -r 6b7bf9f691c9 -r 1bbce8b0b0a1 patches/ecj/getannotation-cast.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/getannotation-cast.patch Tue Mar 16 15:39:34 2010 +0000
@@ -0,0 +1,24 @@
+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/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;
diff -r 6b7bf9f691c9 -r 1bbce8b0b0a1 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch Tue Mar 16 10:29:49 2010 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-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 \
--com/sun/jmx/snmp/SnmpOidDatabase.class \
--com/sun/jmx/snmp/SnmpOidDatabaseSupport.class \
- com/sun/jmx/snmp/SnmpOidRecord.class \
- com/sun/jmx/snmp/SnmpOidTable.class \
- com/sun/jmx/snmp/SnmpOidTableSupport.class \
- com/sun/jmx/snmp/SnmpParameters.class \
- com/sun/jmx/snmp/SnmpPduPacket.class \
- com/sun/jmx/snmp/SnmpPeer.class \
-+rt/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/Timestamp.class \
- com/sun/jmx/snmp/daemon/SendQ.class \
- com/sun/jmx/snmp/daemon/SnmpInformRequest.class \
--com/sun/jmx/snmp/daemon/SnmpQManager.class \
--com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \
--com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \
--com/sun/jmx/snmp/daemon/SnmpSendServer.class \
--com/sun/jmx/snmp/daemon/SnmpSession.class \
--com/sun/jmx/snmp/daemon/SnmpSocket.class \
--com/sun/jmx/snmp/daemon/SnmpTimerServer.class \
--com/sun/jmx/snmp/daemon/WaitQ.class
-+com/sun/jmx/snmp/daemon/SnmpSession.class
-
- # Class list temp files (used by both import and export of plugs)
-
-+PLUG_GNU_CLASS_NAMES = gnu
-+
-+PLUG_JAVAX_CLASS_NAMES = javax/jnlp
-+
-+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 netscape
- PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
-
- # Create jargs file command
-@@ -93,11 +92,39 @@
- @for i in $(PLUG_JMF_CLASS_NAMES) ; do \
- $(ECHO) "$$i" >> $@; \
- done
-+$(PLUG_TEMPDIR)/gnu.clist:
-+ @$(prep-target)
-+ @for i in $(PLUG_GNU_CLASS_NAMES) ; do \
-+ $(ECHO) "$$i" >> $@ ; \
-+ done
-+$(PLUG_TEMPDIR)/javax.clist:
-+ @$(prep-target)
-+ @for i in $(PLUG_JAVAX_CLASS_NAMES) ; do \
-+ $(ECHO) "$$i" >> $@ ; \
-+ done
-+$(PLUG_TEMPDIR)/netx.clist:
-+ @$(prep-target)
-+ @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) > $@
- $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
- $(plug-create-jargs)
-+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
-+ $(plug-create-jargs)
-+$(PLUG_TEMPDIR)/javax.jargs: $(PLUG_TEMPDIR)/javax.clist
-+ $(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 +152,9 @@
- # Import classes command
-
- define import-binary-plug-classes
--@$(MKDIR) -p $(CLASSDESTDIR)
-+$(MKDIR) -p $(CLASSDESTDIR)
- @$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /'
--($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1)
-+($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) `$(CAT) $1`)
- endef # import-binary-plug-classes
-
- else # IMPORT_BINARY_PLUGS
-@@ -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)
-+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
-+ $(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
-
- import-binary-plug-jar: \
-- import-binary-plug-jmf-classes
-+ import-binary-plug-jmf-classes \
-+ import-binary-plug-gnu-classes \
-+ import-binary-plug-javax-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;
diff -r 6b7bf9f691c9 -r 1bbce8b0b0a1 rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java
--- a/rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java Tue Mar 16 10:29:49 2010 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/* SnmpDataTypeEnums.java -- stub file.
- Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-*/
-
-package com.sun.jmx.snmp;
-
-public interface SnmpDataTypeEnums {
- // Random values chosen to prevent conflicts in switch statements.
- final static int IpAddressTag = 01;
- final static int CounterTag = 11;
- final static int GaugeTag = 21;
- final static int TimeticksTag = 31;
- final static int OpaqueTag = 41;
- int NullTag = 0;
- final static int errNoSuchObjectTag = 33;
- final static int errNoSuchInstanceTag = 44;
- final static int errEndOfMibViewTag = 55;
- public static final int Counter64Tag = 0;
-}
diff -r 6b7bf9f691c9 -r 1bbce8b0b0a1 rt/com/sun/jmx/snmp/SnmpDefinitions.java
--- a/rt/com/sun/jmx/snmp/SnmpDefinitions.java Tue Mar 16 10:29:49 2010 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/* SnmpDefinitions.java -- stub file.
- Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-*/
-
-package com.sun.jmx.snmp;
More information about the distro-pkg-dev
mailing list