Author: jboynes
Date: Wed Apr 5 06:40:04 2006
New Revision: 391611
URL: http://svn.apache.org/viewcvs?rev=391611&view=rev
Log:
cleanup logging and I18N
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
incubator/tuscany/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java?rev=391611&r1=391610&r2=391611&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
Wed Apr 5 06:40:04 2006
@@ -23,6 +23,7 @@
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Valve;
+import org.apache.catalina.util.StringManager;
import org.apache.catalina.core.StandardWrapper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -49,6 +50,7 @@
*/
public class TuscanyContextListener implements LifecycleListener {
private static final Log log =
LogFactory.getLog(TuscanyContextListener.class);
+ private static final StringManager sm =
StringManager.getManager("org.apache.tuscany.tomcat");
private static final String TUSCANY_RUNTIME_NAME =
RuntimeContext.class.getName();
public static final String MODULE_COMPONENT_NAME =
"org.apache.tuscany.core.webapp.ModuleComponentContext";
@@ -80,10 +82,11 @@
return;
}
+ log.info(sm.getString("context.configLoad", ctx.getName()));
try {
loadContext(ctx);
} catch (ConfigurationException e) {
- log.error("context.configError", e);
+ log.error(sm.getString("context.configError"), e);
// todo mark application as unavailable
return;
}
@@ -91,12 +94,12 @@
try {
moduleContext.fireEvent(EventContext.MODULE_START, null);
} catch (EventException e) {
- log.error("context.moduleStartError", e);
+ log.error(sm.getString("context.moduleStartError"), e);
// todo unload module component from runtime
// todo mark application as unavailable
return;
} catch (RuntimeException e) {
- log.error("context.unknownRuntimeException", e);
+ log.error(sm.getString("context.unknownRuntimeException"), e);
// todo unload module component from runtime
throw e;
}
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java?rev=391611&r1=391610&r2=391611&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
Wed Apr 5 06:40:04 2006
@@ -23,8 +23,6 @@
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.common.resource.ResourceLoader;
@@ -53,7 +51,7 @@
@SuppressWarnings({"serial"})
public class TuscanyHost extends StandardHost {
private static final String SYSTEM_MODULE_COMPONENT =
"org.apache.tuscany.core.system";
- private static final Log log = LogFactory.getLog(TuscanyHost.class);
+
private static final StringManager sm =
StringManager.getManager("org.apache.tuscany.tomcat");
private RuntimeContext runtime;
@@ -91,16 +89,16 @@
AggregateContext context =
BootstrapHelper.registerModule(systemContext, systemModuleComponent);
context.fireEvent(EventContext.MODULE_START, null);
} catch (ConfigurationLoadException e) {
- log.warn(sm.getString("runtime.loadSystemFailed"), e);
+ getLogger().warn(sm.getString("runtime.loadSystemFailed"), e);
return;
} catch (Exception e) {
- log.warn(sm.getString("runtime.registerSystemFailed"), e);
+ getLogger().warn(sm.getString("runtime.registerSystemFailed"), e);
runtime.stop();
runtime = null;
return;
}
- log.info(sm.getString("runtime.started"));
+ getLogger().info(sm.getString("runtime.started"));
}
private void stopRuntime() {
@@ -110,7 +108,7 @@
runtime.stop();
runtime = null;
- log.info(sm.getString("runtime.stopped"));
+ getLogger().info(sm.getString("runtime.stopped"));
}
public synchronized void addChild(Container child) {
Modified:
incubator/tuscany/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties?rev=391611&r1=391610&r2=391611&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
Wed Apr 5 06:40:04 2006
@@ -18,6 +18,7 @@
runtime.stopped = Stopped Tuscany runtime
tuscanyHost.notContext = Child of a TuscanyHost must be a StandardContext
+context.configLoad = Loading SCA configuration for application {0}
context.configError = Error loading the SCA configuration
context.moduleStartError = Error starting SCA module
