From fcef778b4fb5b4ee7d828c1e9cfb62af2d48d869 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 29 Sep 2008 06:44:22 +0000 Subject: Fixed monitor module to avoid having to export monitor implementation classes. Removed dependencies on monitor-logging. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@700000 13f79535-47bb-0310-9956-ffa450edef68 --- .../demos/load-balancing-webapp/pom.xml | 6 - .../sca-equinox/distribution/features/all/pom.xml | 1 - .../sca-equinox/distribution/features/core/pom.xml | 6 - .../distribution/features/ejava/pom.xml | 1 - .../distribution/features/manager/pom.xml | 1 - .../distribution/features/process/pom.xml | 1 - .../distribution/features/repository/pom.xml | 1 - .../distribution/features/web20/pom.xml | 1 - .../distribution/features/webservice/pom.xml | 1 - branches/sca-equinox/itest/builder/pom.xml | 7 -- .../contribution-test/pom.xml | 7 -- .../osgi-tuscany/tuscany-osgi-installer/pom.xml | 5 - .../itest/osgi-tuscany/tuscany-versioned/pom.xml | 5 - branches/sca-equinox/itest/validation/pom.xml | 6 - .../sca/assembly/xml/BaseAssemblyProcessor.java | 7 +- .../sca/assembly/xml/BuildPolicyTestCase.java | 4 +- .../tuscany/sca/assembly/xml/WireTestCase.java | 4 +- .../tuscany/sca/assembly/xml/WriteAllTestCase.java | 4 +- .../builder/impl/BaseConfigurationBuilderImpl.java | 5 +- .../assembly/builder/impl/BaseWireBuilderImpl.java | 8 +- .../builder/impl/CompositeIncludeBuilderImpl.java | 2 +- .../assembly/builder/impl/EndpointBuilderImpl.java | 4 +- .../sca/assembly/builder/impl/ProblemImpl.java | 132 --------------------- .../builder/impl/ReferenceConfigurationUtil.java | 2 +- .../binding/atom/AtomBindingProcessorTestCase.java | 4 +- .../sca/binding/ejb/impl/EJBBindingProcessor.java | 5 +- .../sca/binding/jms/impl/JMSBindingProcessor.java | 33 +++--- .../jms/impl/JMSBindingProcessorTestCase.java | 4 +- .../binding/ws/wsdlgen/BindingWSDLGenerator.java | 13 +- .../ws/wsdlgen/Interface2WSDLGenerator.java | 5 +- .../binding/ws/wsdlgen/WSDLServiceGenerator.java | 26 +--- .../binding/ws/xml/WebServiceBindingProcessor.java | 6 +- .../service/impl/ContributionRepositoryImpl.java | 8 +- .../service/impl/ContributionServiceImpl.java | 4 +- .../java/impl/JavaExportProcessor.java | 3 +- .../java/impl/JavaImportProcessor.java | 3 +- .../java/impl/JavaExportProcessorTestCase.java | 7 +- .../java/impl/JavaImportProcessorTestCase.java | 7 +- .../namespace/impl/NamespaceExportProcessor.java | 4 +- .../namespace/impl/NamespaceImportProcessor.java | 4 +- .../impl/NamespaceExportProcessorTestCase.java | 7 +- .../impl/NamespaceImportProcessorTestCase.java | 8 +- .../resource/impl/ResourceExportProcessor.java | 4 +- .../resource/impl/ResourceImportProcessor.java | 4 +- .../impl/ResourceExportProcessorTestCase.java | 7 +- .../impl/ResourceImportProcessorTestCase.java | 7 +- .../processor/xml/AnyElementProcessor.java | 6 +- .../xml/ContributionMetadataDocumentProcessor.java | 4 +- .../xml/ContributionMetadataProcessor.java | 4 +- .../xml/ContributionMetadataProcessorTestCase.java | 7 +- ...DefaultStAXArtifactProcessorExtensionPoint.java | 6 +- ...efaultStAXAttributeProcessorExtensionPoint.java | 6 +- .../DefaultURLArtifactProcessorExtensionPoint.java | 6 +- .../DefaultValidatingXMLInputFactory.java | 4 +- .../processor/ExtensiblePackageProcessor.java | 4 +- .../processor/ExtensibleStAXArtifactProcessor.java | 8 +- .../ExtensibleStAXAttributeProcessor.java | 8 +- .../processor/ExtensibleURLArtifactProcessor.java | 4 +- .../processor/ValidatingXMLStreamReader.java | 6 +- .../sca/databinding/sdo/ImportSDOProcessor.java | 6 +- .../xml/SCADefinitionsDocumentProcessor.java | 6 +- .../sca-equinox/modules/domain-manager/pom.xml | 8 -- branches/sca-equinox/modules/endpoint/pom.xml | 7 -- .../sca/host/embedded/impl/ReallySmallRuntime.java | 4 +- .../bpel/xml/BPELDocumentProcessor.java | 8 +- .../bpel/xml/BPELImplementationProcessor.java | 4 +- .../bpel/BPELImplementationProcessorTestCase.java | 7 +- .../ejb/xml/EJBImplementationProcessor.java | 4 +- .../java/xml/JavaImplementationProcessor.java | 6 +- .../impl/ResourceImplementationProcessor.java | 6 +- .../script/ScriptImplementationProcessor.java | 4 +- .../spring/SpringImplementationProcessor.java | 6 +- .../widget/WidgetImplementationProcessor.java | 6 +- .../xquery/xml/XQueryImplementationProcessor.java | 4 +- .../java/xml/JavaInterfaceProcessor.java | 6 +- .../wsdl/xml/WSDLDocumentProcessor.java | 4 +- .../wsdl/xml/WSDLInterfaceProcessor.java | 8 +- .../tuscany/sca/monitor/MonitorTestCase.java | 10 +- branches/sca-equinox/modules/monitor/pom.xml | 2 +- .../tuscany/sca/monitor/DefaultMonitorFactory.java | 41 +++++++ .../org/apache/tuscany/sca/monitor/Monitor.java | 35 ++++++ .../apache/tuscany/sca/monitor/MonitorFactory.java | 3 +- .../monitor/impl/DefaultMonitorFactoryImpl.java | 41 ------- .../sca/monitor/impl/DefaultMonitorImpl.java | 102 ---------------- .../tuscany/sca/monitor/impl/MonitorImpl.java | 92 ++++++++++++++ .../tuscany/sca/monitor/impl/ProblemImpl.java | 132 +++++++++++++++++++++ .../tuscany/sca/monitor/MonitorTestCase.java | 92 ++++++++++++++ .../tuscany-monitor-test-messages.properties | 24 ++++ .../tuscany-monitor-test-messages_it.properties | 24 ++++ .../tuscany/sca/node/impl/RuntimeBootStrapper.java | 4 +- .../AuthorizationPolicyProcessor.java | 4 +- .../identity/SecurityIdentityPolicyProcessor.java | 4 +- .../jaas/JaasAuthenticationPolicyProcessor.java | 4 +- .../policy/xml/IntentAttachPointTypeProcessor.java | 4 +- .../sca/policy/xml/PolicyIntentProcessor.java | 4 +- .../tuscany/sca/policy/xml/PolicySetProcessor.java | 6 +- .../sca/policy/xml/ReadDocumentTestCase.java | 4 +- branches/sca-equinox/modules/pom.xml | 1 - .../impl/ContributionDependencyBuilderImpl.java | 4 +- .../workspace/xml/WorkspaceDocumentProcessor.java | 4 +- .../tuscany/sca/xsd/xml/XSDDocumentProcessor.java | 4 +- .../sca-equinox/samples/domain-management/pom.xml | 7 -- 102 files changed, 638 insertions(+), 585 deletions(-) delete mode 100644 branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java create mode 100644 branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java delete mode 100644 branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java delete mode 100644 branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java create mode 100644 branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java create mode 100644 branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java create mode 100644 branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java create mode 100644 branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties create mode 100644 branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties diff --git a/branches/sca-equinox/demos/load-balancing-webapp/pom.xml b/branches/sca-equinox/demos/load-balancing-webapp/pom.xml index 4181149857..4d60f15c8d 100644 --- a/branches/sca-equinox/demos/load-balancing-webapp/pom.xml +++ b/branches/sca-equinox/demos/load-balancing-webapp/pom.xml @@ -51,12 +51,6 @@ runtime - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - - org.apache.tuscany.sca tuscany-node2-impl diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/features/all/pom.xml index f88efa792e..a14ba9512d 100644 --- a/branches/sca-equinox/distribution/features/all/pom.xml +++ b/branches/sca-equinox/distribution/features/all/pom.xml @@ -235,7 +235,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/distribution/features/core/pom.xml b/branches/sca-equinox/distribution/features/core/pom.xml index 98d751f2d4..64a0f8f4aa 100644 --- a/branches/sca-equinox/distribution/features/core/pom.xml +++ b/branches/sca-equinox/distribution/features/core/pom.xml @@ -200,11 +200,6 @@ tuscany-monitor 1.4-SNAPSHOT - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - @@ -325,7 +320,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/features/ejava/pom.xml index abdc08f435..9ba5cde2b0 100644 --- a/branches/sca-equinox/distribution/features/ejava/pom.xml +++ b/branches/sca-equinox/distribution/features/ejava/pom.xml @@ -194,7 +194,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/distribution/features/manager/pom.xml b/branches/sca-equinox/distribution/features/manager/pom.xml index 456879dba6..efe7b2d2b5 100644 --- a/branches/sca-equinox/distribution/features/manager/pom.xml +++ b/branches/sca-equinox/distribution/features/manager/pom.xml @@ -241,7 +241,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/distribution/features/process/pom.xml b/branches/sca-equinox/distribution/features/process/pom.xml index 35caba4adc..df28d4a66d 100644 --- a/branches/sca-equinox/distribution/features/process/pom.xml +++ b/branches/sca-equinox/distribution/features/process/pom.xml @@ -136,7 +136,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/distribution/features/repository/pom.xml b/branches/sca-equinox/distribution/features/repository/pom.xml index 2505276816..da7105461e 100644 --- a/branches/sca-equinox/distribution/features/repository/pom.xml +++ b/branches/sca-equinox/distribution/features/repository/pom.xml @@ -168,7 +168,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/distribution/features/web20/pom.xml b/branches/sca-equinox/distribution/features/web20/pom.xml index 3db6afbd9c..ead4bafae1 100644 --- a/branches/sca-equinox/distribution/features/web20/pom.xml +++ b/branches/sca-equinox/distribution/features/web20/pom.xml @@ -195,7 +195,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/distribution/features/webservice/pom.xml b/branches/sca-equinox/distribution/features/webservice/pom.xml index 5998d5602a..dea8d8ac0a 100644 --- a/branches/sca-equinox/distribution/features/webservice/pom.xml +++ b/branches/sca-equinox/distribution/features/webservice/pom.xml @@ -204,7 +204,6 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/monitor-logging ../../../modules/node-api ../../../modules/node-impl ../../../modules/node-launcher diff --git a/branches/sca-equinox/itest/builder/pom.xml b/branches/sca-equinox/itest/builder/pom.xml index 5eda64fdd8..2088649e60 100644 --- a/branches/sca-equinox/itest/builder/pom.xml +++ b/branches/sca-equinox/itest/builder/pom.xml @@ -42,13 +42,6 @@ runtime - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - test - - org.apache.tuscany.sca tuscany-workspace-impl diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml b/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml index b417012edd..36d4b21446 100644 --- a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml +++ b/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml @@ -42,13 +42,6 @@ runtime - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - runtime - - junit junit diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml index 8d0105fbcb..2452a6b72b 100644 --- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml +++ b/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml @@ -33,11 +33,6 @@ ${pom.version} - - ${pom.groupId} - tuscany-monitor-logging - ${pom.version} - ${pom.groupId} tuscany-assembly diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml index 340bb3e158..05ef28ab39 100644 --- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml +++ b/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml @@ -34,11 +34,6 @@ - - ${pom.groupId} - tuscany-monitor-logging - ${pom.version} - ${pom.groupId} tuscany-assembly diff --git a/branches/sca-equinox/itest/validation/pom.xml b/branches/sca-equinox/itest/validation/pom.xml index 77e6a18ce9..6a9d429c43 100644 --- a/branches/sca-equinox/itest/validation/pom.xml +++ b/branches/sca-equinox/itest/validation/pom.xml @@ -30,12 +30,6 @@ - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - - org.apache.tuscany.sca tuscany-contribution-resource diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java index 06b208540a..10bb56da12 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java +++ b/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java @@ -55,7 +55,6 @@ import org.apache.tuscany.sca.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.OperationsConfigurator; import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ContributionFactory; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; @@ -149,7 +148,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor implement */ protected void warning(String message, Object model, String... messageParameters) { if (monitor != null){ - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-xml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-xml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -163,7 +162,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor implement */ protected void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -177,7 +176,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor implement */ protected void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-xml-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-xml-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java index 5f8f976b84..cb99113fe0 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java +++ b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java @@ -48,9 +48,9 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.definitions.SCADefinitions; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl; +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.IntentAttachPoint; import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; @@ -77,7 +77,7 @@ public class BuildPolicyTestCase extends TestCase { List policyDefinitions = new ArrayList(); resolver = new DefaultModelResolver(); - MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); + MonitorFactory monitorFactory = new DefaultMonitorFactory(); monitor = monitorFactory.createMonitor(); UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java index ed3e7897c0..e316babb2d 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java +++ b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java @@ -46,9 +46,9 @@ import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.definitions.SCADefinitions; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; +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.IntentAttachPointTypeFactory; /** @@ -73,7 +73,7 @@ public class WireTestCase extends TestCase { staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null); resolver = new DefaultModelResolver(); - MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); + MonitorFactory monitorFactory = new DefaultMonitorFactory(); monitor = monitorFactory.createMonitor(); ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java index cfe218c1e9..eb49d7dcd1 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java +++ b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java @@ -49,9 +49,9 @@ import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.definitions.SCADefinitions; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; +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.IntentAttachPointTypeFactory; /** @@ -85,7 +85,7 @@ public class WriteAllTestCase extends TestCase { UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class); - MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); + MonitorFactory monitorFactory = new DefaultMonitorFactory(); monitor = monitorFactory.createMonitor(); compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, monitor); diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java index 6f856986ad..cba46e7f5e 100644 --- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java +++ b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java @@ -52,6 +52,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; 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.IntentAttachPoint; import org.apache.tuscany.sca.policy.IntentAttachPointType; @@ -312,7 +313,7 @@ public abstract class BaseConfigurationBuilderImpl { */ private void warning(String message, Object model, String... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -326,7 +327,7 @@ public abstract class BaseConfigurationBuilderImpl { */ private void error(String message, Object model, String... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java index 0c2d02ab48..b05ec7e24e 100644 --- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java +++ b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java @@ -22,10 +22,8 @@ package org.apache.tuscany.sca.assembly.builder.impl; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.assembly.Binding; @@ -41,9 +39,7 @@ import org.apache.tuscany.sca.assembly.EndpointFactory; import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.OperationsConfigurator; -import org.apache.tuscany.sca.assembly.OptimizableBinding; import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.SCABinding; import org.apache.tuscany.sca.assembly.Service; import org.apache.tuscany.sca.assembly.Wire; import org.apache.tuscany.sca.assembly.builder.DefaultEndpointBuilder; @@ -212,7 +208,7 @@ class BaseWireBuilderImpl { */ private void warning(String message, Object model, String... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -227,7 +223,7 @@ class BaseWireBuilderImpl { private void error(String message, Object model, Exception ex) { if (monitor != null) { Problem problem = null; - problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, ex); + problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java index 539ad8d137..5f507ece1f 100644 --- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java +++ b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java @@ -50,7 +50,7 @@ public class CompositeIncludeBuilderImpl implements CompositeBuilder { private void warning(String message, Object model, String... messageParameters) { if (monitor != null){ - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java index 1698b1a9c7..ce9a64c8d8 100644 --- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java +++ b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java @@ -43,7 +43,7 @@ public abstract class EndpointBuilderImpl implements EndpointBuilder { private void warning(String message, Object model, String... messageParameters) { if (monitor != null){ - Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -51,7 +51,7 @@ public abstract class EndpointBuilderImpl implements EndpointBuilder { private void error(String message, Object model, Exception ex) { if (monitor != null){ Problem problem = null; - problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, ex); + problem = monitor.createProblem(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java deleted file mode 100644 index 03f24dfae8..0000000000 --- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/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.assembly.builder.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/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java index 23d547efaf..0612f9ae0e 100644 --- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java +++ b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java @@ -52,7 +52,7 @@ abstract class ReferenceConfigurationUtil { */ private static void warning(Monitor monitor, String message, Object model, String... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(ReferenceConfigurationUtil.class.getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(ReferenceConfigurationUtil.class.getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java index 63dffd5522..e0a8ac2c42 100644 --- a/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java +++ b/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java @@ -33,9 +33,9 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; 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.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; /** * @version $Rev$ $Date$ @@ -63,7 +63,7 @@ public class AtomBindingProcessorTestCase extends TestCase { 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); diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java index 9a487e02d1..8b56f88cc7 100644 --- a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java +++ b/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java @@ -23,7 +23,6 @@ import javax.xml.stream.XMLStreamException; 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.assembly.xml.PolicyAttachPointProcessor; import org.apache.tuscany.sca.binding.ejb.EJBBinding; @@ -33,10 +32,10 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException; import org.apache.tuscany.sca.contribution.service.ContributionWriteException; -import org.apache.tuscany.sca.policy.PolicyFactory; 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.policy.PolicyFactory; /** * A processor to read the XML that describes the EJB binding... @@ -78,7 +77,7 @@ public class EJBBindingProcessor implements StAXArtifactProcessor { */ private void warning(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "binding-jms-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -149,7 +148,7 @@ public class JMSBindingProcessor implements StAXArtifactProcessor { */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "binding-jms-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -445,12 +444,12 @@ public class JMSBindingProcessor implements StAXArtifactProcessor { } /** - * - * * + * + * * * ? */ private void parseHeaders(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException { @@ -536,14 +535,14 @@ public class JMSBindingProcessor implements StAXArtifactProcessor { } /** - * - * * - * - * * + * + * * + * + * * * ? * * */ diff --git a/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java index 7fe482c4f2..82fd6a5149 100644 --- a/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java +++ b/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java @@ -34,9 +34,9 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; 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.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; /** * Tests for JMS binding xml @@ -131,7 +131,7 @@ public class JMSBindingProcessorTestCase extends TestCase { 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); diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java index de1cab15d8..b9bb5ac6d3 100644 --- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java +++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java @@ -22,6 +22,7 @@ package org.apache.tuscany.sca.binding.ws.wsdlgen; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import javax.wsdl.Definition; import javax.wsdl.PortType; import javax.wsdl.WSDLException; @@ -31,8 +32,6 @@ import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.AbstractContract; import org.apache.tuscany.sca.assembly.Component; import org.apache.tuscany.sca.assembly.Contract; -import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.binding.ws.WebServiceBinding; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -89,7 +88,7 @@ public class BindingWSDLGenerator { * @param parameters */ private static void warning(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) { - Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.WARNING, wsBinding, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.WARNING, wsBinding, message, (Object[])messageParameters); if (monitor != null) { monitor.problem(problem); } else { @@ -104,7 +103,7 @@ public class BindingWSDLGenerator { * @param parameters */ private static void error(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) { - Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, (Object[])messageParameters); if (monitor != null) { monitor.problem(problem); } else { @@ -119,7 +118,7 @@ public class BindingWSDLGenerator { * @param exception */ private static void error(Monitor monitor, String message, WebServiceBinding wsBinding, Exception ex) { - Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, ex); + Problem problem = monitor.createProblem(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, ex); if (monitor != null) { monitor.problem(problem); } else { @@ -134,7 +133,7 @@ public class BindingWSDLGenerator { * @param exception */ private static void fatal(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) { - Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR,wsBinding, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR,wsBinding, message, (Object[])messageParameters); throw new WSDLGenerationException(problem.toString(), null, problem); } @@ -145,7 +144,7 @@ public class BindingWSDLGenerator { * @param exception */ private static void fatal(Monitor monitor, String message, WebServiceBinding wsBinding, Exception ex) { - Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, ex); + Problem problem = monitor.createProblem(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, ex); throw new WSDLGenerationException(problem.toString(), ex, problem); } diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index 933534cc79..ee02632096 100644 --- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -47,7 +47,6 @@ import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.databinding.DataBinding; import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; @@ -136,7 +135,7 @@ public class Interface2WSDLGenerator { * @param parameters */ private void warning(String message, Interface interfaze, String... messageParameters) { - Problem problem = new ProblemImpl(this.getClass().getName(), "wsdlgen-validation-messages", Severity.WARNING, interfaze, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "wsdlgen-validation-messages", Severity.WARNING, interfaze, message, (Object[])messageParameters); if (monitor != null) { monitor.problem(problem); } else { @@ -151,7 +150,7 @@ public class Interface2WSDLGenerator { * @param parameters */ private void fatal(String message, Interface interfaze, String... messageParameters) { - Problem problem = new ProblemImpl(this.getClass().getName(), "wsdlgen-validation-messages", Severity.ERROR, interfaze, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "wsdlgen-validation-messages", Severity.ERROR, interfaze, message, (Object[])messageParameters); throw new WSDLGenerationException(problem.toString(), null, problem); } diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java index ebfbdc509a..b74358a0a1 100644 --- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java +++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java @@ -20,23 +20,15 @@ package org.apache.tuscany.sca.binding.ws.wsdlgen; //FIXME: trim the import list down to what's really needed -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.List; -import java.util.Iterator; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import javax.wsdl.Binding; -import javax.wsdl.BindingOperation; import javax.wsdl.Definition; import javax.wsdl.Import; import javax.wsdl.Port; @@ -46,36 +38,22 @@ import javax.wsdl.WSDLException; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.extensions.soap.SOAPBinding; -import javax.wsdl.extensions.soap.SOAPOperation; import javax.wsdl.extensions.soap12.SOAP12Address; import javax.wsdl.extensions.soap12.SOAP12Binding; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLWriter; import javax.xml.namespace.QName; -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.transform.dom.DOMSource; import org.apache.tuscany.sca.assembly.AbstractContract; import org.apache.tuscany.sca.assembly.Component; import org.apache.tuscany.sca.assembly.CompositeService; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.binding.ws.WebServiceBinding; import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; 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.policy.PolicySet; -import org.apache.tuscany.sca.policy.PolicySetAttachPoint; -import org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy; -import org.apache.tuscany.sca.policy.util.PolicyHandler; -import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; -import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -120,7 +98,7 @@ public class WSDLServiceGenerator { * @param parameters */ private static void warning(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) { - Problem problem = new ProblemImpl(WSDLServiceGenerator.class.getName(), "wsdlgen-validation-messages", Severity.WARNING, wsBinding, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(WSDLServiceGenerator.class.getName(), "wsdlgen-validation-messages", Severity.WARNING, wsBinding, message, (Object[])messageParameters); if (monitor != null) { monitor.problem(problem); } else { @@ -135,7 +113,7 @@ public class WSDLServiceGenerator { * @param parameters */ private static void error(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) { - Problem problem = new ProblemImpl(WSDLServiceGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(WSDLServiceGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, (Object[])messageParameters); if (monitor != null) { monitor.problem(problem); } else { diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java index 15b58e499c..f16eb5333e 100644 --- a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java +++ b/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java @@ -23,6 +23,7 @@ import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import java.util.Map; + import javax.wsdl.Binding; import javax.wsdl.Port; import javax.wsdl.PortType; @@ -34,7 +35,6 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.ConfiguredOperation; import org.apache.tuscany.sca.assembly.OperationsConfigurator; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.assembly.xml.ConfiguredOperationProcessor; import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor; @@ -103,7 +103,7 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor { */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java index d027d75b32..f5f2bc3bad 100644 --- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java +++ b/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java @@ -27,7 +27,6 @@ import javax.xml.stream.XMLStreamException; 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.java.JavaImport; import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory; @@ -71,7 +70,7 @@ public class JavaImportProcessor implements StAXArtifactProcessor { */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java index 0ec5bfba39..53993cf39a 100644 --- a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java +++ b/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java @@ -33,11 +33,10 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtens import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; +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.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; /** * Test JavaExportProcessorTestCase @@ -64,7 +63,7 @@ public class JavaExportProcessorTestCase extends TestCase { 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); @@ -96,7 +95,7 @@ public class JavaExportProcessorTestCase extends TestCase { assertTrue(true); }*/ staxProcessor.read(reader); - Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = monitor.getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributePackageMissing", problem.getMessageId()); } diff --git a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java index 9e43b744cf..684e9b01f4 100644 --- a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java +++ b/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java @@ -33,11 +33,10 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtens import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; +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.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; /** * Test JavaImportProcessorTestCase @@ -64,7 +63,7 @@ public class JavaImportProcessorTestCase extends TestCase { 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); @@ -98,7 +97,7 @@ public class JavaImportProcessorTestCase extends TestCase { assertTrue(true); }*/ staxProcessor.read(reader); - Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = monitor.getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributePackageMissing", problem.getMessageId()); } diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java index 64862301c1..d3a2f41f85 100644 --- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java +++ b/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java @@ -27,7 +27,6 @@ import javax.xml.stream.XMLStreamException; 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.namespace.NamespaceExport; import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory; @@ -39,6 +38,7 @@ import org.apache.tuscany.sca.contribution.service.ContributionWriteException; 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; /** * Artifact processor for Namespace export @@ -68,7 +68,7 @@ public class NamespaceExportProcessor implements StAXArtifactProcessor { */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } @@ -302,7 +302,7 @@ public class AnyElementProcessor implements StAXArtifactProcessor { */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java index e2e97239e0..3ab00233ab 100644 --- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java +++ b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java @@ -28,7 +28,6 @@ import javax.xml.stream.XMLInputFactory; 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.ContributionMetadata; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; @@ -39,6 +38,7 @@ import org.apache.tuscany.sca.contribution.service.ContributionResolveException; 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; /** * URLArtifactProcessor that handles sca-contribution.xml files. @@ -75,7 +75,7 @@ public class ContributionMetadataDocumentProcessor implements URLArtifactProcess */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-xml-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-xml-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java index 3f5aacb541..1c49eabaf5 100644 --- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java +++ b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java @@ -30,7 +30,6 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ContributionFactory; import org.apache.tuscany.sca.contribution.ContributionMetadata; import org.apache.tuscany.sca.contribution.Export; @@ -45,6 +44,7 @@ import org.apache.tuscany.sca.contribution.service.ContributionWriteException; 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; /** * Processor for contribution metadata @@ -83,7 +83,7 @@ public class ContributionMetadataProcessor extends BaseStAXArtifactProcessor imp */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java index 8f69f15cd1..b6fb7a0d2e 100644 --- a/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java +++ b/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java @@ -37,11 +37,10 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtens import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; +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.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; /** * Test the contribution metadata processor. @@ -79,7 +78,7 @@ public class ContributionMetadataProcessorTestCase extends TestCase { // 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); @@ -104,7 +103,7 @@ public class ContributionMetadataProcessorTestCase extends TestCase { assertTrue(true); }*/ staxProcessor.read(reader); - Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = monitor.getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributeCompositeMissing", problem.getMessageId()); } diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java index 46ac9897a1..1fb2ecd017 100644 --- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java +++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java @@ -31,7 +31,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.service.ContributionReadException; @@ -45,6 +44,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; 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.PolicyFactory; /** @@ -90,7 +90,7 @@ public class DefaultStAXArtifactProcessorExtensionPoint extends */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } @@ -236,7 +236,7 @@ public class DefaultStAXArtifactProcessorExtensionPoint extends private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java index aa8875c08f..293b455810 100644 --- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java +++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java @@ -30,7 +30,6 @@ import javax.xml.stream.XMLStreamException; 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.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.service.ContributionReadException; @@ -44,6 +43,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** * The default implementation of an extension point for StAX artifact processors. @@ -84,7 +84,7 @@ public class DefaultStAXAttributeProcessorExtensionPoint extends */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } @@ -227,7 +227,7 @@ public class DefaultStAXAttributeProcessorExtensionPoint extends private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java index 4d7374d803..1c7dbef5ec 100644 --- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java +++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java @@ -28,7 +28,6 @@ import java.util.Set; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.service.ContributionReadException; @@ -41,6 +40,7 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** @@ -82,7 +82,7 @@ public class DefaultURLArtifactProcessorExtensionPoint */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } @@ -184,7 +184,7 @@ public class DefaultURLArtifactProcessorExtensionPoint private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java index 7be5566113..6b9eaeab8d 100644 --- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java +++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java @@ -44,10 +44,10 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; 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.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -87,7 +87,7 @@ public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java index 7ed2d45c2f..3c1f76f295 100644 --- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java +++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java @@ -26,13 +26,13 @@ import java.net.URI; import java.net.URL; import java.util.List; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.contribution.service.ContributionException; import org.apache.tuscany.sca.contribution.service.TypeDescriber; import org.apache.tuscany.sca.contribution.service.UnsupportedPackageTypeException; 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; /** * Implementation of an extensible package processor. @@ -65,7 +65,7 @@ public class ExtensiblePackageProcessor implements PackageProcessor { */ protected void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java index a1c13c95f2..29cd14d70f 100644 --- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java +++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java @@ -33,7 +33,6 @@ import javax.xml.stream.XMLStreamException; 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.Constants; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.service.ContributionReadException; @@ -43,6 +42,7 @@ import org.apache.tuscany.sca.contribution.service.UnrecognizedElementException; 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; /** * Implementation of an extensible StAX artifact processor. @@ -91,7 +91,7 @@ public class ExtensibleStAXArtifactProcessor implements StAXArtifactProcessor { */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -90,7 +90,7 @@ public class ImportSDOProcessor implements StAXArtifactProcessor { */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java index 0b760ef712..386e9ac7a0 100644 --- a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java +++ b/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java @@ -34,7 +34,6 @@ import javax.xml.stream.XMLStreamConstants; 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.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; @@ -47,6 +46,7 @@ import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil; 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; /** * A SCA Definitions Document processor. @@ -98,7 +98,7 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor1.4-SNAPSHOT runtime - - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - runtime - - diff --git a/branches/sca-equinox/modules/endpoint/pom.xml b/branches/sca-equinox/modules/endpoint/pom.xml index 31e8adc800..95cfabf25d 100644 --- a/branches/sca-equinox/modules/endpoint/pom.xml +++ b/branches/sca-equinox/modules/endpoint/pom.xml @@ -84,13 +84,6 @@ test - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - test - - org.easymock easymock diff --git a/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java index be700cb2d0..ae04169933 100644 --- a/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java +++ b/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java @@ -61,9 +61,9 @@ import org.apache.tuscany.sca.extensibility.ServiceDeclaration; 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 @@ public class ReallySmallRuntime { 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."); diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java index cde6fc4fc5..15b12a1a47 100644 --- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java +++ b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java @@ -37,7 +37,6 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; -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.URLArtifactProcessor; @@ -55,6 +54,7 @@ import org.apache.tuscany.sca.interfacedef.wsdl.xml.BPELPartnerLinkTypeExt; 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; /** * BPEL document processor responsible for reading a BPEL file and producing necessary model info about it @@ -497,7 +497,7 @@ public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements */ private void warning(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "impl-bpel-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -511,7 +511,7 @@ public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -525,7 +525,7 @@ public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements */ private void error(String message, Object model, Exception ex) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, ex); + Problem problem = monitor.createProblem(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, ex); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java index ce1c22e641..04752a3969 100644 --- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java +++ b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java @@ -37,7 +37,6 @@ import org.apache.tuscany.sca.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.Property; import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; -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.BaseStAXArtifactProcessor; @@ -56,6 +55,7 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract; 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; /** * Implements a StAX artifact processor for BPEL implementations. @@ -510,7 +510,7 @@ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor imple */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java index 9dd5306de1..f5a898465a 100644 --- a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java +++ b/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java @@ -35,11 +35,10 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; 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.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; /** * @version $Rev$ $Date$ @@ -74,7 +73,7 @@ public class BPELImplementationProcessorTestCase extends TestCase { 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); @@ -104,7 +103,7 @@ public class BPELImplementationProcessorTestCase extends TestCase { public void testLoadInvalidComposite() throws Exception { XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_INVALID)); staxProcessor.read(reader); - Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = monitor.getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributeProcessMissing", problem.getMessageId()); } diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java index b3e5e3394c..7390166055 100644 --- a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java +++ b/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java @@ -27,7 +27,6 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.assembly.ComponentType; -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.BaseStAXArtifactProcessor; @@ -41,6 +40,7 @@ import org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory; 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; /** @@ -70,7 +70,7 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "impl-ejb-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "impl-ejb-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java index 8c9dbaf3d5..6bc581094d 100644 --- a/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java +++ b/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java @@ -40,7 +40,6 @@ import org.apache.tuscany.sca.assembly.OperationsConfigurator; import org.apache.tuscany.sca.assembly.Property; import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; import org.apache.tuscany.sca.assembly.xml.ConfiguredOperationProcessor; import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor; @@ -61,6 +60,7 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterface; 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.IntentAttachPointTypeFactory; import org.apache.tuscany.sca.policy.PolicyFactory; @@ -98,7 +98,7 @@ public class JavaImplementationProcessor implements StAXArtifactProcessor${tuscany.version} org.apache.tuscany.sca.monitor ${pom.name} - org.apache.tuscany.sca.monitor* + org.apache.tuscany.sca.monitor diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java new file mode 100644 index 0000000000..b38968caeb --- /dev/null +++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.monitor; + +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/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java index c16140213d..ef49ddd323 100644 --- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java +++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java @@ -21,6 +21,8 @@ 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 * @@ -41,4 +43,37 @@ public interface Monitor { */ List getProblems(); + /** + * Returns the last logged problem. + * + * @return + */ + public Problem getLastLoggedProblem(); + + /** + * 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/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java index 38c3bbd991..3384626958 100644 --- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java +++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java @@ -18,6 +18,7 @@ */ package org.apache.tuscany.sca.monitor; + /** * A factory for validation monitors * @@ -26,7 +27,7 @@ package org.apache.tuscany.sca.monitor; public interface MonitorFactory { /** - * Create a new monitor + * Create a new monitor. * * @return a new monitor */ diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java deleted file mode 100644 index 274b4faefd..0000000000 --- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor.impl; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; - - -/** - * A factory for creating validation monitors - * - * @version $Rev$ $Date$ - */ -public class DefaultMonitorFactoryImpl implements MonitorFactory { - - private Monitor monitor = null; - - public Monitor createMonitor() { - if (monitor == null){ - monitor = new DefaultMonitorImpl(); - } - return monitor ; - } -} diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java deleted file mode 100644 index b98f29d4dd..0000000000 --- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.monitor.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; - -/** - * A monitor for the watching for validation problems - * - * @version $Rev$ $Date$ - */ -public class DefaultMonitorImpl implements Monitor { - private static final Logger logger = Logger.getLogger(DefaultMonitorImpl.class.getName()); - - // Cache all the problem reported to monitor for further analysis - private List problemCache = new ArrayList(); - - public void problem(Problem problem) { - - Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName()); - - if (problemLogger == null){ - logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName()); - } - - if (problem.getSeverity() == Severity.INFO) { - problemCache.add(problem); - problemLogger.logp(Level.INFO, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.WARNING) { - problemCache.add(problem); - problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.ERROR) { - if (problem.getCause() != null) { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), - null, problem.getMessageId(), problem.getCause().toString()); - - } else { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - } - } - - public List getProblems(){ - return problemCache; - } - - public Problem getLastLoggedProblem(){ - return problemCache.get(problemCache.size() - 1); - } - - public boolean isMessageLogged(String messageId) { - for (Problem problem : problemCache){ - if (problem.getMessageId().equals(messageId)){ - return true; - } - } - - return false; - } - - public Problem getProblem(String messageId) { - for (Problem problem : problemCache){ - if (problem.getMessageId().equals(messageId)){ - return problem; - } - } - - return null; - } -} diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java new file mode 100644 index 0000000000..585e616632 --- /dev/null +++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java @@ -0,0 +1,92 @@ +/* + * 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 getLastLoggedProblem(){ + 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/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java new file mode 100644 index 0000000000..5a0aaeddd0 --- /dev/null +++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java @@ -0,0 +1,132 @@ +/* + * 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/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java new file mode 100644 index 0000000000..4380e32f99 --- /dev/null +++ b/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java @@ -0,0 +1,92 @@ +/* + * 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/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties b/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties new file mode 100644 index 0000000000..523263da40 --- /dev/null +++ b/branches/sca-equinox/modules/monitor/src/test/resources/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/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties b/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties new file mode 100644 index 0000000000..523263da40 --- /dev/null +++ b/branches/sca-equinox/modules/monitor/src/test/resources/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 diff --git a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java b/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java index 15a348afd8..31b65272c4 100644 --- a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java +++ b/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java @@ -61,9 +61,9 @@ import org.apache.tuscany.sca.extensibility.ServiceDeclaration; 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 @@ public class RuntimeBootStrapper { 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."); diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java index dcc85f809c..14f98b6dac 100644 --- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java +++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java @@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamException; 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.contribution.service.ContributionWriteException; 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 @@ public class AuthorizationPolicyProcessor implements StAXArtifactProcessor extends BaseStAXArtifactP */ 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); } } diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java index 81ca27a085..a15d385b02 100644 --- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java +++ b/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java @@ -36,7 +36,6 @@ import javax.xml.xpath.XPath; 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.contribution.service.ContributionWriteException; 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 @@ public class PolicySetProcessor extends BaseStAXArtifactProcessor implements StA */ 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 @@ public class PolicySetProcessor extends BaseStAXArtifactProcessor implements StA */ 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); } } diff --git a/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java index c9fad18157..b1901e9f30 100644 --- a/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java +++ b/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java @@ -41,9 +41,9 @@ import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver; 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 @@ public class ReadDocumentTestCase extends TestCase { 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); diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml index f404c65fa5..57f379ef45 100644 --- a/branches/sca-equinox/modules/pom.xml +++ b/branches/sca-equinox/modules/pom.xml @@ -141,7 +141,6 @@ implementation-widget-runtime implementation-xquery monitor - monitor-logging node-api node-impl node-launcher diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java index 016c764d47..408debdc8e 100644 --- a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java +++ b/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java @@ -26,7 +26,6 @@ import java.util.List; 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.contribution.resolver.DefaultImportModelResolver; 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 @@ public class ContributionDependencyBuilderImpl implements ContributionDependency */ 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); } } diff --git a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java index 49041b3263..8350c30437 100644 --- a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java +++ b/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java @@ -29,7 +29,6 @@ import javax.xml.stream.XMLInputFactory; 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.contribution.service.ContributionResolveException; 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 @@ public class WorkspaceDocumentProcessor implements URLArtifactProcessor */ 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); } } diff --git a/branches/sca-equinox/samples/domain-management/pom.xml b/branches/sca-equinox/samples/domain-management/pom.xml index 0dff72408a..e809953936 100644 --- a/branches/sca-equinox/samples/domain-management/pom.xml +++ b/branches/sca-equinox/samples/domain-management/pom.xml @@ -108,13 +108,6 @@ 1.4-SNAPSHOT - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - runtime - - xerces xercesImpl -- cgit v1.2.3