# HG changeset patch # User malenkov # Date 1343229242 -14400 # Node ID 1a410846d85bbdd0f7d18ea6964885dbdc1653c9 # Parent 3502753a9d66e1002becd8f34ac3c9be200c29fa 4650871: Classes in sunw.* should be removed from workspace and rt.jar Reviewed-by: art, rupashka diff -r 3502753a9d66 -r 1a410846d85b make/Makefile --- a/make/Makefile Wed Jul 25 13:41:46 2012 +0400 +++ b/make/Makefile Wed Jul 25 19:14:02 2012 +0400 @@ -237,7 +237,7 @@ SUBDIRS += apple endif SUBDIRS_tools = launchers -SUBDIRS_misc = org sunw jpda +SUBDIRS_misc = org jpda # demos ifndef NO_DEMOS diff -r 3502753a9d66 -r 1a410846d85b make/common/Release.gmk --- a/make/common/Release.gmk Wed Jul 25 13:41:46 2012 +0400 +++ b/make/common/Release.gmk Wed Jul 25 19:14:02 2012 +0400 @@ -305,8 +305,7 @@ org/ietf \ org/omg \ org/w3c/dom \ - org/xml/sax \ - sunw + org/xml/sax # # Directories where sources may be found. If a file with the same path # name exists in more than one of these places, the one found last on this diff -r 3502753a9d66 -r 1a410846d85b make/docs/CORE_PKGS.gmk --- a/make/docs/CORE_PKGS.gmk Wed Jul 25 13:41:46 2012 +0400 +++ b/make/docs/CORE_PKGS.gmk Wed Jul 25 19:14:02 2012 +0400 @@ -33,7 +33,6 @@ java.awt.peer \ java.awt.dnd.peer \ sun.* \ - sunw.* \ com.sun.* \ org.apache.* \ org.jcp.* \ diff -r 3502753a9d66 -r 1a410846d85b make/sunw/Makefile --- a/make/sunw/Makefile Wed Jul 25 13:41:46 2012 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -# -# Copyright (c) 1996, 2005, Oracle and/or its affiliates. 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. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = .. -PACKAGE = sunw -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -FILES_java = \ - sunw/util/EventObject.java \ - sunw/util/EventListener.java \ - sunw/io/Serializable.java - -# -# include rules -# -include $(BUILDDIR)/common/Rules.gmk - -# -# Rules -# -clean clobber:: .delete.classlist - $(RM) -r $(CLASSBINDIR)/sunw - diff -r 3502753a9d66 -r 1a410846d85b makefiles/CreateJars.gmk --- a/makefiles/CreateJars.gmk Wed Jul 25 13:41:46 2012 +0400 +++ b/makefiles/CreateJars.gmk Wed Jul 25 19:14:02 2012 +0400 @@ -807,8 +807,7 @@ org/ietf \ org/omg \ org/w3c/dom \ - org/xml/sax \ - sunw + org/xml/sax SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc diff -r 3502753a9d66 -r 1a410846d85b makefiles/docs/CORE_PKGS.gmk --- a/makefiles/docs/CORE_PKGS.gmk Wed Jul 25 13:41:46 2012 +0400 +++ b/makefiles/docs/CORE_PKGS.gmk Wed Jul 25 19:14:02 2012 +0400 @@ -33,7 +33,6 @@ java.awt.peer \ java.awt.dnd.peer \ sun.* \ - sunw.* \ com.sun.* \ org.apache.* \ org.jcp.* \ diff -r 3502753a9d66 -r 1a410846d85b src/share/classes/sun/misc/MetaIndex.java --- a/src/share/classes/sun/misc/MetaIndex.java Wed Jul 25 13:41:46 2012 +0400 +++ b/src/share/classes/sun/misc/MetaIndex.java Wed Jul 25 19:14:02 2012 +0400 @@ -71,7 +71,6 @@ org/w3c/ com/sun/imageio/ javax/ -sunw/util/ java/ sun/ ... diff -r 3502753a9d66 -r 1a410846d85b src/share/classes/sunw/io/Serializable.java --- a/src/share/classes/sunw/io/Serializable.java Wed Jul 25 13:41:46 2012 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * Copyright (c) 1996, 1997, Oracle and/or its affiliates. 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sunw.io; - -/** - * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. - *

