axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
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 GMT
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 @@
 </style>
 </head>
 <body>
-<h2>Axis 1.4 Release Notes</h2>
+<h2>Axis 1.5 Release Notes</h2>
 
-<p>This is the <a href="http://ws.apache.org/axis/releases.html">1.4 release</a>

+<p>This is the <a href="http://ws.apache.org/axis/releases.html">1.5 release</a>

   of the <a href="http://ws.apache.org/axis">Axis SOAP toolkit</a>.</p>
 
 <h3>About this release</h3>
-<p>This is the Final release of Axis 1.4.  Please kick the tires, 
+<p>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 
 <a href="http://issues.apache.org/jira/browse/AXIS">bug tracking system</a> if
there are problems.
 
+<h3>IMPORTANT - breaking changes!!</h3>
+
+<p>This release contains some changes that are incompatible with version 1.4.  Please
be careful.  Particulars follow.</p>
+
+<ul>
+ <li>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()".
+</ul>
+
 <h3>Change History</h3>
+
 <p>Here is the <a href="changelog.html">change log</a> (a high-level list
of changes).  You can also read the <a href="docs/svnlog.txt">svn change log</a>
(which lists actual diffs).</p>
+
 <h3>JAX-RPC</h3>
 <p>This release is intended to be 100% compliant with the <a href="http://java.sun.com/xml/jaxrpc">JAX-RPC</a>

   and <a href="http://java.sun.com/xml/saaj/">SAAJ</a> 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 '"



Mime
View raw message