Modified: tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java (original) +++ tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java Sun Sep 28 23:44:22 2008 @@ -18,6 +18,7 @@ */ package org.apache.tuscany.sca.monitor; + /** * A factory for validation monitors * @@ -26,7 +27,7 @@ public interface MonitorFactory { /** - * Create a new monitor + * Create a new monitor. * * @return a new monitor */
Copied: tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java (from r699997, tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java) URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java?p2=tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java&p1=tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java&r1=699997&r2=700000&rev=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java (original) +++ tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java Sun Sep 28 23:44:22 2008 @@ -20,11 +20,10 @@ 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; @@ -34,8 +33,8 @@ * * @version $Rev$ $Date$ */ -public class DefaultMonitorImpl implements Monitor { - private static final Logger logger = Logger.getLogger(DefaultMonitorImpl.class.getName()); +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<Problem> problemCache = new ArrayList<Problem>(); @@ -77,26 +76,17 @@ } public Problem getLastLoggedProblem(){ + if (problemCache.isEmpty()) { + return null; + } 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 createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) { + return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, cause); } - public Problem getProblem(String messageId) { - for (Problem problem : problemCache){ - if (problem.getMessageId().equals(messageId)){ - return problem; - } - } - - return null; + public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams) { + return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, messageParams); } } Copied: tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java (from r699997, tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java) URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java?p2=tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java&p1=tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java&r1=699997&r2=700000&rev=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java (original) +++ tuscany/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java Sun Sep 28 23:44:22 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.assembly.builder.impl; +package org.apache.tuscany.sca.monitor.impl; import java.util.logging.Formatter; import java.util.logging.Level; Copied: tuscany/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java (from r699997, tuscany/branches/sca-equinox/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java) URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java?p2=tuscany/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java&p1=tuscany/branches/sca-equinox/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java&r1=699997&r2=700000&rev=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java (original) +++ tuscany/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java Sun Sep 28 23:44:22 2008 @@ -19,9 +19,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.logging.impl.MonitorFactoryImpl; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -37,7 +35,7 @@ @BeforeClass public static void init() throws Exception { - monitorFactory = new MonitorFactoryImpl(); + monitorFactory = new DefaultMonitorFactory(); } @AfterClass @@ -53,7 +51,7 @@ Problem problem = null; - problem = new ProblemImpl(this.getClass().getName(), + problem = monitor.createProblem(this.getClass().getName(), "tuscany-monitor-test-messages", Severity.WARNING, dummyModelObject, @@ -62,7 +60,7 @@ String param = "Some Parameter"; - problem = new ProblemImpl(this.getClass().getName(), + problem = monitor.createProblem(this.getClass().getName(), "tuscany-monitor-test-messages", Severity.WARNING, dummyModelObject, @@ -70,7 +68,7 @@ param); monitor.problem(problem); - problem = new ProblemImpl(this.getClass().getName(), + problem = monitor.createProblem(this.getClass().getName(), "tuscany-monitor-test-messages", Severity.WARNING, dummyModelObject, @@ -82,7 +80,7 @@ Exception ex = new IllegalStateException("TEST_MESSAGE"); - problem = new ProblemImpl(this.getClass().getName(), + problem = monitor.createProblem(this.getClass().getName(), "tuscany-monitor-test-messages", Severity.ERROR, dummyModelObject, Added: tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties?rev=700000&view=auto ============================================================================== --- tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties (added) +++ tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties Sun Sep 28 23:44:22 2008 @@ -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 Added: tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties?rev=700000&view=auto ============================================================================== --- tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties (added) +++ tuscany/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties Sun Sep 28 23:44:22 2008 @@ -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 Modified: tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java (original) +++ tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java Sun Sep 28 23:44:22 2008 @@ -61,9 +61,9 @@ import org.apache.tuscany.sca.extensibility.ServiceDiscovery; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.invocation.MessageFactory; +import org.apache.tuscany.sca.monitor.DefaultMonitorFactory; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; import org.apache.tuscany.sca.policy.Intent; @@ -147,7 +147,7 @@ if (monitorFactory != null) { monitor = monitorFactory.createMonitor(); } else { - monitorFactory = new DefaultMonitorFactoryImpl(); + monitorFactory = new DefaultMonitorFactory(); monitor = monitorFactory.createMonitor(); utilities.addUtility(monitorFactory); //logger.fine("No MonitorFactory is found on the classpath."); Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java Sun Sep 28 23:44:22 2008 @@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -38,6 +37,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** * @@ -64,7 +64,7 @@ */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java Sun Sep 28 23:44:22 2008 @@ -26,7 +26,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -36,6 +35,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** * @@ -62,7 +62,7 @@ */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java Sun Sep 28 23:44:22 2008 @@ -26,7 +26,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; @@ -38,6 +37,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** * @@ -69,7 +69,7 @@ */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java Sun Sep 28 23:44:22 2008 @@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -38,6 +37,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.IntentAttachPointType; import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; @@ -77,7 +77,7 @@ */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java Sun Sep 28 23:44:22 2008 @@ -31,7 +31,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; @@ -42,6 +41,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicyFactory; import org.apache.tuscany.sca.policy.ProfileIntent; @@ -76,7 +76,7 @@ */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java Sun Sep 28 23:44:22 2008 @@ -36,7 +36,6 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; @@ -47,6 +46,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicyFactory; import org.apache.tuscany.sca.policy.PolicySet; @@ -89,7 +89,7 @@ */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } @@ -103,7 +103,7 @@ */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java (original) +++ tuscany/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java Sun Sep 28 23:44:22 2008 @@ -41,9 +41,9 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; +import org.apache.tuscany.sca.monitor.DefaultMonitorFactory; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.IntentAttachPointType; import org.apache.tuscany.sca.policy.PolicySet; @@ -92,7 +92,7 @@ XMLInputFactory inputFactory = XMLInputFactory.newInstance(); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); + MonitorFactory monitorFactory = new DefaultMonitorFactory(); if (monitorFactory != null) { monitor = monitorFactory.createMonitor(); utilities.addUtility(monitorFactory); Modified: tuscany/branches/sca-equinox/modules/pom.xml URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/pom.xml?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/pom.xml (original) +++ tuscany/branches/sca-equinox/modules/pom.xml Sun Sep 28 23:44:22 2008 @@ -141,7 +141,6 @@ <module>implementation-widget-runtime</module> <module>implementation-xquery</module> <module>monitor</module> - <module>monitor-logging</module> <module>node-api</module> <module>node-impl</module> <module>node-launcher</module> Modified: tuscany/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java (original) +++ tuscany/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java Sun Sep 28 23:44:22 2008 @@ -26,7 +26,6 @@ import java.util.Set; import java.util.logging.Logger; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.DefaultImport; import org.apache.tuscany.sca.contribution.Export; @@ -35,6 +34,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.workspace.Workspace; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; @@ -137,7 +137,7 @@ */ private void warning(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(getClass().getName(), "workspace-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(getClass().getName(), "workspace-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java Sun Sep 28 23:44:22 2008 @@ -29,7 +29,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -38,6 +37,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.workspace.Workspace; /** @@ -73,7 +73,7 @@ */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "workspace-xml-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "workspace-xml-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java Sun Sep 28 23:44:22 2008 @@ -24,7 +24,6 @@ import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -33,6 +32,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition; @@ -60,7 +60,7 @@ */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "xsd-xml-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "xsd-xml-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } Modified: tuscany/branches/sca-equinox/samples/domain-management/pom.xml URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/domain-management/pom.xml?rev=700000&r1=699999&r2=700000&view=diff ============================================================================== --- tuscany/branches/sca-equinox/samples/domain-management/pom.xml (original) +++ tuscany/branches/sca-equinox/samples/domain-management/pom.xml Sun Sep 28 23:44:22 2008 @@ -109,13 +109,6 @@ </dependency> <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor-logging</artifactId> - <version>1.4-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.8.1</version>
