changeset in /hg/icedtea: Cleanup binary plugs / proprietary stu...

Andrew John Hughes gnu_andrew at member.fsf.org
Mon Nov 17 04:41:25 PST 2008


changeset 3d692e2fa547 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3d692e2fa547
description:
	Cleanup binary plugs / proprietary stub support.

	2008-11-14  Andrew John Hughes  <ahughes at redhat.com>

		* HACKING: List new plugs patches.
		* Makefile.am: Remove use of rt from source dir,
		remove redundant Gervill patch, add new patches.
		* fsg.sh: Remove code related to proprietary sound
		and SNMP support.
		* patches/icedtea-copy-plugs.patch: Remove SNMP patch.
		* patches/icedtea-gervill.patch: Removed.
		* patches/icedtea-jsoundhs.patch: No need to patch services.
		* patches/icedtea-snmp.patch,
		* patches/icedtea-sound.patch: Remove references to proprietary code.
		* 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 redundant stubs.

diffstat:

35 files changed, 987 insertions(+), 1746 deletions(-)
ChangeLog                                             |   40 
HACKING                                               |    2 
Makefile.am                                           |   10 
fsg.sh                                                |   11 
patches/icedtea-copy-plugs.patch                      |   13 
patches/icedtea-gervill.patch                         |   11 
patches/icedtea-jsoundhs.patch                        |   10 
patches/icedtea-snmp.patch                            |  235 +++++
patches/icedtea-sound.patch                           |  693 +++++++++++++++++
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 2935 to 500 lines):

diff -r aa31b5aaa586 -r 3d692e2fa547 ChangeLog
--- a/ChangeLog	Tue Nov 11 00:07:06 2008 +0000
+++ b/ChangeLog	Fri Nov 14 04:24:08 2008 +0000
@@ -1,3 +1,43 @@ 2008-11-10  Andrew John Hughes  <ahughes
+2008-11-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* HACKING: List new plugs patches.
+	* Makefile.am: Remove use of rt from source dir,
+	remove redundant Gervill patch, add new patches.
+	* fsg.sh: Remove code related to proprietary sound
+	and SNMP support.
+	* patches/icedtea-copy-plugs.patch: Remove SNMP patch.
+	* patches/icedtea-gervill.patch: Removed.
+	* patches/icedtea-jsoundhs.patch: No need to patch services.
+	* patches/icedtea-snmp.patch,
+	* patches/icedtea-sound.patch: Remove references to proprietary code.
+	* 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 redundant stubs.
+
 2008-11-10  Andrew John Hughes  <ahughes at redhat.com>
 
 	* javac.in:
diff -r aa31b5aaa586 -r 3d692e2fa547 HACKING
--- a/HACKING	Tue Nov 11 00:07:06 2008 +0000
+++ b/HACKING	Fri Nov 14 04:24:08 2008 +0000
@@ -89,6 +89,8 @@ The following patches are only applied t
   is broken in libgcj 4.3.
 * icedtea-override.patch: Remove @Override annotation in
   javax.management.AttributeValueExp (unsupported by ecj < 3.4).
+* icedtea-snmp.patch: Remove proprietary SNMP support hooks.
+* icedtea-sound.patch: Remove proprietary MIDI support hooks.
 
 The following patches are only applied to the icedtea-ecj bootstrap tree:
 
diff -r aa31b5aaa586 -r 3d692e2fa547 Makefile.am
--- a/Makefile.am	Tue Nov 11 00:07:06 2008 +0000
+++ b/Makefile.am	Fri Nov 14 04:24:08 2008 +0000
@@ -89,7 +89,7 @@ install:
 	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
 	clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
 
-EXTRA_DIST = rt generated $(abs_top_srcdir)/patches/icedtea-*.patch \
+EXTRA_DIST = generated $(abs_top_srcdir)/patches/icedtea-*.patch \
 	gcjwebplugin.cc tools-copy contrib ports \
 	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
@@ -552,7 +552,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-fonts.patch \
-	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
@@ -583,6 +582,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-renderer-crossing.patch \
+	patches/icedtea-snmp.patch \
+	patches/icedtea-sound.patch \
 	$(ZERO_PATCHES_COND)
 
 if WITH_RHINO
