Merge fix for TUSCANY-2456 from trunk to 1.3 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673817 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 4 insertions, 4 deletions

diff --git a/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultLoggingMonitorImpl.java b/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java
index 474d6b4b3a..d4dc3d2be4 100644
--- a/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultLoggingMonitorImpl.java
+++ b/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.monitor.impl;
+package org.apache.tuscany.sca.monitor.logging.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorFactoryImpl.java b/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java
index 5389306cb7..a3162a3267 100644
--- a/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorFactoryImpl.java
+++ b/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.monitor.impl;
+package org.apache.tuscany.sca.monitor.logging.impl;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
diff --git a/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
index 8e722e2cd8..b46d552fb5 100644
--- a/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
+++ b/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations

 # under the License. 

 

-org.apache.tuscany.sca.monitor.impl.MonitorFactoryImpl

+org.apache.tuscany.sca.monitor.logging.impl.MonitorFactoryImpl

diff --git a/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
index 05a8368dfb..c5fa6c4da6 100644
--- a/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
+++ b/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.monitor;
 
 import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.MonitorFactoryImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.MonitorFactoryImpl;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;