tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r673817 - in /tuscany/branches/sca-java-1.3/modules/monitor-logging/src: main/java/org/apache/tuscany/sca/monitor/impl/ main/java/org/apache/tuscany/sca/monitor/logging/ main/java/org/apache/tuscany/sca/monitor/logging/impl/ main/resources/...
Date Thu, 03 Jul 2008 21:24:15 GMT
Author: antelder
Date: Thu Jul  3 14:24:15 2008
New Revision: 673817

URL: http://svn.apache.org/viewvc?rev=673817&view=rev
Log:
Merge fix for TUSCANY-2456 from trunk to 1.3 branch

Added:
    tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/
      - copied from r673778, tuscany/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/
    tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/
      - copied from r673778, tuscany/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/
    tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java
      - copied unchanged from r673778, tuscany/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java
    tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java
      - copied unchanged from r673778, tuscany/java/sca/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java
Removed:
    tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/impl/
Modified:
    tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
    tuscany/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java

Modified: tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory?rev=673817&r1=673816&r2=673817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
(original)
+++ tuscany/branches/sca-java-1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
Thu Jul  3 14:24:15 2008
@@ -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

Modified: tuscany/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java?rev=673817&r1=673816&r2=673817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
(original)
+++ tuscany/branches/sca-java-1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
Thu Jul  3 14:24:15 2008
@@ -21,7 +21,7 @@
 
 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;



Mime
View raw message