rpms/axis/devel axis-java16.patch,NONE,1.1 axis.spec,1.29,1.30
Dan Horák
sharkcz at fedoraproject.org
Fri Sep 25 10:44:40 UTC 2009
Author: sharkcz
Update of /cvs/pkgs/rpms/axis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8118
Modified Files:
axis.spec
Added Files:
axis-java16.patch
Log Message:
* Fri Sep 25 2009 Dan Horak <dan[at]danny.cz> 0:1.2.1-7
- Backport fix for building with java 1.6, synced from F-11 branch (#511480, #523203)
axis-java16.patch:
ProjectResourceBundle.java | 63 ++++++++++++++++++++++++++++-----------------
1 file changed, 40 insertions(+), 23 deletions(-)
--- NEW FILE axis-java16.patch ---
--- src/org/apache/axis/i18n/ProjectResourceBundle.java.orig 2009-05-15 12:01:12.000000000 -0400
+++ src/org/apache/axis/i18n/ProjectResourceBundle.java 2009-05-15 12:03:40.000000000 -0400
@@ -114,14 +114,14 @@ public class ProjectResourceBundle exten
*
* @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 @@ public class ProjectResourceBundle exten
*
* @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 @@ public class ProjectResourceBundle exten
* @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 @@ public class ProjectResourceBundle exten
*
* @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 @@ public class ProjectResourceBundle exten
* @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 @@ public class ProjectResourceBundle exten
packageName = context.validate(packageName);
- ProjectResourceBundle bundle = null;
+ ProjectResourceBundle bundle;
try {
bundle = getBundle(context, packageName);
} catch (RuntimeException e) {
@@ -298,6 +308,11 @@ public class ProjectResourceBundle exten
* - 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 @@ public class ProjectResourceBundle exten
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 @@ public class ProjectResourceBundle exten
/**
* Clears the internal cache
*/
- public static void clearCache()
+ public static void clearPRBCache()
{
bundleCache.clear();
}
@@ -428,7 +445,7 @@ public class ProjectResourceBundle exten
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 @@ public class ProjectResourceBundle exten
/* 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 '"
Index: axis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/axis/devel/axis.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- axis.spec 24 Jul 2009 17:44:39 -0000 1.29
+++ axis.spec 25 Sep 2009 10:44:39 -0000 1.30
@@ -7,7 +7,7 @@
Name: axis
Version: 1.2.1
-Release: 6.1%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: A SOAP implementation in Java
License: ASL 2.0
@@ -19,6 +19,7 @@ Patch2: %{name}-imageio.patch
Patch3: %{name}-objectweb.patch
Patch4: %{name}-%{version}-DH.patch
Patch5: %{name}-build_xml.patch
+Patch6: %{name}-java16.patch
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: java-devel
BuildRequires: ant >= 0:1.6, ant-nodeps
@@ -98,6 +99,7 @@ Documentation for %{name}.
%patch3 -p1 -b .orig
%patch4
%patch5
+%patch6 -b .orig
# Remove provided binaries
find . -name "*.jar" -exec rm -f {} \;
@@ -215,6 +217,9 @@ fi
%doc docs/*
%changelog
+* Fri Sep 25 2009 Dan Horak <dan[at]danny.cz> 0:1.2.1-7
+- Backport fix for building with java 1.6, synced from F-11 branch (#511480, #523203)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.1-6.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list