Index: /trunk/icedtea-web/Makefile.am
===================================================================
--- /trunk/icedtea-web/Makefile.am	(revision 361)
+++ /trunk/icedtea-web/Makefile.am	(revision 362)
@@ -245,4 +245,5 @@
 	if test "x${LIVECONNECT_DIR}" != x; then \
 	  find $(LIVECONNECT_SRCS) -name '*.java' | sort > $@ ; \
+	  sed -i '/_OS2/ d' $@
 	fi
 	touch $@
Index: /trunk/icedtea-web/Makefile.in
===================================================================
--- /trunk/icedtea-web/Makefile.in	(revision 361)
+++ /trunk/icedtea-web/Makefile.in	(revision 362)
@@ -719,4 +719,5 @@
 	if test "x${LIVECONNECT_DIR}" != x; then \
 	  find $(LIVECONNECT_SRCS) -name '*.java' | sort > $@ ; \
+	  sed -i '/_OS2/ d' $@
 	fi
 	touch $@
Index: /trunk/icedtea-web/plugin/icedteanp/Makefile.kmk
===================================================================
--- /trunk/icedtea-web/plugin/icedteanp/Makefile.kmk	(revision 361)
+++ /trunk/icedtea-web/plugin/icedteanp/Makefile.kmk	(revision 362)
@@ -36,5 +36,6 @@
 JAVASRCLIST += $(liveconnect_0_OUTDIR)/javasrc.list
 BLDDIRS += $(dir $(JAVASRCLIST))
-OTHER_CLEAN += $(JAVASRCLIST) $(JAVASRCLIST).rsp $(JAVASRCLIST).stamp
+OTHER_CLEAN += $(JAVASRCLIST) $(JAVASRCLIST).stamp \
+               $(JAVASRCLIST).os2 $(JAVASRCLIST).os2.stamp
 
 JARFILE = $(PATH_STAGE)/lib/plugin.jar
@@ -42,17 +43,37 @@
 OTHER_CLEAN += $(JARFILE)
 
+$$(JAVASRCLIST).os2: $(MAKEFILE) | $$(call DIRDEP,$$(dir $$(@)))
+	@echo 'JAVASRC.os2 = \' > $@
+	find $(PATH_SUB_CURRENT)/java -name '*.java' \
+        -name '*_OS2*' \
+        -printf '%p \\\n' >> $@
+
+$$(JAVASRCLIST).os2.stamp: $$(JAVASRC.os2) | $$(call DIRDEP,$$(dir $$(@)))
+	$(call MSG_COMPILE,liveconnect.os2,$(words $?) sources,$@,JAVA)
+	@echo $? > $(JAVASRCLIST).os2.rsp
+	$(PATH_BOOTSTRAP_JDK)/bin/javac $(IT_JAVACFLAGS) \
+        -d "$(liveconnect_0_OUTDIR)" \
+        -sourcepath "$(PATH_SUB_CURRENT)/java" \
+        -bootclasspath "$(BOOTSTRAP_JDK_RUNTIME);$(PATH_STAGE)/lib/netx.jar" \
+        @"$(JAVASRCLIST).os2.rsp"
+	@$(RM) "$(JAVASRCLIST).os2.rsp"
+	@touch "$@"
+
 $$(JAVASRCLIST): $(MAKEFILE) | $$(call DIRDEP,$$(dir $$(@)))
 	@echo 'JAVASRC = \' > $@
-	find $(PATH_SUB_CURRENT) -name '*.java' \
+	find $(PATH_SUB_CURRENT)/java -name '*.java' \
+        ! -name '*_X11*' ! -name '*_OS2*' \
         -printf '%p \\\n' >> $@
 
-$$(JAVASRCLIST).stamp: $$(JAVASRC) | $$(call DIRDEP,$$(dir $$(@)))
+$$(JAVASRCLIST).stamp: $$(JAVASRC) | $$(JAVASRCLIST).os2.stamp $$(call DIRDEP,$$(dir $$(@)))
 	$(call MSG_COMPILE,liveconnect,$(words $?) sources,$@,JAVA)
 	@echo $? > $(JAVASRCLIST).rsp
 	$(PATH_BOOTSTRAP_JDK)/bin/javac $(IT_JAVACFLAGS) \
         -d "$(liveconnect_0_OUTDIR)" \
-        -sourcepath "$(PATH_SUB_CURRENT)/icedteanp/java" \
+        -classpath "$(liveconnect_0_OUTDIR)" \
+        -sourcepath "$(PATH_SUB_CURRENT)/java" \
         -bootclasspath "$(BOOTSTRAP_JDK_RUNTIME);$(PATH_STAGE)/lib/netx.jar" \
         @"$(JAVASRCLIST).rsp"
+	@$(RM) "$(JAVASRCLIST).rsp"
 	@touch "$@"
 
@@ -66,3 +87,4 @@
 include $(FILE_KBUILD_SUB_FOOTER)
 
+-include $(JAVASRCLIST).os2
 -include $(JAVASRCLIST)
Index: /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
===================================================================
--- /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	(revision 361)
+++ /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	(revision 362)
@@ -112,5 +112,4 @@
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
-import sun.awt.X11.XEmbeddedFrame;
 import sun.misc.Ref;
 
@@ -255,5 +254,5 @@
 // FIXME: declare JSProxy implementation
 @SuppressWarnings("serial")
-public class PluginAppletViewer extends XEmbeddedFrame
+public class PluginAppletViewer extends PluginAppletViewerBase
         implements AppletContext, Printable {
 
@@ -343,5 +342,5 @@
                                NetxPanel appletPanel) {
 
-        super(handle, true);
+        super(handle);
         this.identifier = identifier;
         this.panel = appletPanel;
Index: /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_OS2.java
===================================================================
--- /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_OS2.java	(revision 362)
+++ /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_OS2.java	(revision 362)
@@ -0,0 +1,50 @@
+/* PluginAppletViewerBase -- OS/2 version
+   Copyright (C) 2008  Red Hat
+
+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; either version 2, or (at your option)
+any later version.
+
+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 sun.applet;
+
+import sun.awt.windows.WEmbeddedFrame;
+
+class PluginAppletViewerBase extends WEmbeddedFrame {
+
+    PluginAppletViewerBase() {
+    }
+
+    PluginAppletViewerBase(long handle) {
+        super(handle);
+    }
+}
Index: /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_X11.java
===================================================================
--- /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_X11.java	(revision 362)
+++ /trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_X11.java	(revision 362)
@@ -0,0 +1,50 @@
+/* PluginAppletViewerBase -- Linux version
+   Copyright (C) 2008  Red Hat
+
+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; either version 2, or (at your option)
+any later version.
+
+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 sun.applet;
+
+import sun.awt.X11.XEmbeddedFrame;
+
+class PluginAppletViewerBase extends XEmbeddedFrame {
+
+    PluginAppletViewerBase() {
+    }
+
+    PluginAppletViewerBase(long handle) {
+        super(handle, true);
+    }
+}
