Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 72939 invoked from network); 10 Feb 2009 14:30:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Feb 2009 14:30:52 -0000 Received: (qmail 91615 invoked by uid 500); 10 Feb 2009 14:30:52 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 91466 invoked by uid 500); 10 Feb 2009 14:30:51 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 91450 invoked by uid 99); 10 Feb 2009 14:30:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Feb 2009 06:30:51 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Feb 2009 14:30:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D0F8A2388999; Tue, 10 Feb 2009 14:30:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r742981 - in /webservices/axis/trunk/java: release-notes.html src/org/apache/axis/i18n/ProjectResourceBundle.java Date: Tue, 10 Feb 2009 14:30:15 -0000 To: axis-cvs@ws.apache.org From: gdaniels@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090210143027.D0F8A2388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gdaniels Date: Tue Feb 10 14:29:55 2009 New Revision: 742981 URL: http://svn.apache.org/viewvc?rev=742981&view=rev Log: No one seems to use the clearCache() method in Axis directly, so rename it to clearPRBCache() in order to fix build break with Java 1.6. Hopefully this will fix Gump. Update release-notes.html to reflect this. Modified: webservices/axis/trunk/java/release-notes.html webservices/axis/trunk/java/src/org/apache/axis/i18n/ProjectResourceBundle.java Modified: webservices/axis/trunk/java/release-notes.html URL: http://svn.apache.org/viewvc/webservices/axis/trunk/java/release-notes.html?rev=742981&r1=742980&r2=742981&view=diff ============================================================================== --- webservices/axis/trunk/java/release-notes.html (original) +++ webservices/axis/trunk/java/release-notes.html Tue Feb 10 14:29:55 2009 @@ -14,18 +14,28 @@ -

Axis 1.4 Release Notes

Axis 1.5 Release Notes

This is the 1.4 release +

This is the 1.5 release of the Axis SOAP toolkit.

About this release

This is the Final release of Axis 1.4. Please kick the tires, +

This is the initial release of Axis 1.5. Please kick the tires, put it through it's paces, and let us know via our mailing lists or bug tracking system if there are problems. +

IMPORTANT - breaking changes!!

+ +

This release contains some changes that are incompatible with version 1.4. Please be careful. Particulars follow.

+ +

In ProjectResourceBundle, we were overriding the static clearCache() method from ResourceBundle. In Java 1.6, this method became "static final", and therefore non-overridable. We therefore renamed the version that clears out our internal cache to "clearPRBCache()". +

Change History

Here is the change log (a high-level list of changes). You can also read the svn change log (which lists actual diffs).

JAX-RPC

This release is intended to be 100% compliant with the JAX-RPC and SAAJ specifications from Sun. Modified: webservices/axis/trunk/java/src/org/apache/axis/i18n/ProjectResourceBundle.java URL: http://svn.apache.org/viewvc/webservices/axis/trunk/java/src/org/apache/axis/i18n/ProjectResourceBundle.java?rev=742981&r1=742980&r2=742981&view=diff ============================================================================== --- webservices/axis/trunk/java/src/org/apache/axis/i18n/ProjectResourceBundle.java (original) +++ webservices/axis/trunk/java/src/org/apache/axis/i18n/ProjectResourceBundle.java Tue Feb 10 14:29:55 2009 @@ -114,14 +114,14 @@ * * @param projectName The name of the project to which the class belongs. * It must be a proper prefix of the caller's package. - * - * @param caller The calling class. - * This is used to get the package name to further construct - * the basename as well as to get the proper ClassLoader. + * + * @param packageName The name of the package. * * @param resourceName The name of the resource without the * ".properties" extension - * + * + * @return the appropriate ProjectResourceBundle + * * @throws MissingResourceException if projectName is not a prefix of * the caller's package name, or if the resource could not be * found/loaded. @@ -146,7 +146,11 @@ * * @param resourceName The name of the resource without the * ".properties" extension - * + * + * @param locale the Locale for messages + * + * @return the appropriate ProjectResourceBundle + * * @throws MissingResourceException if projectName is not a prefix of * the caller's package name, or if the resource could not be * found/loaded. @@ -170,15 +174,17 @@ * @param projectName The name of the project to which the class belongs. * It must be a proper prefix of the caller's package. * - * @param caller The calling class. - * This is used to get the package name to further construct - * the basename as well as to get the proper ClassLoader. - * + * @param packageName The package name of the resource + * * @param resourceName The name of the resource without the * ".properties" extension * * @param locale The locale - * + * + * @param loader ClassLoader to use when finding things + * + * @return the appropriate ProjectResourceBundle + * * @throws MissingResourceException if projectName is not a prefix of * the caller's package name, or if the resource could not be * found/loaded. @@ -210,7 +216,9 @@ * * @param extendsBundle If non-null, then this ExtendMessages will * default to extendsBundle. - * + * + * @return the appropriate ProjectResourceBundle + * * @throws MissingResourceException if projectName is not a prefix of * the caller's package name, or if the resource could not be * found/loaded. @@ -236,18 +244,20 @@ * @param projectName The name of the project to which the class belongs. * It must be a proper prefix of the caller's package. * - * @param caller The calling class. - * This is used to get the package name to further construct - * the basename as well as to get the proper ClassLoader. - * + * @param packageName The package name of the resource + * * @param resourceName The name of the resource without the * ".properties" extension * * @param locale The locale * + * @param loader ClassLoader to use when finding things + * * @param extendsBundle If non-null, then this ExtendMessages will * default to extendsBundle. - * + * + * @return the appropriate ProjectResourceBundle + * * @throws MissingResourceException if projectName is not a prefix of * the caller's package name, or if the resource could not be * found/loaded. @@ -276,7 +286,7 @@ packageName = context.validate(packageName); - ProjectResourceBundle bundle = null; + ProjectResourceBundle bundle; try { bundle = getBundle(context, packageName); } catch (RuntimeException e) { @@ -298,6 +308,11 @@ * - check cache * - try up hierarchy * - if at top of hierarchy, use (link to) context.getParentBundle() + * + * @param context a Context object containing metadata about this call + * @param packageName the package name of the resource + * + * @return the appropriate ProjectResourceBundle */ private static synchronized ProjectResourceBundle getBundle(Context context, String packageName) throws MissingResourceException @@ -339,13 +354,15 @@ return prb; } - private static final String getPackage(String name) { + private static String getPackage(String name) { return name.substring(0, name.lastIndexOf('.')).intern(); } /** * Construct a new ProjectResourceBundle - */ + * @param name the name of this bundle + * @param bundle reference to our parent bundle + */ private ProjectResourceBundle(String name, ResourceBundle bundle) throws MissingResourceException { @@ -360,7 +377,7 @@ /** * Clears the internal cache */ - public static void clearCache() + public static void clearPRBCache() { bundleCache.clear(); } @@ -428,7 +445,7 @@ ResourceBundle getParentBundle(String packageName) { ResourceBundle p; - if (packageName != _projectName) { + if (!packageName.equals(_projectName)) { p = getBundle(this, getPackage(packageName)); } else { p = _parent; @@ -456,7 +473,7 @@ /* Ensure that project is a proper prefix of class. * Terminate project name with '.' to ensure proper match. */ - if (packageName != _projectName && !packageName.startsWith(_projectName + '.')) { + if (!packageName.equals(_projectName) && !packageName.startsWith(_projectName + '.')) { log.debug("Project not a prefix of Package"); throw new MissingResourceException("Project '" + _projectName + "' must be a prefix of Package '"