--- a/.hgtags Fri Jun 06 08:29:25 2008 -0700
+++ b/.hgtags Fri Jun 13 08:28:21 2008 -0700
@@ -2,3 +2,4 @@ 75fca0b0ab83ab1392e615910cea020f66535390
75fca0b0ab83ab1392e615910cea020f66535390 jdk7-b25
fb57027902e04ecafceae31a605e69b436c23d57 jdk7-b26
3e599d98875ddf919c8ea11cff9b3a99ba631a9b jdk7-b27
+02e4c5348592a8d7fc2cba28bc5f8e35c0e17277 jdk7-b28
--- a/make/common/Defs-solaris.gmk Fri Jun 06 08:29:25 2008 -0700
+++ b/make/common/Defs-solaris.gmk Fri Jun 13 08:28:21 2008 -0700
@@ -197,7 +197,6 @@ endif
# Lint Flags:
# -Xa ANSI C plus K&R, favor ANSI rules
-# -Xarch=XXX Same as 'cc -xarch=XXX'
# -fd report on old style func defs
# -errchk=structarg report on 64bit struct args by value
# -errchk=longptr64 report on 64bit to 32bit issues (ignores casts)
@@ -206,6 +205,7 @@ endif
# -x suppress unused externs
# -u suppress extern func/vars used/defined
# -errfmt=simple use one line errors with position info
+# $(LINT_XARCH_OPTION) See Compiler-sun.gwk
LINTFLAGS_COMMON = -Xa
LINTFLAGS_COMMON += -fd
@@ -224,42 +224,12 @@ LINTFLAGS_DBG =
# Tell the compilers to never generate globalized names, all the time.
CFLAGS_COMMON += -W0,-noglobal
-# Arch specific settings (determines type of .o files and instruction set)
-ifeq ($(ARCH_FAMILY), sparc)
- ifdef VIS_NEEDED
- XARCH_VALUE/32=v8plusa
- XARCH_VALUE/64=v9a
- else
- # Someday this should change to improve optimization on UltraSPARC
- # and abandon the old v8-only machines like the SPARCstation 10.
- # Indications with Mustang is that alacrity runs do not show a
- # big improvement using v8plus over v8, but other benchmarks might.
- XARCH_VALUE/32=v8
- XARCH_VALUE/64=v9
- endif
-endif
-ifeq ($(ARCH_FAMILY), i586)
- XARCH_VALUE/64=amd64
- XARCH_VALUE/32=
-endif
-
-# Arch value based on current data model being built
-XARCH_VALUE=$(XARCH_VALUE/$(ARCH_DATA_MODEL))
-ifneq ($(XARCH_VALUE), )
- # The actual compiler -xarch options to use
- XARCH_OPTION/32 = -xarch=$(XARCH_VALUE/32)
- XARCH_OPTION/64 = -xarch=$(XARCH_VALUE/64)
- XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL))
-endif
-
-# If we have a specific -xarch value to use, add it
-ifdef XARCH_OPTION
- CFLAGS_COMMON += $(XARCH_OPTION)
- CXXFLAGS_COMMON += $(XARCH_OPTION)
- ASFLAGS_COMMON += $(XARCH_OPTION)
- EXTRA_LIBS += $(XARCH_OPTION)
- LINTFLAGS_COMMON += -Xarch=$(XARCH_VALUE)
-endif
+# If we have a specific arch value to use, add it
+CFLAGS_COMMON += $(XARCH_OPTION)
+CXXFLAGS_COMMON += $(XARCH_OPTION)
+ASFLAGS_COMMON += $(AS_XARCH_OPTION)
+EXTRA_LIBS += $(XARCH_OPTION)
+LINTFLAGS_COMMON += $(LINT_XARCH_OPTION)
#
# uncomment the following to build with PERTURBALOT set
--- a/make/common/Release.gmk Fri Jun 06 08:29:25 2008 -0700
+++ b/make/common/Release.gmk Fri Jun 13 08:28:21 2008 -0700
@@ -1236,7 +1236,6 @@ ifeq ($(PLATFORM), windows)
$(RM) $(TEMPDIR)/rebase.input
endif
$(RM) -r $(JDK_IMAGE_DIR)
- $(RM) -r $(JDK_DEBUG_IMAGE_DIR)
$(RM) -r $(JRE_IMAGE_DIR)
images images-clobber::
--- a/make/common/shared/Compiler-sun.gmk Fri Jun 06 08:29:25 2008 -0700
+++ b/make/common/shared/Compiler-sun.gmk Fri Jun 13 08:28:21 2008 -0700
@@ -31,6 +31,9 @@ COMPILER_NAME=Sun Studio
# Sun Studio Compiler settings specific to Solaris
ifeq ($(PLATFORM), solaris)
+ # FIXUP: Change to SS12 when validated
+ #COMPILER_VERSION=SS12
+ #REQUIRED_CC_VER=5.9
COMPILER_VERSION=SS11
REQUIRED_CC_VER=5.8
CC = $(COMPILER_PATH)cc
@@ -51,8 +54,8 @@ endif
# Sun Studio Compiler settings specific to Linux
ifeq ($(PLATFORM), linux)
# This has not been tested
- COMPILER_VERSION=SS11
- REQUIRED_CC_VER=5.8
+ COMPILER_VERSION=SS12
+ REQUIRED_CC_VER=5.9
CC = $(COMPILER_PATH)cc
CPP = $(COMPILER_PATH)cc -E
CXX = $(COMPILER_PATH)CC
@@ -74,3 +77,58 @@ _CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD
_CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1)
CC_VER :=$(call GetVersion,"$(_CC_VER)")
+# Arch specific settings (determines type of .o files and instruction set)
+# Starting in SS12 (5.9), the arch options changed.
+# The assembler /usr/ccs/bin/as wants older SS11 (5.8) style options.
+# Note: We need to have both 32 and 64 values at all times for awt Makefiles.
+#
+XARCH_OPTION_OLD/32 =
+XARCH_OPTION_OLD/64 =
+XARCH_OPTION_NEW/32 = -m32
+XARCH_OPTION_NEW/64 = -m64
+# Lint options are slightly different
+LINT_XARCH_OPTION_OLD/32 =
+LINT_XARCH_OPTION_OLD/64 =
+LINT_XARCH_OPTION_NEW/32 = -m32
+LINT_XARCH_OPTION_NEW/64 = -m64
+ifeq ($(ARCH_FAMILY), sparc)
+ ifdef VIS_NEEDED
+ XARCH_OPTION_OLD/32 += -xarch=v8plusa
+ XARCH_OPTION_OLD/64 += -xarch=v9a
+ XARCH_OPTION_NEW/32 += -xarch=sparcvis
+ XARCH_OPTION_NEW/64 += -xarch=sparcvis
+ else
+ # Someday this should change to improve optimization on UltraSPARC
+ # and abandon v8, even change to sparcvis or sparcvis2, this
+ # abandons machines like the SPARCstation 10.
+ # Indications with jdk6 is that alacrity runs do not show a
+ # big improvement using v8plus over v8, but other benchmarks might.
+ XARCH_OPTION_OLD/32 += -xarch=v8
+ XARCH_OPTION_OLD/64 += -xarch=v9
+ # Note that this new option (SS12+) effectively means v8plus
+ XARCH_OPTION_NEW/32 += -xarch=sparc
+ XARCH_OPTION_NEW/64 += -xarch=sparc
+ endif
+ LINT_XARCH_OPTION_OLD/64 += -Xarch=v9
+endif
+ifeq ($(ARCH_FAMILY), i586)
+ XARCH_OPTION_OLD/64 += -xarch=amd64
+ LINT_XARCH_OPTION_OLD/64 += -Xarch=amd64
+endif
+# Pick the options we want based on the compiler being used.
+ifeq ($(shell expr $(CC_VER) \>= 5.9), 1)
+ XARCH_OPTION/32 = $(XARCH_OPTION_NEW/32)
+ XARCH_OPTION/64 = $(XARCH_OPTION_NEW/64)
+ LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_NEW/32)
+ LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_NEW/64)
+else
+ XARCH_OPTION/32 = $(XARCH_OPTION_OLD/32)
+ XARCH_OPTION/64 = $(XARCH_OPTION_OLD/64)
+ LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_OLD/32)
+ LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_OLD/64)
+endif
+XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL))
+LINT_XARCH_OPTION = $(LINT_XARCH_OPTION/$(ARCH_DATA_MODEL))
+# The /usr/ccs/bin/as assembler always wants the older SS11 (5.8) options.
+AS_XARCH_OPTION = $(XARCH_OPTION_OLD/$(ARCH_DATA_MODEL))
+
--- a/make/jdk_generic_profile.sh Fri Jun 06 08:29:25 2008 -0700
+++ b/make/jdk_generic_profile.sh Fri Jun 13 08:28:21 2008 -0700
@@ -119,7 +119,7 @@ if [ "${osname}" = SunOS ] ; then
# System place where JDK installed images are stored?
jdk_instances=/usr/jdk/instances
- # Get the SS11 compilers (and latest patches for them too)
+ # Get the Sun Studio compilers (and latest patches for them too)
if [ "${ALT_COMPILER_PATH}" = "" ] ; then
ALT_COMPILER_PATH=/opt/SUNWspro/bin
export ALT_COMPILER_PATH
--- a/make/jprt.config Fri Jun 06 08:29:25 2008 -0700
+++ b/make/jprt.config Fri Jun 13 08:28:21 2008 -0700
@@ -133,9 +133,15 @@ if [ "${osname}" = SunOS ] ; then
solaris_arch=i386
fi
- # Get the SS11 compilers into path (make sure it matches ALT setting)
- compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/SS11/bin
- compiler_name=SS11
+ # Get the compilers into path (make sure it matches ALT setting)
+ if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
+ compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
+ else
+ # FIXUP: Change to SS12 when validated
+ #compiler_name=SS12
+ compiler_name=SS11
+ fi
+ compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
ALT_COMPILER_PATH="${compiler_path}"
export ALT_COMPILER_PATH
dirMustExist "${compiler_path}" ALT_COMPILER_PATH
--- a/make/sun/jawt/Makefile Fri Jun 06 08:29:25 2008 -0700
+++ b/make/sun/jawt/Makefile Fri Jun 13 08:28:21 2008 -0700
@@ -93,7 +93,6 @@ else # PLATFORM
# Other extra flags needed for compiling.
#
CPPFLAGS += -I$(OPENWIN_HOME)/include \
- -I$(MOTIF_DIR)/include \
-I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(SHARE_SRC)/native/$(PKGDIR)/image \
-I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
--- a/src/share/classes/java/awt/Component.java Fri Jun 06 08:29:25 2008 -0700
+++ b/src/share/classes/java/awt/Component.java Fri Jun 13 08:28:21 2008 -0700
@@ -3057,10 +3057,24 @@ public abstract class Component implemen
// services. Additionally, the request is restricted to
// the bounds of the component.
if (parent != null) {
- int px = this.x + ((x < 0) ? 0 : x);
- int py = this.y + ((y < 0) ? 0 : y);
+ if (x < 0) {
+ width += x;
+ x = 0;
+ }
+ if (y < 0) {
+ height += y;
+ y = 0;
+ }
+
int pwidth = (width > this.width) ? this.width : width;
int pheight = (height > this.height) ? this.height : height;
+
+ if (pwidth <= 0 || pheight <= 0) {
+ return;
+ }
+
+ int px = this.x + x;
+ int py = this.y + y;
parent.repaint(tm, px, py, pwidth, pheight);
}
} else {
--- a/src/share/classes/java/awt/dnd/DragSourceContext.java Fri Jun 06 08:29:25 2008 -0700
+++ b/src/share/classes/java/awt/dnd/DragSourceContext.java Fri Jun 13 08:28:21 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 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
@@ -485,7 +485,6 @@ public class DragSourceContext
Cursor c = null;
- targetAct = DnDConstants.ACTION_NONE;
switch (status) {
case ENTER:
case OVER:
@@ -507,6 +506,10 @@ public class DragSourceContext
else
c = DragSource.DefaultCopyDrop;
}
+ break;
+ default:
+ targetAct = DnDConstants.ACTION_NONE;
+
}
setCursorImpl(c);
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Fri Jun 06 08:29:25 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Fri Jun 13 08:28:21 2008 -0700
@@ -1696,8 +1696,8 @@ public class RequiredModelMBean
} catch (Exception e) {
// eat exceptions because interface doesn't have an
// exception on it
- if (MODELMBEAN_LOGGER.isLoggable(Level.WARNING)) {
- MODELMBEAN_LOGGER.logp(Level.WARNING,
+ if (MODELMBEAN_LOGGER.isLoggable(Level.FINER)) {
+ MODELMBEAN_LOGGER.logp(Level.FINER,
RequiredModelMBean.class.getName(),
"getAttributes(String[])",
"Failed to get \"" + attrNames[i] + "\": ", e);
@@ -1857,8 +1857,8 @@ public class RequiredModelMBean
attrValue.getClass().getName() +
" received.");
} catch (ClassNotFoundException x) {
- if (MODELMBEAN_LOGGER.isLoggable(Level.WARNING)) {
- MODELMBEAN_LOGGER.logp(Level.WARNING,
+ if (MODELMBEAN_LOGGER.isLoggable(Level.FINER)) {
+ MODELMBEAN_LOGGER.logp(Level.FINER,
RequiredModelMBean.class.getName(),
"setAttribute(Attribute)","Class " +
attrType + " for attribute "
@@ -2224,8 +2224,8 @@ public class RequiredModelMBean
ntfyObj.getMessage() + " Severity = " +
(String)ntfyDesc.getFieldValue("severity"));
} catch (Exception e) {
- if (MODELMBEAN_LOGGER.isLoggable(Level.WARNING)) {
- MODELMBEAN_LOGGER.logp(Level.WARNING,
+ if (MODELMBEAN_LOGGER.isLoggable(Level.FINE)) {
+ MODELMBEAN_LOGGER.logp(Level.FINE,
RequiredModelMBean.class.getName(),
"sendNotification(Notification)",
"Failed to log " +
@@ -2618,8 +2618,8 @@ public class RequiredModelMBean
" Old value = " + oldv +
" New value = " + newv);
} catch (Exception e) {
- if (MODELMBEAN_LOGGER.isLoggable(Level.WARNING)) {
- MODELMBEAN_LOGGER.logp(Level.WARNING,
+ if (MODELMBEAN_LOGGER.isLoggable(Level.FINE)) {
+ MODELMBEAN_LOGGER.logp(Level.FINE,
RequiredModelMBean.class.getName(),mth,
"Failed to log " + ntfyObj.getType() +
" notification: ", e);
@@ -2644,8 +2644,8 @@ public class RequiredModelMBean
" Old value = " + oldv +
" New value = " + newv);
} catch (Exception e) {
- if (MODELMBEAN_LOGGER.isLoggable(Level.WARNING)) {
- MODELMBEAN_LOGGER.logp(Level.WARNING,
+ if (MODELMBEAN_LOGGER.isLoggable(Level.FINE)) {
+ MODELMBEAN_LOGGER.logp(Level.FINE,
RequiredModelMBean.class.getName(),mth,
"Failed to log " + ntfyObj.getType() +
" notification: ", e);
--- a/src/share/classes/sun/security/provider/certpath/OCSPChecker.java Fri Jun 06 08:29:25 2008 -0700
+++ b/src/share/classes/sun/security/provider/certpath/OCSPChecker.java Fri Jun 13 08:28:21 2008 -0700
@@ -102,7 +102,7 @@ class OCSPChecker extends PKIXCertPathCh
*/
public void init(boolean forward) throws CertPathValidatorException {
if (!forward) {
- remainingCerts = certs.length;
+ remainingCerts = certs.length + 1;
} else {
throw new CertPathValidatorException(
"Forward checking not supported");
@@ -131,13 +131,21 @@ class OCSPChecker extends PKIXCertPathCh
InputStream in = null;
OutputStream out = null;
+
+ // Decrement the certificate counter
+ remainingCerts--;
+
try {
- // Examine OCSP properties
X509Certificate responderCert = null;
boolean seekResponderCert = false;
X500Principal responderSubjectName = null;
X500Principal responderIssuerName = null;
BigInteger responderSerialNumber = null;
+
+ boolean seekIssuerCert = true;
+ X509CertImpl issuerCertImpl = null;
+ X509CertImpl currCertImpl =
+ X509CertImpl.toImpl((X509Certificate)cert);
/*
* OCSP security property values, in the following order:
@@ -148,6 +156,9 @@ class OCSPChecker extends PKIXCertPathCh
*/
String[] properties = getOCSPProperties();
+ // Check whether OCSP is feasible before seeking cert information
+ URL url = getOCSPServerURL(currCertImpl, properties);
+
// When responder's subject name is set then the issuer/serial
// properties are ignored
if (properties[1] != null) {
@@ -172,14 +183,9 @@ class OCSPChecker extends PKIXCertPathCh
seekResponderCert = true;
}
- boolean seekIssuerCert = true;
- X509CertImpl issuerCertImpl = null;
- X509CertImpl currCertImpl =
- X509CertImpl.toImpl((X509Certificate)cert);
- remainingCerts--;
-
- // Set the issuer certificate
- if (remainingCerts != 0) {
+ // Set the issuer certificate to the next cert in the chain
+ // (unless we're processing the final cert).
+ if (remainingCerts < certs.length) {
issuerCertImpl = X509CertImpl.toImpl(certs[remainingCerts]);
seekIssuerCert = false; // done
@@ -312,7 +318,8 @@ class OCSPChecker extends PKIXCertPathCh
// Construct an OCSP Request
OCSPRequest ocspRequest =
new OCSPRequest(currCertImpl, issuerCertImpl);
- URL url = getOCSPServerURL(currCertImpl, properties);
+
+ // Use the URL to the OCSP service that was created earlier
HttpURLConnection con = (HttpURLConnection)url.openConnection();
if (DEBUG != null) {
DEBUG.println("connecting to OCSP service at: " + url);
--- a/src/solaris/native/java/net/PlainSocketImpl.c Fri Jun 06 08:29:25 2008 -0700
+++ b/src/solaris/native/java/net/PlainSocketImpl.c Fri Jun 13 08:28:21 2008 -0700
@@ -358,15 +358,28 @@ Java_java_net_PlainSocketImpl_socketConn
* See 6343810.
*/
while (1) {
- fd_set wr, ex;
-
- FD_ZERO(&wr);
- FD_SET(fd, &wr);
- FD_ZERO(&ex);
- FD_SET(fd, &ex);
-
- errno = 0;
- connect_rv = NET_Select(fd+1, 0, &wr, &ex, 0);
+#ifndef USE_SELECT
+ {
+fprintf(stdout,"\nNATIVE: fd = %d] ", fd);
+ struct pollfd pfd;
+ pfd.fd = fd;
+ pfd.events = POLLOUT;
+
+ connect_rv = NET_Poll(&pfd, 1, -1);
+ }
+#else
+ {
+ fd_set wr, ex;
+
+ FD_ZERO(&wr);
+ FD_SET(fd, &wr);
+ FD_ZERO(&ex);
+ FD_SET(fd, &ex);
+
+ connect_rv = NET_Select(fd+1, 0, &wr, &ex, 0);
+ }
+#endif
+
if (connect_rv == JVM_IO_ERR) {
if (errno == EINTR) {
continue;
--- a/src/windows/native/sun/windows/awt_Component.cpp Fri Jun 06 08:29:25 2008 -0700
+++ b/src/windows/native/sun/windows/awt_Component.cpp Fri Jun 13 08:28:21 2008 -0700
@@ -3464,6 +3464,21 @@ UINT AwtComponent::WindowsKeyToJavaKey(U
return java_awt_event_KeyEvent_VK_UNDEFINED;
}
+BOOL AwtComponent::IsNavigationKey(UINT wkey) {
+ switch (wkey) {
+ case VK_END:
+ case VK_PRIOR: // PageUp
+ case VK_NEXT: // PageDown
+ case VK_HOME:
+ case VK_LEFT:
+ case VK_UP:
+ case VK_RIGHT:
+ case VK_DOWN:
+ return TRUE;
+ }
+ return FALSE;
+}
+
// determine if a key is a numpad key (distinguishes the numpad
// arrow keys from the non-numpad arrow keys, for example).
BOOL AwtComponent::IsNumPadKey(UINT vkey, BOOL extended)
@@ -3563,7 +3578,10 @@ UINT AwtComponent::WindowsKeyToJavaChar(
// fix for 4623376,4737679,4501485,4740906,4708221 (4173679/4122715)
// Here we try to resolve a conflict with ::ToAsciiEx's translating
// ALT+number key combinations. kdm@sarc.spb.su
- keyboardState[VK_MENU] &= ~KEY_STATE_DOWN;
+ // yan: Do it for navigation keys only, otherwise some AltGr deadkeys fail.
+ if( IsNavigationKey(wkey) ) {
+ keyboardState[VK_MENU] &= ~KEY_STATE_DOWN;
+ }
if (ctrlIsDown)
{
--- a/src/windows/native/sun/windows/awt_Component.h Fri Jun 06 08:29:25 2008 -0700
+++ b/src/windows/native/sun/windows/awt_Component.h Fri Jun 13 08:28:21 2008 -0700
@@ -823,6 +823,7 @@ private:
private:
AwtComponent* SearchChild(UINT id);
void RemoveChild(UINT id) ;
+ static BOOL IsNavigationKey(UINT wkey);
ChildListItem* m_childList;
--- a/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java Fri Jun 06 08:29:25 2008 -0700
+++ b/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java Fri Jun 13 08:28:21 2008 -0700
@@ -2,32 +2,22 @@
* Copyright 2008 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 modi
-fy it
- * under the terms of the GNU General Public License version 2 onl
-y, as
+ * 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.
*
- * This code is distributed in the hope that it will be useful, bu
-t WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABIL
-ITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public L
-icense
- * version 2 for more details (a copy is included in the LICENSE f
-ile that
+ * 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 Licen
-se version
- * 2 along with this work; if not, write to the Free Software Foun
-dation,
+ * 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, San
-ta Clara,
- * CA 95054 USA or visit www.sun.com if you need additional inform
-ation or
+ * 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.
*/
--- a/test/sun/security/tools/keytool/autotest.sh Fri Jun 06 08:29:25 2008 -0700
+++ b/test/sun/security/tools/keytool/autotest.sh Fri Jun 13 08:28:21 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2008 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
@@ -90,7 +90,8 @@ chmod u+w cert8.db
echo | ${TESTJAVA}${FS}bin${FS}java -Dfile -Dnss \
-Dnss.lib=${NSS}${FS}lib${FS}${PF}${FS}${LIBNAME} \
- KeyToolTest || exit 12
+ KeyToolTest
+status=$?
rm -f p11-nss.txt
rm -f cert8.db
@@ -101,4 +102,5 @@ rm KeyToolTest.class
rm KeyToolTest.class
rm TestException.class
-exit $?
+exit $status
+
--- a/test/javax/management/Introspector/LegacyIntrospectorTest.java Fri Jun 06 08:29:25 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright 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.
- *
- * 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.
- */
-
-/*
- * @test
- * @bug 6316460
- * @summary Test that the legacy com.sun.management.jmx.Introspector
- * methods work.
- * @author Eamonn McManus
- * @run clean LegacyIntrospectorTest
- * @run build LegacyIntrospectorTest
- * @run main LegacyIntrospectorTest
- */
-
-import javax.management.*;
-import com.sun.management.jmx.*;
-
-public class LegacyIntrospectorTest {
- public static interface TestMBean {
- public int getWhatever();
- }
- public static class Test implements TestMBean {
- public int getWhatever() {return 0;}
- }
-
- @SuppressWarnings("deprecation")
- public static void main(String[] args) throws Exception {
- MBeanInfo mbi = Introspector.testCompliance(Test.class);
- MBeanAttributeInfo mbai = mbi.getAttributes()[0];
- if (!mbai.getName().equals("Whatever"))
- throw new Exception("Wrong attribute name: " + mbai.getName());
- Class c = Introspector.getMBeanInterface(Test.class);
- if (c != TestMBean.class)
- throw new Exception("Wrong interface: " + c);
-
- MBeanServer mbs1 = new MBeanServerImpl();
- if (!mbs1.getDefaultDomain().equals("DefaultDomain"))
- throw new Exception("Wrong default domain: " + mbs1.getDefaultDomain());
-
- MBeanServer mbs2 = new MBeanServerImpl("Foo");
- if (!mbs2.getDefaultDomain().equals("Foo"))
- throw new Exception("Wrong default domain: " + mbs2.getDefaultDomain());
-
- ObjectName delegateName =
- new ObjectName("JMImplementation:type=MBeanServerDelegate");
- MBeanInfo delegateInfo = mbs2.getMBeanInfo(delegateName);
- MBeanInfo refDelegateInfo =
- MBeanServerFactory.newMBeanServer().getMBeanInfo(delegateName);
- if (!delegateInfo.equals(refDelegateInfo))
- throw new Exception("Wrong delegate info from MBeanServerImpl: " +
- delegateInfo);
-
- System.out.println("TEST PASSED");
- }
-}