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:48 UTC
svn commit: r1653511 - in /incubator/sirona/trunk: agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/ agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/ se...

Author: olamy
Date: Wed Jan 21 12:36:47 2015
New Revision: 1653511

URL: http://svn.apache.org/r1653511
Log:
fix compilation

Modified:
    incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtDataStoreFactory.java
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtendedInMemoryPathTrackingDataStore.java
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java
    incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
    incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/plugin/pathtracking/PathTrackingEndpoints.java

Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingListener.java Wed Jan 21 12:36:47 2015
@@ -56,7 +56,7 @@ public class PathTrackingListener
     /**
      * executed before method called to configure the start {@link org.apache.sirona.pathtracking.PathTrackingInformation}
      * and set various thread local variable as invocation level
-     * will call {@link org.apache.sirona.pathtracking.PathTracker#start(org.apache.sirona.pathtracking.PathTrackingInformation)}
+     * will call {@link org.apache.sirona.tracking.PathTracker#start(org.apache.sirona.pathtracking.PathTrackingInformation)}
      *
      * @param context
      */

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtDataStoreFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtDataStoreFactory.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtDataStoreFactory.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtDataStoreFactory.java Wed Jan 21 12:36:47 2015
@@ -18,7 +18,7 @@ package org.apache.sirona.pathtracking.t
 
 import org.apache.sirona.configuration.ioc.IoCs;
 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.PeriodicNodeStatusDataStore;
 

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtendedInMemoryPathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtendedInMemoryPathTrackingDataStore.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtendedInMemoryPathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/pathtracking/test/ExtendedInMemoryPathTrackingDataStore.java Wed Jan 21 12:36:47 2015
@@ -16,8 +16,8 @@
 */
 package org.apache.sirona.pathtracking.test;
 
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.apache.sirona.store.tracking.InMemoryPathTrackingDataStore;
-import org.apache.sirona.tracking.PathTrackingEntry;
 
 import java.util.Map;
 import java.util.Set;

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/MockPathTrackingInvocationListener.java Wed Jan 21 12:36:47 2015
@@ -16,9 +16,10 @@
  */
 package org.apache.test.sirona.javaagent;
 
-import org.apache.sirona.tracking.Context;
-import org.apache.sirona.tracking.PathTrackingInformation;
-import org.apache.sirona.tracking.PathTrackingInvocationListener;
+
+import org.apache.sirona.pathtracking.Context;
+import org.apache.sirona.pathtracking.PathTrackingInformation;
+import org.apache.sirona.pathtracking.PathTrackingInvocationListener;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationRecursiveTest.java Wed Jan 21 12:36:47 2015
@@ -19,9 +19,9 @@ package org.apache.test.sirona.javaagent
 import org.apache.sirona.configuration.ioc.IoCs;
 import org.apache.sirona.javaagent.AgentArgs;
 import org.apache.sirona.javaagent.JavaAgentRunner;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.apache.sirona.pathtracking.test.ExtendedInMemoryPathTrackingDataStore;
 import org.apache.sirona.store.DataStoreFactory;
-import org.apache.sirona.tracking.PathTrackingEntry;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingListenerTest.java Wed Jan 21 12:36:47 2015
@@ -19,11 +19,11 @@ package org.apache.test.sirona.javaagent
 import org.apache.sirona.configuration.ioc.IoCs;
 import org.apache.sirona.javaagent.AgentArgs;
 import org.apache.sirona.javaagent.JavaAgentRunner;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
+import org.apache.sirona.pathtracking.PathTrackingInvocationListener;
 import org.apache.sirona.pathtracking.test.ExtendedInMemoryPathTrackingDataStore;
 import org.apache.sirona.store.DataStoreFactory;
 import org.apache.sirona.tracking.PathTracker;
-import org.apache.sirona.tracking.PathTrackingEntry;
-import org.apache.sirona.tracking.PathTrackingInvocationListener;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java (original)
+++ incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java Wed Jan 21 12:36:47 2015
@@ -36,6 +36,7 @@ import org.apache.sirona.configuration.i
 import org.apache.sirona.counters.Counter;
 import org.apache.sirona.counters.Unit;
 import org.apache.sirona.math.M2AwareStatisticalSummary;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.apache.sirona.repositories.Repository;
 import org.apache.sirona.status.NodeStatus;
 import org.apache.sirona.status.Status;
@@ -46,7 +47,6 @@ import org.apache.sirona.store.gauge.Col
 import org.apache.sirona.store.status.CollectorNodeStatusDataStore;
 import org.apache.sirona.store.status.NodeStatusDataStore;
 import org.apache.sirona.store.tracking.CollectorPathTrackingDataStore;
-import org.apache.sirona.tracking.PathTrackingEntry;
 import org.apache.sirona.util.DaemonThreadFactory;
 import org.apache.sirona.util.SerializeUtils;
 

Modified: incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/plugin/pathtracking/PathTrackingEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/plugin/pathtracking/PathTrackingEndpoints.java?rev=1653511&r1=1653510&r2=1653511&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/plugin/pathtracking/PathTrackingEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/plugin/pathtracking/PathTrackingEndpoints.java Wed Jan 21 12:36:47 2015
@@ -17,13 +17,13 @@
 package org.apache.sirona.reporting.web.plugin.pathtracking;
 
 import org.apache.sirona.configuration.ioc.IoCs;
+import org.apache.sirona.pathtracking.PathCallInformation;
+import org.apache.sirona.pathtracking.PathTrackingEntry;
 import org.apache.sirona.reporting.web.plugin.api.MapBuilder;
 import org.apache.sirona.reporting.web.plugin.api.Regex;
 import org.apache.sirona.reporting.web.plugin.api.Template;
 import org.apache.sirona.reporting.web.plugin.report.format.HTMLFormat;
 import org.apache.sirona.store.tracking.PathTrackingDataStore;
-import org.apache.sirona.tracking.PathCallInformation;
-import org.apache.sirona.tracking.PathTrackingEntry;
 import org.apache.sirona.util.Environment;
 
 import java.util.Calendar;