@@ -1302,7 +1303,6 @@ ICEDTEA_COPY_DIRS = \
 	com/sun/jdi/connect/spi \
 	com/sun/jdi/event \
 	com/sun/jdi/request \
-	com/sun/jmx/snmp/agent \
 	com/sun/tools/jdi \
 	com/sun/net/httpserver \
 	java/io \
@@ -1377,7 +1377,7 @@ hotspot-tools-source-files.txt: stamps/g
 	find hotspot-tools -name '*.java' | sort > $@
 	mkdir -p lib/hotspot-tools
 
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_srcdir)/rt
+ABS_SOURCE_DIRS = $(abs_top_builddir)/generated
 stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
@@ -1426,7 +1426,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' \
+	find $(abs_top_builddir)/rt -name '*.java' \
 	  | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
diff -r aa31b5aaa586 -r 3d692e2fa547 fsg.sh
--- a/fsg.sh	Tue Nov 11 00:07:06 2008 +0000
+++ b/fsg.sh	Fri Nov 14 04:24:08 2008 +0000
@@ -102,3 +102,14 @@ rm -f \
 
 # END Debian/Ubuntu additions
 
+# Remove support for proprietary SNMP plug
+rm -rf openjdk/jdk/src/share/classes/sun/management/snmp
+rm -rf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
+
+# Remove support for proprietary sound
+rm -rf openjdk/jdk/src/share/classes/com/sun/media/sound/services
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/MixerSynthProvider.java
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/RmfFileReader.java
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/HsbParser.java
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInputDeviceProvider.java
+
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Tue Nov 11 00:07:06 2008 +0000
+++ b/patches/icedtea-copy-plugs.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -48,19 +48,6 @@ diff -Nru openjdk.orig/jdk/make/common/i
  ($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) )
  endef # import-binary-plug-classes
  
