You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2015/01/21 13:36:20 UTC

svn commit: r1653509 - in /incubator/sirona/trunk: agent/performance/aop/src/test/java/org/apache/sirona/aop/ agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/repository/ agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/store/ a...

Author: olamy
Date: Wed Jan 21 12:36:19 2015
New Revision: 1653509

URL: http://svn.apache.org/r1653509
Log:
fix compilation due to package move

Modified:
    incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/DynamicInterceptionTest.java
    incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/repository/PullRepository.java
    incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/store/PullDataStoreFactory.java
    incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java
    incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java
    incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubePathTrackingDataStore.java
    incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/DisruptorPathTrackingDataStore.java
    incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java
    incubator/sirona/trunk/api/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java
    incubator/sirona/trunk/server/boomerang/src/main/java/org/apache/sirona/boomerang/BoomerangServlet.java
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/agent/counter/CassandraCounterDataStore.java
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/pathtracking/CassandraPathTrackingDataStore.java
    incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/ExtendedCassandraPathTrackingDataStore.java
    incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java

Modified: incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/DynamicInterceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/DynamicInterceptionTest.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/DynamicInterceptionTest.java (original)
+++ incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/DynamicInterceptionTest.java Wed Jan 21 12:36:19 2015
@@ -104,7 +104,10 @@ public class DynamicInterceptionTest {
 
         @Override
         protected ActivationContext doFindContext(final Long invocation) {
-            return putAndGetActivationContext(extractContextKey(null), new ActivationContext(true, TimeUnit.MILLISECONDS.toNanos(THRESHOLD), MAX_IT));
+            return putAndGetActivationContext(extractContextKey(null), //
+                                              new ActivationContext(true, //
+                                                                    TimeUnit.MILLISECONDS.toNanos(THRESHOLD), //
+                                                                    MAX_IT));
         }
     }
 }

Modified: incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/repository/PullRepository.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/repository/PullRepository.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/repository/PullRepository.java (original)
+++ incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/repository/PullRepository.java Wed Jan 21 12:36:19 2015
@@ -27,7 +27,7 @@ import org.apache.sirona.repositories.De
 import org.apache.sirona.repositories.Repository;
 import org.apache.sirona.status.NodeStatus;
 import org.apache.sirona.status.NodeStatusReporter;
-import org.apache.sirona.store.counter.InMemoryCounterDataStore;
+import org.apache.sirona.store.counter.memory.InMemoryCounterDataStore;
 import org.apache.sirona.store.status.EmptyStatuses;
 import org.apache.sirona.store.tracking.InMemoryPathTrackingDataStore;
 

Modified: incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/store/PullDataStoreFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/store/PullDataStoreFactory.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/store/PullDataStoreFactory.java (original)
+++ incubator/sirona/trunk/agent/pull/src/main/java/org/apache/sirona/agent/webapp/pull/store/PullDataStoreFactory.java Wed Jan 21 12:36:19 2015
@@ -17,7 +17,7 @@
 package org.apache.sirona.agent.webapp.pull.store;
 
 import org.apache.sirona.store.DelegateDataStoreFactory;
-import org.apache.sirona.store.counter.InMemoryCounterDataStore;
+import org.apache.sirona.store.counter.memory.InMemoryCounterDataStore;
 import org.apache.sirona.store.gauge.InMemoryGaugeDataStore;
 import org.apache.sirona.store.status.EmptyStatuses;
 import org.apache.sirona.store.tracking.InMemoryPathTrackingDataStore;

Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java Wed Jan 21 12:36:19 2015
@@ -18,9 +18,9 @@ package org.apache.sirona.cube;
 
 import org.apache.sirona.Role;
 import org.apache.sirona.counters.Counter;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.apache.sirona.status.NodeStatus;
 import org.apache.sirona.status.ValidationResult;
-import org.apache.sirona.tracking.PathTrackingEntry;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;

Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java Wed Jan 21 12:36:19 2015
@@ -18,11 +18,12 @@ package org.apache.sirona.cube;
 
 import org.apache.sirona.configuration.ioc.IoCs;
 import org.apache.sirona.counters.Counter;
-import org.apache.sirona.store.counter.BatchCounterDataStore;
+import org.apache.sirona.store.counter.memory.BatchCounterDataStore;
 
 import java.util.Collection;
 
