cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util StringManager.java
costin 2005/09/28 22:55:15
Modified:catalina/src/share/org/apache/catalina/core
AprLifecycleListener.java
catalina/src/share/org/apache/catalina/startup
Bootstrap.java WebRuleSet.java
catalina/src/share/org/apache/catalina/util
StringManager.java
Log:
Remove annoying warnings when compiling with JDK1.5 ( without source=1.3 ),
just casts to the normal params to avoid
conflict with the vararg variants.
Revision ChangesPath
1.4 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
Index: AprLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AprLifecycleListener.java 1 Aug 2005 12:13:59 - 1.3
+++ AprLifecycleListener.java 29 Sep 2005 05:55:14 - 1.4
@@ -101,8 +101,8 @@
try {
String methodName = terminate;
Method method =
Class.forName(org.apache.tomcat.jni.Library)
-.getMethod(methodName, null);
-method.invoke(null, null);
+.getMethod(methodName, (Class [])null);
+method.invoke(null, (Object []) null);
} catch (Throwable t) {
if (!log.isDebugEnabled()) {
log.info(sm.getString(aprListener.aprDestroy));
1.24 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Bootstrap.java15 Sep 2005 06:04:01 - 1.23
+++ Bootstrap.java29 Sep 2005 05:55:14 - 1.24
@@ -271,8 +271,8 @@
throws Exception {
if( catalinaDaemon==null ) init();
-Method method = catalinaDaemon.getClass().getMethod(start, null);
-method.invoke(catalinaDaemon, null);
+Method method = catalinaDaemon.getClass().getMethod(start, (Class
[] )null);
+method.invoke(catalinaDaemon, (Object [])null);
}
@@ -283,8 +283,8 @@
public void stop()
throws Exception {
-Method method = catalinaDaemon.getClass().getMethod(stop, null);
-method.invoke(catalinaDaemon, null);
+Method method = catalinaDaemon.getClass().getMethod(stop, (Class
[] ) null);
+method.invoke(catalinaDaemon, (Object [] ) null);
}
@@ -296,8 +296,8 @@
throws Exception {
Method method =
-catalinaDaemon.getClass().getMethod(stopServer, null);
-method.invoke(catalinaDaemon, null);
+catalinaDaemon.getClass().getMethod(stopServer, (Class [])
null);
+method.invoke(catalinaDaemon, (Object []) null);
}
1.15 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
Index: WebRuleSet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebRuleSet.java 26 Jul 2004 16:04:01 - 1.14
+++ WebRuleSet.java 29 Sep 2005 05:55:14 - 1.15
@@ -576,7 +576,7 @@
return;
}
-m.invoke(top, paramValues);
+m.invoke(top, (Object [])paramValues);
if (digester.getLogger().isDebugEnabled())
digester.getLogger().debug( + top.getClass().getName() + .
+ method + ( + paramValues[0] +
));
1.8 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java
Index: StringManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StringManager.java16 Sep 2004 23:19:54 - 1.7
+++ StringManager.java29 Sep 2005 05:55:15 - 1.8
@@ -101,7 +101,7 @@
* @param key The resource name
*/
public String getString(String key) {
-return MessageFormat.format(getStringInternal(key), null);
+return MessageFormat.format(getStringInternal(key),
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util StringManager.java
yoavs 2004/05/26 09:26:28
Modified:catalina/src/share/org/apache/catalina/util
StringManager.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.6 +18 -18
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java
Index: StringManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringManager.java27 Feb 2004 14:58:51 - 1.5
+++ StringManager.java26 May 2004 16:26:28 - 1.6
@@ -93,7 +93,7 @@
/**
* Get a string from the underlying resource bundle.
*
- * @param key
+ * @param key The resource name
*/
public String getString(String key) {
return MessageFormat.format(getStringInternal(key), null);
@@ -124,8 +124,8 @@
* Get a string from the underlying resource bundle and format
* it with the given set of arguments.
*
- * @param key
- * @param args
+ * @param key The resource name
+ * @param args Formatting directives
*/
public String getString(String key, Object[] args) {
@@ -163,8 +163,8 @@
* with the given object argument. This argument can of course be
* a String object.
*
- * @param key
- * @param arg
+ * @param key The resource name
+ * @param arg Formatting directive
*/
public String getString(String key, Object arg) {
@@ -177,9 +177,9 @@
* with the given object arguments. These arguments can of course
* be String objects.
*
- * @param key
- * @param arg1
- * @param arg2
+ * @param key The resource name
+ * @param arg1 Formatting directive
+ * @param arg2 Formatting directive
*/
public String getString(String key, Object arg1, Object arg2) {
@@ -192,10 +192,10 @@
* with the given object arguments. These arguments can of course
* be String objects.
*
- * @param key
- * @param arg1
- * @param arg2
- * @param arg3
+ * @param key The resource name
+ * @param arg1 Formatting directive
+ * @param arg2 Formatting directive
+ * @param arg3 Formatting directive
*/
public String getString(String key, Object arg1, Object arg2,
@@ -209,11 +209,11 @@
* with the given object arguments. These arguments can of course
* be String objects.
*
- * @param key
- * @param arg1
- * @param arg2
- * @param arg3
- * @param arg4
+ * @param key The resource name
+ * @param arg1 Formatting directive
+ * @param arg2 Formatting directive
+ * @param arg3 Formatting directive
+ * @param arg4 Formatting directive
*/
public String getString(String key, Object arg1, Object arg2,
@@ -232,7 +232,7 @@
* a package already exists, it will be reused, else a new
* StringManager will be created and returned.
*
- * @param packageName
+ * @param packageName The package name
*/
public synchronized static StringManager getManager(String packageName) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util StringManager.java
remm2003/07/18 15:54:20
Modified:catalina/src/share/org/apache/catalina/util
StringManager.java
Log:
- Fix a problem where the Strings weren't escaped in the same way for chars
such as '. This caused problems for localization in French.
Revision ChangesPath
1.4 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java
Index: StringManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringManager.java9 Apr 2003 04:29:56 - 1.3
+++ StringManager.java18 Jul 2003 22:54:19 - 1.4
@@ -142,8 +142,12 @@
*
* @param key
*/
-
public String getString(String key) {
+return MessageFormat.format(getStringInternal(key), null);
+}
+
+
+protected String getStringInternal(String key) {
if (key == null) {
String msg = key is null;
@@ -173,7 +177,7 @@
public String getString(String key, Object[] args) {
String iString = null;
-String value = getString(key);
+String value = getStringInternal(key);
// this check for the runtime exception is some pre 1.1.6
// VM's don't do an automatic toString() on the passed in
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util StringManager.java
costin 2003/04/04 20:10:34
Modified:catalina/src/share/org/apache/catalina/util
StringManager.java
Log:
Ok, classloader problems still happen - and it's better to get some meaningfull
messages ( the URLs ), and be able to debug the rest of the app. Otherwise - you
just get a stack trace.
I think we should also switch to the StringManager in util, it has few more tricks.
ResourceBundle is a very tricky class wrt class loaders
Revision ChangesPath
1.2 +19 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java
Index: StringManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringManager.java18 Jul 2002 16:47:43 - 1.1
+++ StringManager.java5 Apr 2003 04:10:34 - 1.2
@@ -69,6 +69,7 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.net.URLClassLoader;
/**
* An internationalization / localization helper class which reduces
@@ -112,7 +113,18 @@
private StringManager(String packageName) {
String bundleName = packageName + .LocalStrings;
-bundle = ResourceBundle.getBundle(bundleName);
+try {
+bundle = ResourceBundle.getBundle(bundleName);
+return;
+} catch( MissingResourceException ex ) {
+ClassLoader cl=this.getClass().getClassLoader();
+
+System.out.println(Can't find resource + bundleName +
+ + cl);
+if( cl instanceof URLClassLoader ) {
+System.out.println( ((URLClassLoader)cl).getURLs());
+}
+}
}
/**
@@ -130,6 +142,8 @@
String str = null;
+if( bundle==null )
+return key;
try {
str = bundle.getString(key);
} catch (MissingResourceException mre) {
@@ -256,6 +270,7 @@
public synchronized static StringManager getManager(String packageName) {
StringManager mgr = (StringManager)managers.get(packageName);
+
if (mgr == null) {
mgr = new StringManager(packageName);
managers.put(packageName, mgr);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