-diff -Nru 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-14 08:42:55.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2008-08-20 22:55:35.000000000 +0100
-@@ -78,6 +78,9 @@
-      */
-     public long            timeStamp ;
- 
-+    // TODO: IcedTea: I am a stub.
-+    static public int trapAuthenticationFailure = 0;
-+
- 
- 
-     /**
 diff -Nru 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-14 08:43:00.000000000 +0100
 +++ openjdk/jdk/src/share/classes/java/beans/MetaData.java	2008-08-20 22:55:35.000000000 +0100
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-gervill.patch
--- a/patches/icedtea-gervill.patch	Tue Nov 11 00:07:06 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# Adds the provides defined by gervill (and removes non-existing ones).
-# Gervill can be found in the overlays under
-# openjdk/jdk/src/share/classes/com/sun/media/sound
-# (This currently overrides the one from b10 because we track Gervill CVS)
---- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-04-13 01:05:30.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-05-09 02:54:26.000000000 +0200
-@@ -2,3 +2,4 @@
- com.sun.media.sound.UlawCodec
- com.sun.media.sound.AlawCodec
- com.sun.media.sound.PCMtoPCMCodec
-+com.sun.media.sound.AudioFloatFormatConverter
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-jsoundhs.patch
--- a/patches/icedtea-jsoundhs.patch	Tue Nov 11 00:07:06 2008 +0000
+++ b/patches/icedtea-jsoundhs.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -70,12 +70,4 @@ diff -uNr openjdk-orig/jdk/src/share/cla
              // just for the heck of it...
              loadedLibs |= LIB_MAIN;
          } catch (SecurityException e) {
-diff -uNr openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
---- openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:38:15.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:43:38.000000000 -0500
-@@ -1,5 +1,4 @@
- # last mixer is default mixer
- com.sun.media.sound.PortMixerProvider
- com.sun.media.sound.SimpleInputDeviceProvider
--com.sun.media.sound.HeadspaceMixerProvider
- com.sun.media.sound.DirectAudioDeviceProvider
+
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-snmp.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-snmp.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -0,0 +1,235 @@
+diff -Nru openjdk.orig/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile
+--- openjdk.orig/jdk/make/com/sun/jmx/Makefile	2008-11-11 01:22:14.000000000 +0000
++++ openjdk/jdk/make/com/sun/jmx/Makefile	2008-11-11 01:24:31.000000000 +0000
+@@ -41,7 +41,7 @@
+ # Note : some targets are double colon rules and some single colon rules
+ # within common included gmk files : that is why the following for loop
+ # has been duplicated.
+-SUBDIRS = snmp
++SUBDIRS = 
+ 
+ all build:
+ 	$(SUBDIRS-loop)
+diff -Nru openjdk.orig/jdk/make/com/sun/jmx/snmp/Makefile openjdk/jdk/make/com/sun/jmx/snmp/Makefile
+--- openjdk.orig/jdk/make/com/sun/jmx/snmp/Makefile	2008-11-11 01:22:23.000000000 +0000
++++ openjdk/jdk/make/com/sun/jmx/snmp/Makefile	1970-01-01 01:00:00.000000000 +0100
+@@ -1,45 +0,0 @@
+-#
+-# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation.  Sun designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Sun in the LICENSE file that accompanied this code.
+-#
+-# This code 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
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+-# CA 95054 USA or visit www.sun.com if you need additional information or
+-# have any questions.
+-#
+-
+-#
+-# Makefile for building SNMP runtime support for
+-# Sun-specific JDK out of the box management support.
+-#
+-
+-BUILDDIR = ../../../..
+-PACKAGE = com.sun.jmx.snmp
+-PRODUCT = sun
+-include $(BUILDDIR)/common/Defs.gmk
+-
+-#
+-# Files to compile
+-#
+-AUTO_FILES_JAVA_DIRS = com/sun/jmx/snmp
+-
+-#
+-# Rules
+-#
+-include $(BUILDDIR)/common/Classes.gmk
+-
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile	2008-11-11 01:23:00.000000000 +0000
++++ openjdk/jdk/make/docs/Makefile	2008-11-11 01:26:08.000000000 +0000
+@@ -328,14 +328,8 @@
+ MGMT_DOCDIR	   = $(DOCSDIR)/jre/api/management/
+ MGMT_EXT_DIR	   = $(MGMT_DOCDIR)/extension
+ MGMT_SOURCEPATH    = $(TOPDIR)/src/share/classes
+-JVM_MIB_NAME       = JVM-MANAGEMENT-MIB.mib
+-JVM_MIB_SRC        = $(CLOSED_SRC)/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
+ 
+-ifdef OPENJDK
+-   COPY-MIB-TARGET =
+-else
+-   COPY-MIB-TARGET = copy-mib
+-endif
++COPY-MIB-TARGET =
+ MGMT_JAVADOCFLAGS  = $(COMMON_JAVADOCFLAGS)			   \
+ 		     -encoding ascii			           \
+                      -nodeprecatedlist                             \
+@@ -632,12 +626,6 @@
+ 	$(JAVADOC_CMD) $(MGMT_JAVADOCFLAGS)                     \
+ 		   $(MGMT_PKGS)
+ 
+-copy-mib:
+-	@# ######## copy-snmp-mib ############################
+-	$(RM) $(MGMT_DOCDIR)/$(JVM_MIB_NAME)
+-	$(MKDIR) -p $(MGMT_DOCDIR)
+-	$(CP) $(JVM_MIB_SRC) $(MGMT_DOCDIR)
+-
+ .PHONY: attachdocs
+ attachdocs:
+ 	@# ######## api-attach ############################
+diff -Nru openjdk.orig/jdk/make/sun/management/Makefile openjdk/jdk/make/sun/management/Makefile
+--- openjdk.orig/jdk/make/sun/management/Makefile	2008-11-11 01:22:47.000000000 +0000
++++ openjdk/jdk/make/sun/management/Makefile	2008-11-11 01:25:00.000000000 +0000
+@@ -33,26 +33,20 @@
+ MGMT_LIBDIR = $(LIBDIR)/management
+ MGMT_LIB_SRC = $(SHARE_SRC)/lib/management
+ 
+-all build:: properties aclfile jmxremotefiles
++all build:: properties jmxremotefiles
+ 
+-SUBDIRS = snmp jmxremote
++SUBDIRS = jmxremote
+ all build clean clobber::
+ 	$(SUBDIRS-loop)
+ 
+ properties: $(MGMT_LIBDIR)/management.properties
+ 
+-aclfile: $(MGMT_LIBDIR)/snmp.acl.template
+-
+ jmxremotefiles: $(MGMT_LIBDIR)/jmxremote.password.template $(MGMT_LIBDIR)/jmxremote.access
+ 
+ $(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties
+ 	$(install-file)
+ 	$(CHMOD) 644 $@
+ 
+-$(MGMT_LIBDIR)/snmp.acl.template: $(MGMT_LIB_SRC)/snmp.acl.template
+-	$(install-file)
+-	$(CHMOD) 444 $@
+-
+ $(MGMT_LIBDIR)/jmxremote.password.template: $(MGMT_LIB_SRC)/jmxremote.password.template
+ 	$(install-file)
+ 	$(CHMOD) 444 $@
+diff -Nru openjdk.orig/jdk/make/sun/management/snmp/Makefile openjdk/jdk/make/sun/management/snmp/Makefile
+--- openjdk.orig/jdk/make/sun/management/snmp/Makefile	2008-11-11 01:22:41.000000000 +0000
++++ openjdk/jdk/make/sun/management/snmp/Makefile	1970-01-01 01:00:00.000000000 +0100
+@@ -1,44 +0,0 @@
+-#
+-# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation.  Sun designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Sun in the LICENSE file that accompanied this code.
+-#
+-# This code 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
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+-# CA 95054 USA or visit www.sun.com if you need additional information or
+-# have any questions.
+-#
+-
+-#
+-# Makefile for building SNMP MIB instrumentation
+-#
+-
+-BUILDDIR = ../../..
+-PACKAGE = sun.management.snmp
+-PRODUCT = sun
+-include $(BUILDDIR)/common/Defs.gmk
+-
+-#
+-# Files to compile
+-#
+-AUTO_FILES_JAVA_DIRS = sun/management/snmp
+-
+-#
+-# Rules
+-#
+-include $(BUILDDIR)/common/Classes.gmk
+-
+diff -Nru openjdk.orig/jdk/src/share/classes/sun/management/Agent.java openjdk/jdk/src/share/classes/sun/management/Agent.java
+--- openjdk.orig/jdk/src/share/classes/sun/management/Agent.java	2008-11-11 01:45:39.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/management/Agent.java	2008-11-11 01:46:56.000000000 +0000
+@@ -41,15 +41,13 @@
+ 
+ import javax.management.remote.JMXConnectorServer;
+ 
+-import sun.management.snmp.AdaptorBootstrap;
+ import sun.management.jmxremote.ConnectorBootstrap;
+ import static sun.management.AgentConfigurationError.*;
+ import sun.misc.VMSupport;
+ 
+ /**
+- * This Agent is started by the VM when -Dcom.sun.management.snmp
+- * or -Dcom.sun.management.jmxremote is set. This class will be
+- * loaded by the system class loader.
++ * This Agent is started by the VM when -Dcom.sun.management.jmxremote
++ * is set. This class will be loaded by the system class loader.
+  */
+ public class Agent {
+     // management properties
+@@ -58,8 +56,6 @@
+ 
+     private static final String CONFIG_FILE =
+         "com.sun.management.config.file";
+-    private static final String SNMP_PORT =
+-        "com.sun.management.snmp.port";
+     private static final String JMXREMOTE =
+         "com.sun.management.jmxremote";
+     private static final String JMXREMOTE_PORT =
+@@ -114,7 +110,6 @@
+     }
+ 
+     private static void startAgent(Properties props) throws Exception {
+-        String snmpPort = props.getProperty(SNMP_PORT);
+         String jmxremote = props.getProperty(JMXREMOTE);
+         String jmxremotePort = props.getProperty(JMXREMOTE_PORT);
+ 
+@@ -127,10 +122,6 @@
+         }
+ 
+         try {
+-            if (snmpPort != null) {
+-                AdaptorBootstrap.initialize(snmpPort, props);
+-            }
+-
+             /*
+              * If the jmxremote.port property is set then we start the
+              * RMIConnectorServer for remote M&M.
+@@ -190,11 +181,10 @@
+     public static synchronized Properties getManagementProperties() {
+         if (mgmtProps == null) {
+             String configFile = System.getProperty(CONFIG_FILE);
+-            String snmpPort = System.getProperty(SNMP_PORT);
+             String jmxremote = System.getProperty(JMXREMOTE);
+             String jmxremotePort = System.getProperty(JMXREMOTE_PORT);
+ 
+-            if (configFile == null && snmpPort == null &&
++            if (configFile == null &&
+                 jmxremote == null && jmxremotePort == null) {
+                 // return if out-of-the-management option is not specified
+                 return null;
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-sound.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sound.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -0,0 +1,693 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java openjdk/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java	2008-11-13 18:27:19.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java	2008-11-13 18:27:03.000000000 +0000
+@@ -586,7 +586,6 @@
+ 
+         private ArrayList<Transmitter> transmitters = new ArrayList<Transmitter>();
+         private MidiOutDevice.MidiOutReceiver midiOutReceiver;
+-        private MixerSynth.SynthReceiver mixerSynthReceiver;
+ 
+         // how many transmitters must be present for optimized
+         // handling
+@@ -621,22 +620,14 @@
+                 if (midiOutReceiver == oldR) {
+                     midiOutReceiver = null;
+                 }
+-                if (mixerSynthReceiver == oldR) {
+-                    mixerSynthReceiver = null;
+-                }
+                 if (newR != null) {
+                     if ((newR instanceof MidiOutDevice.MidiOutReceiver)
+                         && (midiOutReceiver == null)) {
+                         midiOutReceiver = ((MidiOutDevice.MidiOutReceiver) newR);
+                     }
+-                    if ((newR instanceof MixerSynth.SynthReceiver)
+-                        && (mixerSynthReceiver == null)) {
+-                        mixerSynthReceiver = ((MixerSynth.SynthReceiver) newR);
+-                    }
+                 }
+                 optimizedReceiverCount =
+-                      ((midiOutReceiver!=null)?1:0)
+-                    + ((mixerSynthReceiver!=null)?1:0);
++		  ((midiOutReceiver!=null)?1:0);
+             }
+             // more potential for optimization here
+         }
+@@ -670,10 +661,6 @@
+                             if (TRACE_TRANSMITTER) Printer.println("Sending packed message to MidiOutReceiver");
+                             midiOutReceiver.sendPackedMidiMessage(packedMessage, timeStamp);
+                         }
+-                        if (mixerSynthReceiver != null) {
+-                            if (TRACE_TRANSMITTER) Printer.println("Sending packed message to MixerSynthReceiver");
+-                            mixerSynthReceiver.sendPackedMidiMessage(packedMessage, timeStamp);
+-                        }
+                     } else {
+                         if (TRACE_TRANSMITTER) Printer.println("Sending packed message to "+size+" transmitter's receivers");
+                         for (int i = 0; i < size; i++) {
+@@ -682,9 +669,6 @@
+                                 if (optimizedReceiverCount > 0) {
+                                     if (receiver instanceof MidiOutDevice.MidiOutReceiver) {
+                                         ((MidiOutDevice.MidiOutReceiver) receiver).sendPackedMidiMessage(packedMessage, timeStamp);
+-                                    }
+-                                    else if (receiver instanceof MixerSynth.SynthReceiver) {
+-                                        ((MixerSynth.SynthReceiver) receiver).sendPackedMidiMessage(packedMessage, timeStamp);
+                                     } else {
+                                         receiver.send(new FastShortMessage(packedMessage), timeStamp);
+                                     }
+@@ -739,10 +723,6 @@
+                         if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to MidiOutReceiver");
+                         midiOutReceiver.send(message, timeStamp);
+                     }
+-                    if (mixerSynthReceiver != null) {
+-                        if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to MixerSynthReceiver");
+-                        mixerSynthReceiver.send(message, timeStamp);
+-                    }
+                 } else {
+                     if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to "+size+" transmitter's receivers");
+                     for (int i = 0; i < size; i++) {
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2008-11-13 18:27:30.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2008-11-13 18:26:52.000000000 +0000



More information about the distro-pkg-dev mailing list