-public class CubeCounterDataStore extends BatchCounterDataStore {
+public class CubeCounterDataStore extends BatchCounterDataStore
+{
     private final Cube cube = IoCs.findOrCreateInstance(CubeBuilder.class).build();
 
     @Override

Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubePathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubePathTrackingDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubePathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubePathTrackingDataStore.java Wed Jan 21 12:36:19 2015
@@ -20,9 +20,9 @@ package org.apache.sirona.cube;
 import org.apache.sirona.configuration.Configuration;
 import org.apache.sirona.configuration.ioc.Destroying;
 import org.apache.sirona.configuration.ioc.IoCs;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.apache.sirona.store.tracking.BatchPathTrackingDataStore;
 import org.apache.sirona.store.tracking.CollectorPathTrackingDataStore;
-import org.apache.sirona.tracking.PathTrackingEntry;
 import org.apache.sirona.util.SerializeUtils;
 
 import java.util.List;

Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/DisruptorPathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/DisruptorPathTrackingDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/DisruptorPathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/DisruptorPathTrackingDataStore.java Wed Jan 21 12:36:19 2015
@@ -29,9 +29,9 @@ import org.apache.sirona.configuration.i
 import org.apache.sirona.configuration.ioc.Created;
 import org.apache.sirona.configuration.ioc.Destroying;
 import org.apache.sirona.configuration.ioc.IoCs;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.apache.sirona.store.tracking.BatchPathTrackingDataStore;
 import org.apache.sirona.store.tracking.CollectorPathTrackingDataStore;
-import org.apache.sirona.tracking.PathTrackingEntry;
 import org.apache.sirona.util.SerializeUtils;
 
 import java.util.List;

Modified: incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java (original)
+++ incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java Wed Jan 21 12:36:19 2015
@@ -19,14 +19,15 @@ package org.apache.sirona.graphite;
 import org.apache.sirona.configuration.ioc.IoCs;
 import org.apache.sirona.counters.Counter;
 import org.apache.sirona.counters.MetricData;
-import org.apache.sirona.store.counter.BatchCounterDataStore;
+import org.apache.sirona.store.counter.memory.BatchCounterDataStore;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class GraphiteCounterDataStore extends BatchCounterDataStore {
+public class GraphiteCounterDataStore extends BatchCounterDataStore
+{
     private static final Logger LOGGER = Logger.getLogger(GraphiteCounterDataStore.class.getName());
 
     private static final String COUNTER_PREFIX = "counter-";

Modified: incubator/sirona/trunk/api/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/api/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/api/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java (original)
+++ incubator/sirona/trunk/api/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java Wed Jan 21 12:36:19 2015
@@ -54,6 +54,7 @@ public abstract class CollectorCounter i
 
     public void add(final double delta) {
         // no-op: this counter is updated through update method
+        System.out.println( "add " + delta );
     }
 
     public void add(final double delta, Unit unit) {

Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java Wed Jan 21 12:36:19 2015
@@ -56,8 +56,8 @@ public class DefaultRepository implement
         this(findCounterDataStore(), findGaugeDataStore(), findStatusDataStore(), findPathTrackingDataStore());
     }
 
-    protected DefaultRepository(final CounterDataStore counter, final CommonGaugeDataStore gauge, final NodeStatusDataStore status,
-                                final PathTrackingDataStore pathTrackingDataStore) {
+    protected DefaultRepository(final CounterDataStore counter, final CommonGaugeDataStore gauge, //
+                                final NodeStatusDataStore status, final PathTrackingDataStore pathTrackingDataStore) {
         this.counterDataStore = counter;
         this.gaugeDataStore = gauge;
         this.nodeStatusDataStore = status;

Modified: incubator/sirona/trunk/server/boomerang/src/main/java/org/apache/sirona/boomerang/BoomerangServlet.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/boomerang/src/main/java/org/apache/sirona/boomerang/BoomerangServlet.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/server/boomerang/src/main/java/org/apache/sirona/boomerang/BoomerangServlet.java (original)
+++ incubator/sirona/trunk/server/boomerang/src/main/java/org/apache/sirona/boomerang/BoomerangServlet.java Wed Jan 21 12:36:19 2015
@@ -29,7 +29,7 @@ import org.apache.sirona.repositories.Re
 import org.apache.sirona.store.BatchFuture;
 import org.apache.sirona.store.counter.CollectorCounterStore;
 import org.apache.sirona.store.counter.CounterDataStore;
-import org.apache.sirona.store.counter.InMemoryCounterDataStore;
+import org.apache.sirona.store.counter.memory.InMemoryCounterDataStore;
 import org.apache.sirona.util.DaemonThreadFactory;
 
 import javax.servlet.ServletConfig;
@@ -183,7 +183,8 @@ public class BoomerangServlet extends Ht
         }
     }
 
-    private static class InitializedCounterDataStore extends InMemoryCounterDataStore {
+    private static class InitializedCounterDataStore extends InMemoryCounterDataStore
+    {
         private final CollectorCounterStore delegate;
 
         public InitializedCounterDataStore(final CollectorCounterStore collectorCounterStore) {

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/agent/counter/CassandraCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/agent/counter/CassandraCounterDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/agent/counter/CassandraCounterDataStore.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/agent/counter/CassandraCounterDataStore.java Wed Jan 21 12:36:19 2015
@@ -21,7 +21,7 @@ import org.apache.sirona.configuration.i
 import org.apache.sirona.configuration.ioc.Created;
 import org.apache.sirona.counters.Counter;
 import org.apache.sirona.math.M2AwareStatisticalSummary;
-import org.apache.sirona.store.counter.BatchCounterDataStore;
+import org.apache.sirona.store.counter.memory.BatchCounterDataStore;
 import org.apache.sirona.util.Localhosts;
 
 import java.util.Collection;
@@ -29,7 +29,8 @@ import java.util.HashSet;
 import java.util.logging.Logger;
 
 @AutoSet // for marker
-public class CassandraCounterDataStore extends BatchCounterDataStore {
+public class CassandraCounterDataStore extends BatchCounterDataStore
+{
     private static final Logger LOGGER = Logger.getLogger(CassandraCounterDataStore.class.getName());
 
     private final CassandraCollectorCounterDataStore delegate = new CassandraCollectorCounterDataStore();

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java Wed Jan 21 12:36:19 2015
@@ -33,17 +33,21 @@ import org.apache.sirona.counters.Counte
 import org.apache.sirona.counters.Unit;
 import org.apache.sirona.math.M2AwareStatisticalSummary;
 import org.apache.sirona.store.counter.AggregatedCollectorCounter;
-import org.apache.sirona.store.counter.InMemoryCollectorCounterStore;
 import org.apache.sirona.store.counter.LeafCollectorCounter;
+import org.apache.sirona.store.counter.memory.InMemoryCollectorCounterStore;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
-import static org.apache.sirona.cassandra.collector.CassandraSirona.*;
+import static org.apache.sirona.cassandra.collector.CassandraSirona.keys;
+import static org.apache.sirona.cassandra.collector.CassandraSirona.column;
+import static org.apache.sirona.cassandra.collector.CassandraSirona.getOrDefault;
+import static org.apache.sirona.cassandra.collector.CassandraSirona.emptyColumn;
 
-public class CassandraCollectorCounterDataStore extends InMemoryCollectorCounterStore {
+public class CassandraCollectorCounterDataStore extends InMemoryCollectorCounterStore
+{
     private final Keyspace keyspace;
     private final String family;
     private final String markerFamily;

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/pathtracking/CassandraPathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/pathtracking/CassandraPathTrackingDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/pathtracking/CassandraPathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/pathtracking/CassandraPathTrackingDataStore.java Wed Jan 21 12:36:19 2015
@@ -33,12 +33,12 @@ import org.apache.sirona.cassandra.Dynam
 import org.apache.sirona.cassandra.collector.CassandraSirona;
 import org.apache.sirona.configuration.Configuration;
 import org.apache.sirona.configuration.ioc.IoCs;
+import org.apache.sirona.pathtracking.PathCallInformation;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
+import org.apache.sirona.pathtracking.PathTrackingEntryComparator;
 import org.apache.sirona.store.tracking.BatchPathTrackingDataStore;
 import org.apache.sirona.store.tracking.CollectorPathTrackingDataStore;
 import org.apache.sirona.store.tracking.PathTrackingDataStore;
-import org.apache.sirona.tracking.PathCallInformation;
-import org.apache.sirona.tracking.PathTrackingEntry;
-import org.apache.sirona.tracking.PathTrackingEntryComparator;
 
 import java.util.Collection;
 import java.util.Collections;

Modified: incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/ExtendedCassandraPathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/ExtendedCassandraPathTrackingDataStore.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/ExtendedCassandraPathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/ExtendedCassandraPathTrackingDataStore.java Wed Jan 21 12:36:19 2015
@@ -25,7 +25,7 @@ import me.prettyprint.hector.api.factory
 import me.prettyprint.hector.api.query.QueryResult;
 import org.apache.sirona.cassandra.DynamicDelegatedSerializer;
 import org.apache.sirona.cassandra.collector.pathtracking.CassandraPathTrackingDataStore;
-import org.apache.sirona.tracking.PathTrackingEntry;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 
 import java.util.Map;
 import java.util.Set;
@@ -43,7 +43,7 @@ public class ExtendedCassandraPathTracki
      * <b>use with CAUTION as can return a lot of data</b>
      * <p>This method is use for testing purpose</p>
      *
-     * @return {@link java.util.List} containing all {@link org.apache.sirona.tracking.PathTrackingEntry}
+     * @return {@link java.util.List} containing all {@link org.apache.sirona.pathtracking.PathTrackingEntry}
      */
     public Map<String, Set<PathTrackingEntry>> retrieveAll()
     {

Modified: incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java?rev=1653509&r1=1653508&r2=1653509&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java Wed Jan 21 12:36:19 2015
@@ -23,8 +23,8 @@ import org.apache.sirona.cassandra.colle
 import org.apache.sirona.cassandra.framework.CassandraRunner;
 import org.apache.sirona.cassandra.framework.CassandraTestInject;
 import org.apache.sirona.configuration.ioc.IoCs;
-import org.apache.sirona.tracking.PathCallInformation;
-import org.apache.sirona.tracking.PathTrackingEntry;
+import org.apache.sirona.pathtracking.PathCallInformation;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;