diff options
Diffstat (limited to '')
15 files changed, 1327 insertions, 0 deletions
diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/LICENSE b/sandbox/sebastien/java/wrapped/modules/monitor/LICENSE new file mode 100644 index 0000000000..8aa906c321 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/LICENSE @@ -0,0 +1,205 @@ + + 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/sandbox/sebastien/java/wrapped/modules/monitor/META-INF/MANIFEST.MF b/sandbox/sebastien/java/wrapped/modules/monitor/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..c9613cb52c --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/META-INF/MANIFEST.MF @@ -0,0 +1,14 @@ +Manifest-Version: 1.0
+Export-Package: org.apache.tuscany.sca.monitor;version="2.0.0"
+Bundle-Name: Apache Tuscany SCA Monitor
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+SCA-Version: 1.1
+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"
+DynamicImport-Package: org.apache.tuscany.sca.*;version="2.0.0"
+Bundle-SymbolicName: org.apache.tuscany.sca.monitor
+Bundle-DocURL: http://www.apache.org/
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/NOTICE b/sandbox/sebastien/java/wrapped/modules/monitor/NOTICE new file mode 100644 index 0000000000..d69e595698 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/NOTICE @@ -0,0 +1,6 @@ +${pom.name} +Copyright (c) 2005 - 2011 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/pom.xml b/sandbox/sebastien/java/wrapped/modules/monitor/pom.xml new file mode 100644 index 0000000000..e7e9ca9c15 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/pom.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<project> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-modules</artifactId> + <version>2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>tuscany-monitor</artifactId> + <name>Apache Tuscany SCA Monitor</name> + +</project> diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java new file mode 100644 index 0000000000..8a99fa4c7c --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java @@ -0,0 +1,60 @@ +/* + * 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 ThreadLocal<Monitor> contextMonitor = new InheritableThreadLocal<Monitor>(); + + public Monitor createMonitor() { + return new MonitorImpl(); + } + + public Monitor getContextMonitor() { + return contextMonitor.get(); + } + + public Monitor getContextMonitor(boolean create) { + Monitor monitor = contextMonitor.get(); + if (monitor == null) { + monitor = new MonitorImpl(); + setContextMonitor(monitor); + } + return monitor; + } + + public Monitor removeContextMonitor() { + Monitor old = contextMonitor.get(); + contextMonitor.remove(); + return old; + } + + public Monitor setContextMonitor(Monitor value) { + Monitor old = contextMonitor.get(); + contextMonitor.set(value); + return old; + } +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java new file mode 100644 index 0000000000..3eda98ee23 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java @@ -0,0 +1,364 @@ +/* + * 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 java.util.logging.Logger; + +import org.apache.tuscany.sca.monitor.Problem.Severity; + +/** + * A monitor for the watching for validation problems + * + * @version $Rev$ $Date$ + * @tuscany.spi.extension.inheritfrom + */ +public abstract class Monitor { + private static class ContextFinder extends SecurityManager { + private final static ContextFinder instance = new ContextFinder(); + + // This is sensitive to the calling stack + private static Class<?> getContextClass() { + Class[] classes = instance.getClassContext(); + // 0: ContextFinder (getClassContext) + // 1: ContextFinder (getContextClass) + // 2: Monitor (getSourceClassName) + // 3: Monitor (error/warning) + return classes[4]; + } + + } + private final static Logger logger = Logger.getLogger(Monitor.class.getName()); + + /** + * A utility function for raising an error. It creates the problem and + * adds it to the monitor + * + * @param monitor + * @param reportingObject + * @param messageBundle + * @param messageId + * @param messageParameters + */ + public static void error (Monitor monitor, + Object reportingObject, + String messageBundle, + String messageId, + Object... messageParameters){ + String contextClassName = getSourceClassName(reportingObject); + if (monitor != null) { + Problem problem = + monitor.createProblem(contextClassName, + messageBundle, + Severity.ERROR, + reportingObject, + messageId, + messageParameters); + monitor.problem(problem); + } else { + logNullMonitor(messageId, contextClassName); + } + } + + /** + * A utility function for raising an error. It creates the problem and + * adds it to the monitor + * + * @param monitor + * @param reportingObject + * @param messageBundle + * @param messageId + * @param exception + */ + public static void error (Monitor monitor, + Object reportingObject, + String messageBundle, + String messageId, + Throwable cause){ + String contextClassName = getSourceClassName(reportingObject); + if (monitor != null) { + Problem problem = + monitor.createProblem(contextClassName, + messageBundle, + Severity.ERROR, + reportingObject, + messageId, + cause); + monitor.problem(problem); + } else { + logNullMonitor(messageId, contextClassName); + } + } + + /** + * A utility function for raising an error. It creates the problem and + * adds it to the monitor + * + * @param monitor + * @param reportingObject + * @param messageBundle + * @param messageId + * @param exception + */ + public static void error (Monitor monitor, + Object reportingObject, + String messageBundle, + String messageId, + Throwable cause, + Object... messageParameters) { + String contextClassName = getSourceClassName(reportingObject); + if (monitor != null) { + Problem problem = + monitor.createProblem(contextClassName, + messageBundle, + Severity.ERROR, + reportingObject, + messageId, + cause, + messageParameters); + monitor.problem(problem); + } else { + logNullMonitor(messageId, contextClassName); + } + } + + private static String getSourceClassName(Object reportingObject) { + String contextClassName = null; + if (reportingObject != null) { + contextClassName = reportingObject.getClass().getName(); + } else { + contextClassName = ContextFinder.getContextClass().getName(); + } + return contextClassName; + } + + private static void logNullMonitor(String messageId, String contextClassName) { + logger.warning("Attempt to report error with id " + + messageId + + " from class " + + contextClassName + + " but the monitor object was null"); + } + + /** + * A utility function for raising a warning. It creates the problem and + * adds it to the monitor + * + * @param monitor + * @param reportingObject + * @param messageBundle + * @param messageId + * @param messageParameters + */ + public static void warning (Monitor monitor, + Object reportingObject, + String messageBundle, + String messageId, + Object... messageParameters){ + String contextClassName = getSourceClassName(reportingObject); + if (monitor != null) { + Problem problem = + monitor.createProblem(contextClassName, + messageBundle, + Severity.WARNING, + reportingObject, + messageId, + messageParameters); + monitor.problem(problem); + } else { + logNullMonitor(messageId, contextClassName); + } + } + + // ===================================================== + // TUSCANY-3132 - new approach to monitoring errors + // + + /** + * A utility function for raising an error. It creates the problem and + * adds it to the monitor + * + * @param monitor + * @param reportingObject + * @param messageBundle + * @param messageId + * @param exception + */ + public static void warning (Monitor monitor, + Object reportingObject, + String messageBundle, + String messageId, + Throwable cause){ + String contextClassName = getSourceClassName(reportingObject); + if (monitor != null) { + Problem problem = + monitor.createProblem(contextClassName, + messageBundle, + Severity.WARNING, + reportingObject, + messageId, + cause); + monitor.problem(problem); + } else { + logNullMonitor(messageId, contextClassName); + } + } + + /** + * A utility function for raising an error. It creates the problem and + * adds it to the monitor + * + * @param monitor + * @param reportingObject + * @param messageBundle + * @param messageId + * @param exception + */ + public static void warning (Monitor monitor, + Object reportingObject, + String messageBundle, + String messageId, + Throwable cause, + Object... messageParameters) { + String contextClassName = getSourceClassName(reportingObject); + if (monitor != null) { + Problem problem = + monitor.createProblem(contextClassName, + messageBundle, + Severity.WARNING, + reportingObject, + messageId, + cause, + messageParameters); + monitor.problem(problem); + } else { + logNullMonitor(messageId, contextClassName); + } + } + + /** + * 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 + */ + public abstract Problem createProblem(String sourceClassName, + String bundleName, + Severity severity, + Object problemObject, + String messageId, + Object... messageParams); + + /** + * 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 + */ + public abstract Problem createProblem(String sourceClassName, + String bundleName, + Severity severity, + Object problemObject, + String messageId, + Throwable cause); + + /** + * Get the name of the artifact for which errors are Monitored + * @return the name of the Artifact or null if no artifact name has been set + */ + public abstract String getArtifactName(); + + /** + * Returns the last logged problem. + * + * @return + */ + public abstract Problem getLastProblem(); + + /** + * Returns a list of reported problems. + * + * @return the list of problems. The list may be empty + */ + public abstract List<Problem> getProblems(); + + /** + * Remove the most recent context string from the + * context stack + * @return The object popped + */ + public abstract Object popContext(); + + /** + * Reports a build problem. + * + * @param problem + */ + public abstract void problem(Problem problem); + + /** + * Add a context string to the context stack + * @param context the context string to add + */ + public abstract void pushContext(Object context); + + /** + * Clear context and problems + */ + public abstract void reset(); + /** + * Set the name of an artifact for which errors are Monitored + * @param artifactName the artifact name + */ + public abstract void setArtifactName(String artifactName); + + // ===================================================== + + /** + * Checks the Monitor for any Problems with s severity of ERROR and + * if one is found then throw a ValidationException. + * This will also call reset() on this Monitor. + */ + public void analyzeProblems() throws ValidationException { + try { + for (Problem problem : getProblems()) { + if ((problem.getSeverity() == Severity.ERROR)) { + if (problem.getCause() != null) { + throw new ValidationException(problem.getCause()); + } else { + throw new ValidationException(problem.toString()); + } + } + } + } finally { + reset(); + } + } +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java new file mode 100644 index 0000000000..12ac7eba7b --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java @@ -0,0 +1,61 @@ +/* + * 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(); + + /** + * Get the monitor instance on the thread + * @return the monitor instance on the thread + */ + Monitor getContextMonitor(); + + /** + * Get the monitor instance on the thread + * @param create if it true, then create a new instance if no monitor is on the thread + * @return the monitor instance on the thread + */ + Monitor getContextMonitor(boolean create); + + /** + * Remove the monitor on the thread + * @return The existing instance + */ + Monitor removeContextMonitor(); + + /** + * Set the monitor onto the thread + * @param value The new instance + * @return The old instance + */ + Monitor setContextMonitor(Monitor monitor); +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java new file mode 100644 index 0000000000..c05fa632fb --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java @@ -0,0 +1,54 @@ +/* + * 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$ + * @tuscany.spi.extension.asclient + */ +public interface Problem { + + /** + * + * @tuscany.spi.extension + * + */ + public enum Severity { + INFO, WARNING, ERROR + } + + String getSourceClassName(); + + String getResourceBundleName(); + + Severity getSeverity(); + + String getContext(); + + Object getProblemObject(); + + String getMessageId(); + + Throwable getCause(); + + Object[] getMessageParams(); +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/ValidationException.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/ValidationException.java new file mode 100644 index 0000000000..368893dd68 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/ValidationException.java @@ -0,0 +1,40 @@ +/* + * 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; + +public class ValidationException extends Exception { + private static final long serialVersionUID = 1L; + + public ValidationException() { + super(); + } + + public ValidationException(String message, Throwable cause) { + super(message, cause); + } + + public ValidationException(String message) { + super(message); + } + + public ValidationException(Throwable cause) { + super(cause); + } +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java new file mode 100644 index 0000000000..c81581aae0 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java @@ -0,0 +1,144 @@ +/* + * 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.Stack; +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 extends Monitor { + private static final Logger logger = Logger.getLogger(MonitorImpl.class.getName()); + + // stack of context information that is printed alongside each problem + private Stack<Object> contextStack = new Stack<Object>(); + + // Cache all the problem reported to monitor for further analysis + private List<Problem> problemCache = new ArrayList<Problem>(); + + // Name of an artifact for which problems are being Monitored + private String artifactName = null; + + public void problem(Problem problem) { + + Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getResourceBundleName()); + + if (problemLogger == null) { + logger.severe("Can't get logger " + problem.getSourceClassName() + + " with bundle " + + problem.getResourceBundleName()); + } + + if (problem.getSeverity() == Severity.INFO) { + problemCache.add(problem); + problemLogger.logp(Level.INFO, problem.getSourceClassName(), problem.getContext(), problem.getMessageId(), problem + .getMessageParams()); + } else if (problem.getSeverity() == Severity.WARNING) { + problemCache.add(problem); + problemLogger.logp(Level.WARNING, problem.getSourceClassName(), problem.getContext(), problem.getMessageId(), problem + .getMessageParams()); + } else if (problem.getSeverity() == Severity.ERROR) { + if (problem.getCause() != null) { + problemCache.add(problem); + problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), problem.getContext(), problem.getMessageId(), problem + .getCause()); + + } else { + problemCache.add(problem); + problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), problem.getContext(), problem.getMessageId(), problem + .getMessageParams()); + } + } + } + + public List<Problem> 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, + Throwable cause) { + return new ProblemImpl(sourceClassName, bundleName, severity, contextStack.toString(), problemObject, messageId, cause); + } + + public Problem createProblem(String sourceClassName, + String bundleName, + Severity severity, + Object problemObject, + String messageId, + Object... messageParams) { + return new ProblemImpl(sourceClassName, bundleName, severity, contextStack.toString(), problemObject, messageId, messageParams); + } + + public Problem createProblem(String sourceClassName, + String bundleName, + Severity severity, + Object problemObject, + String messageId, + Throwable cause, + Object... messageParams) { + return new ProblemImpl(sourceClassName, bundleName, severity, contextStack.toString(), problemObject, messageId, cause, messageParams); + } + + public String getArtifactName() { + return artifactName; + } + + public void setArtifactName(String artifactName) { + this.artifactName = artifactName; + } + + @Override + public void pushContext(Object context) { + contextStack.push(context); + } + + @Override + public Object popContext() { + return contextStack.pop(); + } + + @Override + public void reset() { + contextStack.clear(); + problemCache.clear(); + artifactName = null; + } +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java new file mode 100644 index 0000000000..acfc409856 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java @@ -0,0 +1,181 @@ +/* + * 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 String context; + private Object problemObject; + private String messageId; + private Object[] messageParams; + private Throwable 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 context the string indicating where the error occurred + * @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, + String context, + Object problemObject, + String messageId, + Object... messageParams) { + this.sourceClassName = sourceClassName; + this.bundleName = bundleName; + this.severity = severity; + this.context = context; + 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 context the string indicating where the error occurred + * @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, + String context, + Object problemObject, + String messageId, + Throwable cause, + Object... messageParams) { + this.sourceClassName = sourceClassName; + this.bundleName = bundleName; + this.severity = severity; + this.context = context; + this.problemObject = problemObject; + this.messageId = messageId; + this.cause = cause; + 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 context the string indicating where the error occurred + * @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, + String context, + Object problemObject, + String messageId, + Throwable cause) { + this.sourceClassName = sourceClassName; + this.bundleName = bundleName; + this.severity = severity; + this.context = context; + this.problemObject = problemObject; + this.messageId = messageId; + this.cause = cause; + } + + public String getSourceClassName() { + return sourceClassName; + } + + public String getResourceBundleName() { + return bundleName; + } + + public Severity getSeverity() { + return severity; + } + + public String getContext() { + return context + " (" + messageId + ")"; + } + + public Object getProblemObject() { + return problemObject; + } + + public String getMessageId() { + return messageId; + } + + public Object[] getMessageParams() { + return messageParams; + } + + public Throwable 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 context + " - " + formatter.formatMessage(record); + } +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory new file mode 100644 index 0000000000..f2c2a52e78 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory @@ -0,0 +1,19 @@ +# 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/sandbox/sebastien/java/wrapped/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/sandbox/sebastien/java/wrapped/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java new file mode 100644 index 0000000000..6e44b2d5d9 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java @@ -0,0 +1,98 @@ +/* + * 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 final String MESSAGES = "org.apache.tuscany.sca.monitor.tuscany-monitor-test-messages"; + 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(), + MESSAGES, + Severity.WARNING, + dummyModelObject, + "MESSAGE1"); + monitor.problem(problem); + + String param = "Some Parameter"; + + problem = + monitor.createProblem(this.getClass().getName(), + MESSAGES, + Severity.WARNING, + dummyModelObject, + "MESSAGE2", + param); + monitor.problem(problem); + + problem = + monitor.createProblem(this.getClass().getName(), + MESSAGES, + Severity.WARNING, + dummyModelObject, + "MESSAGE3", + 8, + 9, + 4); + monitor.problem(problem); + + Exception ex = new IllegalStateException("TEST_MESSAGE"); + + problem = + monitor.createProblem(this.getClass().getName(), + MESSAGES, + Severity.ERROR, + dummyModelObject, + "MESSAGE4", + ex); + monitor.problem(problem); + + } + +} diff --git a/sandbox/sebastien/java/wrapped/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties b/sandbox/sebastien/java/wrapped/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties new file mode 100644 index 0000000000..523263da40 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties @@ -0,0 +1,24 @@ +# +# +# 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/sandbox/sebastien/java/wrapped/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties b/sandbox/sebastien/java/wrapped/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties new file mode 100644 index 0000000000..523263da40 --- /dev/null +++ b/sandbox/sebastien/java/wrapped/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties @@ -0,0 +1,24 @@ +# +# +# 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 |