From b1454052ee2722c43bb7734105c7a1e926fccf4e Mon Sep 17 00:00:00 2001 From: rsivaram Date: Thu, 3 Jul 2008 19:36:29 +0000 Subject: Remove split monitor package in monitor-logging for OSGi classloading git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673777 13f79535-47bb-0310-9956-ffa450edef68 --- .../monitor/impl/DefaultLoggingMonitorImpl.java | 103 --------------------- .../sca/monitor/impl/MonitorFactoryImpl.java | 41 -------- .../logging/impl/DefaultLoggingMonitorImpl.java | 103 +++++++++++++++++++++ .../monitor/logging/impl/MonitorFactoryImpl.java | 41 ++++++++ .../org.apache.tuscany.sca.monitor.MonitorFactory | 2 +- .../tuscany/sca/monitor/MonitorTestCase.java | 2 +- 6 files changed, 146 insertions(+), 146 deletions(-) delete mode 100644 java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultLoggingMonitorImpl.java delete mode 100644 java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorFactoryImpl.java create mode 100644 java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java create mode 100644 java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java (limited to 'java/sca/modules') diff --git a/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultLoggingMonitorImpl.java b/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultLoggingMonitorImpl.java deleted file mode 100644 index 474d6b4b3a..0000000000 --- a/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultLoggingMonitorImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * 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.monitor.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; - - -/** - * A monitor for the watching for validation problems - * - * @version $Rev$ $Date$ - */ -public class DefaultLoggingMonitorImpl implements Monitor { - private static final Logger logger = Logger.getLogger(DefaultLoggingMonitorImpl.class.getName()); - - // Cache all the problem reported to monitor for further analysis - private List problemCache = new ArrayList(); - - public void problem(Problem problem) { - - Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName()); - - if (problemLogger == null){ - logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName()); - } - - if (problem.getSeverity() == Severity.INFO) { - problemCache.add(problem); - problemLogger.logp(Level.INFO, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.WARNING) { - problemCache.add(problem); - problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.ERROR) { - if (problem.getCause() != null) { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), - null, problem.getMessageId(), problem.getCause().toString()); - } else { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - } - } - - public List getProblems(){ - return problemCache; - } - - public Problem getLastLoggedProblem(){ - return problemCache.get(problemCache.size() - 1); - } - - public boolean isMessageLogged(String messageId) { - for (Problem problem : problemCache){ - if (problem.getMessageId().equals(messageId)){ - return true; - } - } - - return false; - } - - public Problem getProblem(String messageId) { - for (Problem problem : problemCache){ - if (problem.getMessageId().equals(messageId)){ - return problem; - } - } - - return null; - } -} diff --git a/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorFactoryImpl.java b/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorFactoryImpl.java deleted file mode 100644 index 5389306cb7..0000000000 --- a/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorFactoryImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.monitor.impl; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; - - -/** - * A factory for creating validation monitors - * - * @version $Rev$ $Date$ - */ -public class MonitorFactoryImpl implements MonitorFactory { - - private Monitor monitor = null; - - public Monitor createMonitor() { - if (monitor == null){ - monitor = new DefaultLoggingMonitorImpl(); - } - return monitor ; - } -} diff --git a/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java b/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java new file mode 100644 index 0000000000..d4dc3d2be4 --- /dev/null +++ b/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java @@ -0,0 +1,103 @@ +/* + * 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.monitor.logging.impl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.Problem.Severity; + + +/** + * A monitor for the watching for validation problems + * + * @version $Rev$ $Date$ + */ +public class DefaultLoggingMonitorImpl implements Monitor { + private static final Logger logger = Logger.getLogger(DefaultLoggingMonitorImpl.class.getName()); + + // Cache all the problem reported to monitor for further analysis + private List problemCache = new ArrayList(); + + public void problem(Problem problem) { + + Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName()); + + if (problemLogger == null){ + logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName()); + } + + if (problem.getSeverity() == Severity.INFO) { + problemCache.add(problem); + problemLogger.logp(Level.INFO, problem.getSourceClassName(), null, + problem.getMessageId(), problem.getMessageParams()); + } + else if (problem.getSeverity() == Severity.WARNING) { + problemCache.add(problem); + problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, + problem.getMessageId(), problem.getMessageParams()); + } + else if (problem.getSeverity() == Severity.ERROR) { + if (problem.getCause() != null) { + problemCache.add(problem); + problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), + null, problem.getMessageId(), problem.getCause().toString()); + } else { + problemCache.add(problem); + problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), null, + problem.getMessageId(), problem.getMessageParams()); + } + } + } + + public List getProblems(){ + return problemCache; + } + + public Problem getLastLoggedProblem(){ + return problemCache.get(problemCache.size() - 1); + } + + public boolean isMessageLogged(String messageId) { + for (Problem problem : problemCache){ + if (problem.getMessageId().equals(messageId)){ + return true; + } + } + + return false; + } + + public Problem getProblem(String messageId) { + for (Problem problem : problemCache){ + if (problem.getMessageId().equals(messageId)){ + return problem; + } + } + + return null; + } +} diff --git a/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java b/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java new file mode 100644 index 0000000000..a3162a3267 --- /dev/null +++ b/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java @@ -0,0 +1,41 @@ +/* + * 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.monitor.logging.impl; + +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.MonitorFactory; + + +/** + * A factory for creating validation monitors + * + * @version $Rev$ $Date$ + */ +public class MonitorFactoryImpl implements MonitorFactory { + + private Monitor monitor = null; + + public Monitor createMonitor() { + if (monitor == null){ + monitor = new DefaultLoggingMonitorImpl(); + } + return monitor ; + } +} diff --git a/java/sca/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/java/sca/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory index 8e722e2cd8..b46d552fb5 100644 --- a/java/sca/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory +++ b/java/sca/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -org.apache.tuscany.sca.monitor.impl.MonitorFactoryImpl +org.apache.tuscany.sca.monitor.logging.impl.MonitorFactoryImpl diff --git a/java/sca/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/java/sca/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java index 05a8368dfb..c5fa6c4da6 100644 --- a/java/sca/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java +++ b/java/sca/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.monitor; import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.impl.MonitorFactoryImpl; +import org.apache.tuscany.sca.monitor.logging.impl.MonitorFactoryImpl; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -- cgit v1.2.3