From 174374d300ce6001996d70516a6b1f563f3c8985 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 20 Mar 2009 11:29:50 +0000 Subject: Delete test branch created by the release plugin git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756421 13f79535-47bb-0310-9956-ffa450edef68 --- branches/2.0-M2/modules/monitor/LICENSE | 205 --------------------- .../2.0-M2/modules/monitor/META-INF/MANIFEST.MF | 16 -- branches/2.0-M2/modules/monitor/NOTICE | 6 - branches/2.0-M2/modules/monitor/pom.xml | 33 ---- .../tuscany/sca/monitor/DefaultMonitorFactory.java | 41 ----- .../org/apache/tuscany/sca/monitor/Monitor.java | 79 -------- .../apache/tuscany/sca/monitor/MonitorFactory.java | 36 ---- .../org/apache/tuscany/sca/monitor/Problem.java | 49 ----- .../tuscany/sca/monitor/impl/MonitorImpl.java | 92 --------- .../tuscany/sca/monitor/impl/ProblemImpl.java | 132 ------------- .../org.apache.tuscany.sca.monitor.MonitorFactory | 18 -- .../tuscany/sca/monitor/MonitorTestCase.java | 92 --------- .../tuscany-monitor-test-messages.properties | 24 --- .../tuscany-monitor-test-messages_it.properties | 24 --- 14 files changed, 847 deletions(-) delete mode 100644 branches/2.0-M2/modules/monitor/LICENSE delete mode 100644 branches/2.0-M2/modules/monitor/META-INF/MANIFEST.MF delete mode 100644 branches/2.0-M2/modules/monitor/NOTICE delete mode 100644 branches/2.0-M2/modules/monitor/pom.xml delete mode 100644 branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java delete mode 100644 branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java delete mode 100644 branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java delete mode 100644 branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java delete mode 100644 branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java delete mode 100644 branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java delete mode 100644 branches/2.0-M2/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory delete mode 100644 branches/2.0-M2/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java delete mode 100644 branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties delete mode 100644 branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties (limited to 'branches/2.0-M2/modules/monitor') diff --git a/branches/2.0-M2/modules/monitor/LICENSE b/branches/2.0-M2/modules/monitor/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/2.0-M2/modules/monitor/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - - - diff --git a/branches/2.0-M2/modules/monitor/META-INF/MANIFEST.MF b/branches/2.0-M2/modules/monitor/META-INF/MANIFEST.MF deleted file mode 100644 index 61652db813..0000000000 --- a/branches/2.0-M2/modules/monitor/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.apache.tuscany.sca.monitor;version="2.0.0" -Private-Package: org.apache.tuscany.sca.monitor.impl;version="2.0.0" -Tool: Bnd-0.0.255 -Bundle-Name: Apache Tuscany SCA Monitor -Created-By: 1.6.0_07 (Sun Microsystems Inc.) -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.0.0 -Bnd-LastModified: 1225397090921 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: Apache Tuscany SCA Monitor -Import-Package: org.apache.tuscany.sca.monitor;version="2.0.0" -Bundle-SymbolicName: org.apache.tuscany.sca.monitor -Bundle-DocURL: http://www.apache.org/ - diff --git a/branches/2.0-M2/modules/monitor/NOTICE b/branches/2.0-M2/modules/monitor/NOTICE deleted file mode 100644 index 25bb89c9b2..0000000000 --- a/branches/2.0-M2/modules/monitor/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2009 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/2.0-M2/modules/monitor/pom.xml b/branches/2.0-M2/modules/monitor/pom.xml deleted file mode 100644 index d8f9aa38c8..0000000000 --- a/branches/2.0-M2/modules/monitor/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-SNAPSHOT - ../pom.xml - - - tuscany-monitor - Apache Tuscany SCA Monitor - - diff --git a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java b/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java deleted file mode 100644 index b38968caeb..0000000000 --- a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.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; - -import org.apache.tuscany.sca.monitor.impl.MonitorImpl; - - -/** - * A factory for creating validation monitors - * - * @version $Rev$ $Date$ - */ -public class DefaultMonitorFactory implements MonitorFactory { - - private Monitor monitor = null; - - public Monitor createMonitor() { - if (monitor == null) { - monitor = new MonitorImpl(); - } - return monitor ; - } - -} diff --git a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java deleted file mode 100644 index f0ac8a6dbb..0000000000 --- a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java +++ /dev/null @@ -1,79 +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; - -import java.util.List; - -import org.apache.tuscany.sca.monitor.Problem.Severity; - -/** - * A monitor for the watching for validation problems - * - * @version $Rev$ $Date$ - */ -public interface Monitor { - /** - * Reports a build problem. - * - * @param problem - */ - void problem(Problem problem); - - /** - * Returns a list of reported problems. - * - * @return the list of problems. The list may be empty - */ - List getProblems(); - - /** - * Returns the last logged problem. - * - * @return - */ - public Problem getLastProblem(); - - /** - * Create a new problem. - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param cause the exception which caused the problem - * @return - */ - Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause); - - /** - * Create a new problem. - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param messageParams the parameters of the problem message - * @return - */ - Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams ); - -} diff --git a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java deleted file mode 100644 index 3384626958..0000000000 --- a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java +++ /dev/null @@ -1,36 +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; - - -/** - * A factory for validation monitors - * - * @version $Rev$ $Date$ - */ -public interface MonitorFactory { - - /** - * Create a new monitor. - * - * @return a new monitor - */ - Monitor createMonitor(); - -} diff --git a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java deleted file mode 100644 index 83a2d63eae..0000000000 --- a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java +++ /dev/null @@ -1,49 +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; - - -/** - * Records an validation problem. - * - * @version $Rev$ $Date$ - */ -public interface Problem { - - public enum Severity { - INFO, - WARNING, - ERROR - } - - String getSourceClassName(); - - String getBundleName(); - - Severity getSeverity(); - - Object getProblemObject(); - - String getMessageId(); - - Exception getCause(); - - Object[] getMessageParams(); -} diff --git a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java b/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java deleted file mode 100644 index fa562a5f23..0000000000 --- a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java +++ /dev/null @@ -1,92 +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.List; -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 MonitorImpl implements Monitor { - private static final Logger logger = Logger.getLogger(MonitorImpl.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 getLastProblem(){ - if (problemCache.isEmpty()) { - return null; - } - return problemCache.get(problemCache.size() - 1); - } - - public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) { - return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, cause); - } - - public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams) { - return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, messageParams); - } -} diff --git a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java b/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java deleted file mode 100644 index 5a0aaeddd0..0000000000 --- a/branches/2.0-M2/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java +++ /dev/null @@ -1,132 +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.logging.Formatter; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; -import java.util.logging.SimpleFormatter; - -import org.apache.tuscany.sca.monitor.Problem; - -/** - * Reports a composite assembly problem. - * - * @version $Rev$ $Date$ - */ -public class ProblemImpl implements Problem { - - private String sourceClassName; - private String bundleName; - private Severity severity; - private Object problemObject; - private String messageId; - private Object[] messageParams; - private Exception cause; - - /** - * Construct a new problem - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param messageParams the parameters of the problem message - */ - public ProblemImpl(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams ) { - this.sourceClassName = sourceClassName; - this.bundleName = bundleName; - this.severity = severity; - this.problemObject = problemObject; - this.messageId = messageId; - this.messageParams = messageParams; - } - - /** - * Construct a new problem - * - * @param sourceClassName the class name reporting the problem - * @param bundleName the name of the message bundle to use - * @param severity the severity of the problem - * @param problemObject the model object for which the problem is being reported - * @param messageId the id of the problem message - * @param cause the exception which caused the problem - */ - public ProblemImpl(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) { - this.sourceClassName = sourceClassName; - this.bundleName = bundleName; - this.severity = severity; - this.problemObject = problemObject; - this.messageId = messageId; - this.cause = cause; - } - - public String getSourceClassName() { - return sourceClassName; - } - - public String getBundleName() { - return bundleName; - } - - public Severity getSeverity() { - return severity; - } - - public Object getProblemObject() { - return problemObject; - } - - public String getMessageId() { - return messageId; - } - - public Object[] getMessageParams() { - return messageParams; - } - - public Exception getCause() { - return cause; - } - - @Override - public String toString() { - Logger logger = Logger.getLogger(sourceClassName, bundleName); - - LogRecord record = new LogRecord(Level.INFO, messageId); - - if (cause == null){ - record.setParameters(messageParams); - - } else { - Object[] params = new String[1]; - params[0] = cause.toString(); - record.setParameters(params); - } - record.setResourceBundle(logger.getResourceBundle()); - record.setSourceClassName(sourceClassName); - - Formatter formatter = new SimpleFormatter(); - - return formatter.formatMessage(record); - } -} diff --git a/branches/2.0-M2/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/branches/2.0-M2/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory deleted file mode 100644 index ae81aef136..0000000000 --- a/branches/2.0-M2/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory +++ /dev/null @@ -1,18 +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. - -org.apache.tuscany.sca.monitor.DefaultMonitorFactory diff --git a/branches/2.0-M2/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/branches/2.0-M2/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java deleted file mode 100644 index 4380e32f99..0000000000 --- a/branches/2.0-M2/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java +++ /dev/null @@ -1,92 +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; - -import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Loads a monitor and adds some problems to it. - * - * @version $Rev$ $Date$ - */ -public class MonitorTestCase { - - private static MonitorFactory monitorFactory; - - @BeforeClass - public static void init() throws Exception { - monitorFactory = new DefaultMonitorFactory(); - } - - @AfterClass - public static void destroy() throws Exception { - monitorFactory = null; - } - - @Test - public void testCreateProblem() throws Exception { - String dummyModelObject = "DUMMY MODEL OBJECT"; - - Monitor monitor = monitorFactory.createMonitor(); - - Problem problem = null; - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE1" ); - monitor.problem(problem); - - String param = "Some Parameter"; - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE2", - param); - monitor.problem(problem); - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE3", - 8, - 9, - 4); - monitor.problem(problem); - - Exception ex = new IllegalStateException("TEST_MESSAGE"); - - problem = monitor.createProblem(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.ERROR, - dummyModelObject, - "MESSAGE4", - ex); - monitor.problem(problem); - - } -} diff --git a/branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties b/branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties deleted file mode 100644 index 523263da40..0000000000 --- a/branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties +++ /dev/null @@ -1,24 +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. -# -# -MESSAGE1 = This is a test message with no params -MESSAGE2 = This is a test message with a string param {0} -MESSAGE3 = This is a test message with numbers {0}, {1}, {2} -MESSAGE4 = This is a test message with exception diff --git a/branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties b/branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties deleted file mode 100644 index 523263da40..0000000000 --- a/branches/2.0-M2/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties +++ /dev/null @@ -1,24 +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. -# -# -MESSAGE1 = This is a test message with no params -MESSAGE2 = This is a test message with a string param {0} -MESSAGE3 = This is a test message with numbers {0}, {1}, {2} -MESSAGE4 = This is a test message with exception -- cgit v1.2.3