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

6 files changed, 9 insertions, 144 deletions

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);
         }
     }