- * This is a backwards compatibility class to allow Java Beans that - * were developed under JDK 1.0.2 to run correctly under JDK 1.1 - *

- * To allow beans development under JDK 1.0.2, JavaSoft delivered three - * no-op interfaces/classes (sunw.io.Serializable, sunw.util.EventObject - * and sunw.util.EventListener) that could be downloaded into JDK 1.0.2 - * systems and which would act as placeholders for the real JDK 1.1 - * classes. - *

- * Now under JDK 1.1 we provide versions of these classes and interfaces - * that inherit from the real version in java.util and java.io. These - * mean that beans developed under JDK 1.0.2 against the sunw.* classes - * will now continue to work on JDK 1.1 and will (indirectly) inherit - * from the appropriate java.* interfaces/classes. - * - * @deprecated This is a compatibility type to allow Java Beans that - * were developed under JDK 1.0.2 to run correctly under JDK 1.1. The - * corresponding JDK1.1 type is java.io.Serializable - * - * @see java.io.Serializable - */ - -public interface Serializable extends java.io.Serializable { -} diff -r 3502753a9d66 -r 1a410846d85b src/share/classes/sunw/util/EventListener.java --- a/src/share/classes/sunw/util/EventListener.java Wed Jul 25 13:41:46 2012 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * Copyright (c) 1996, Oracle and/or its affiliates. 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sunw.util; - -/** - * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. - *

- * This is a backwards compatibility class to allow Java Beans that - * were developed under JDK 1.0.2 to run correctly under JDK 1.1 - *

- * To allow beans development under JDK 1.0.2, JavaSoft delivered three - * no-op interfaces/classes (sunw.io.Serializable, sunw.util.EventObject - * and sunw.util.EventListener) that could be downloaded into JDK 1.0.2 - * systems and which would act as placeholders for the real JDK 1.1 - * classes. - *

- * Now under JDK 1.1 we provide versions of these classes and interfaces - * that inherit from the real version in java.util and java.io. These - * mean that beans developed under JDK 1.0.2 against the sunw.* classes - * will now continue to work on JDK 1.1 and will (indirectly) inherit - * from the approrpiate java.* interfaces/classes. - * - * @deprecated This is a compatibility type to allow Java Beans that - * were developed under JDK 1.0.2 to run correctly under JDK 1.1. The - * corresponding JDK1.1 type is java.util.EventListener - * - * @see java.util.EventListener - */ - -public interface EventListener extends java.util.EventListener { -} diff -r 3502753a9d66 -r 1a410846d85b src/share/classes/sunw/util/EventObject.java --- a/src/share/classes/sunw/util/EventObject.java Wed Jul 25 13:41:46 2012 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* - * Copyright (c) 1996, 2003, Oracle and/or its affiliates. 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sunw.util; - -/** - * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. - *

- * This is a backwards compatibility class to allow Java Beans that - * were developed under JDK 1.0.2 to run correctly under JDK 1.1 - *

- * To allow beans development under JDK 1.0.2, JavaSoft delivered three - * no-op interfaces/classes (sunw.io.Serializable, sunw.util.EventObject - * and sunw.util.EventListener) that could be downloaded into JDK 1.0.2 - * systems and which would act as placeholders for the real JDK 1.1 - * classes. - *

- * Now under JDK 1.1 we provide versions of these classes and interfaces - * that inherit from the real version in java.util and java.io. These - * mean that beans developed under JDK 1.0.2 against the sunw.* classes - * will now continue to work on JDK 1.1 and will (indirectly) inherit - * from the approrpiate java.* interfaces/classes. - * - * @deprecated This is a compatibility type to allow Java Beans that - * were developed under JDK 1.0.2 to run correctly under JDK 1.1. The - * corresponding JDK1.1 type is java.util.EventObject - * - * @see java.util.EventObject - */ - -public class EventObject extends java.util.EventObject { - - private static final long serialVersionUID = 6723767567830330255L; - - public EventObject(Object source) { - super(source); - } - -}