You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/02/11 22:17:18 UTC
svn commit: r506140 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/monitor/
runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/
Author: jboynes
Date: Sun Feb 11 13:17:17 2007
New Revision: 506140
URL: http://svn.apache.org/viewvc?view=rev&rev=506140
Log:
add a MonitorFactory for use inside Maven
Added:
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenMonitorFactory.java (with props)
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java?view=diff&rev=506140&r1=506139&r2=506140
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java Sun Feb 11 13:17:17 2007
@@ -165,7 +165,7 @@
Map<String, Level> levels);
protected String formatException(Throwable e) {
- ExceptionFormatter formatter = null;
+ ExceptionFormatter formatter = defaultFormatter;
for (ExceptionFormatter candidate : formatters) {
if (candidate.canFormat(e.getClass())) {
formatter = candidate;
@@ -174,11 +174,7 @@
}
StringWriter writer = new StringWriter();
PrintWriter pw = new PrintWriter(writer);
- if (formatter != null) {
- formatter.write(pw, e);
- } else {
- defaultFormatter.write(pw, e);
- }
+ formatter.write(pw, e);
format(pw, e);
pw.close();
return writer.toString();
@@ -213,19 +209,14 @@
pw.println("Caused by: " + throwable.getClass().getName());
- ExceptionFormatter formatter = null;
+ ExceptionFormatter formatter = defaultFormatter;
for (ExceptionFormatter candidate : formatters) {
if (candidate.canFormat(throwable.getClass())) {
formatter = candidate;
break;
}
}
- if (formatter != null) {
- formatter.write(pw, throwable);
- } else {
- defaultFormatter.write(pw, throwable);
- }
-
+ formatter.write(pw, throwable);
for (int i = 0; i <= m; i++) {
pw.println("\tat " + trace[i]);
Added: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenMonitorFactory.java?view=auto&rev=506140
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenMonitorFactory.java (added)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenMonitorFactory.java Sun Feb 11 13:17:17 2007
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.plugin.itest;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.HashMap;
+import java.util.logging.Level;
+import java.text.MessageFormat;
+
+import org.apache.maven.plugin.logging.Log;
+
+import org.apache.tuscany.core.monitor.ProxyMonitorFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MavenMonitorFactory extends ProxyMonitorFactory {
+ private final Log log;
+
+ public MavenMonitorFactory(Log log) {
+ this.log = log;
+ Map<String, Object> configProperties = new HashMap<String, Object>();
+ configProperties.put("defaultLevel", Level.FINEST);
+ initInternal(configProperties);
+ }
+
+ protected <T> InvocationHandler createInvocationHandler(Class<T> monitorInterface, Map<String, Level> levels) {
+ ResourceBundle bundle = locateBundle(monitorInterface, bundleName);
+ return new MonitorHandler(monitorInterface.getName(), levels, bundle);
+ }
+
+ private class MonitorHandler implements InvocationHandler {
+ private final String monitorName;
+ private final Map<String, Level> methodLevels;
+ private final ResourceBundle bundle;
+
+ public MonitorHandler(String monitorName, Map<String, Level> methodLevels, ResourceBundle bundle) {
+ this.monitorName = monitorName;
+ this.methodLevels = methodLevels;
+ this.bundle = bundle;
+ }
+
+ public Object invoke(Object object, Method method, Object[] objects) throws Throwable {
+ String sourceMethod = method.getName();
+ Level level = methodLevels.get(sourceMethod);
+ if (level == Level.OFF) {
+ return null;
+ }
+
+ int value = level.intValue();
+ if (isLogEnabled(value)) {
+ String key = monitorName + '#' + sourceMethod;
+ String message;
+ if (bundle != null) {
+ message = bundle.getString(key);
+ } else {
+ message = null;
+ }
+ if (message != null) {
+ message = MessageFormat.format(message, objects);
+ } else {
+ StringBuilder builder = new StringBuilder();
+ builder.append(key).append(":");
+ for (Object o : objects) {
+ builder.append(' ');
+ if (o instanceof Throwable) {
+ builder.append(formatException((Throwable) o));
+ } else {
+ builder.append(String.valueOf(o));
+ }
+ }
+ message = builder.toString();
+ }
+ Throwable cause = getFirstException(objects);
+ if (cause != null) {
+ if (value >= Level.SEVERE.intValue()) {
+ log.error(message, cause);
+ } else if (value >= Level.WARNING.intValue()) {
+ log.warn(message, cause);
+ } else if (value >= Level.INFO.intValue()) {
+ log.info(message, cause);
+ } else if (value >= Level.FINEST.intValue()) {
+ log.debug(message, cause);
+ }
+ } else {
+ if (value >= Level.SEVERE.intValue()) {
+ log.error(message);
+ } else if (value >= Level.WARNING.intValue()) {
+ log.warn(message);
+ } else if (value >= Level.INFO.intValue()) {
+ log.info(message);
+ } else if (value >= Level.FINEST.intValue()) {
+ log.debug(message);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private boolean isLogEnabled(int value) {
+ return log.isDebugEnabled() && value >= Level.FINEST.intValue()
+ || log.isInfoEnabled() && value >= Level.INFO.intValue()
+ || log.isWarnEnabled() && value >= Level.WARNING.intValue()
+ || log.isErrorEnabled() && value >= Level.SEVERE.intValue();
+ }
+
+ private Throwable getFirstException(Object[] objects) {
+ for (Object object : objects) {
+ if (object instanceof Throwable) {
+ return (Throwable) object;
+ }
+ }
+ return null;
+ }
+ }
+}
Propchange: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenMonitorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenMonitorFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java?view=diff&rev=506140&r1=506139&r2=506140
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java Sun Feb 11 13:17:17 2007
@@ -149,6 +149,7 @@
Log log = getLog();
log.info("Starting Tuscany...");
MavenEmbeddedRuntime runtime = createRuntime();
+ runtime.setMonitorFactory(new MavenMonitorFactory(log));
try {
runtime.initialize();
} catch (InitializationException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org