sirona-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1541130 - in /incubator/sirona/trunk: core/src/main/java/org/apache/sirona/math/ core/src/main/java/org/apache/sirona/store/ core/src/main/java/org/apache/sirona/store/counter/ core/src/main/java/org/apache/sirona/store/gauge/ core/src/mai...
Date Tue, 12 Nov 2013 16:27:50 GMT
Author: rmannibucau
Date: Tue Nov 12 16:27:50 2013
New Revision: 1541130

URL: http://svn.apache.org/r1541130
Log:
moving in memory collector*store impl in core to get better dependencies between modules -
there was no real reason to put them in collector

Added:
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/math/Aggregators.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CollectorDataStoreFactory.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/AggregatedCollectorCounter.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/InMemoryCollectorCounterStore.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/LeafCollectorCounter.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/DelegatedCollectorGaugeDataStore.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/status/InMemoryCollectorNodeStatusDataStore.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/status/InMemoryCollectorNodeStatusDataStore.java
    incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/AggregatorTest.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java
    incubator/sirona/trunk/core/src/test/java/org/apache/sirona/gauges/
    incubator/sirona/trunk/core/src/test/java/org/apache/sirona/gauges/CollectorGaugeTest.java
      - copied, changed from r1540962, incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java
Removed:
    incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/math/
    incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/
    incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/
Modified:
    incubator/sirona/trunk/server/collector/src/main/resources/collector-sirona.properties
    incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java
    incubator/sirona/trunk/server/collector/src/test/resources/sirona.properties
    incubator/sirona/trunk/server/store/cassandra/pom.xml
    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/counter/CassandraLeafCounter.java
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java
    incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/collector/counter/AgentCounterTest.java
    incubator/sirona/trunk/src/site/markdown/collector.md

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/math/Aggregators.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/math/Aggregators.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/math/Aggregators.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/math/Aggregators.java Tue
Nov 12 16:27:50 2013
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.math;
+package org.apache.sirona.math;
 
-import org.apache.sirona.collector.server.store.counter.LeafCollectorCounter;
+import org.apache.sirona.store.counter.LeafCollectorCounter;
 import org.apache.sirona.math.M2AwareStatisticalSummary;
 
 import java.util.Collection;

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CollectorDataStoreFactory.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CollectorDataStoreFactory.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CollectorDataStoreFactory.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CollectorDataStoreFactory.java
Tue Nov 12 16:27:50 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store;
+package org.apache.sirona.store;
 
-import org.apache.sirona.collector.server.store.counter.InMemoryCollectorCounterStore;
-import org.apache.sirona.collector.server.store.gauge.DelegatedCollectorGaugeDataStore;
-import org.apache.sirona.collector.server.store.status.InMemoryCollectorNodeStatusDataStore;
+import org.apache.sirona.store.counter.InMemoryCollectorCounterStore;
+import org.apache.sirona.store.gauge.DelegatedCollectorGaugeDataStore;
+import org.apache.sirona.store.status.InMemoryCollectorNodeStatusDataStore;
 import org.apache.sirona.store.DelegateDataStoreFactory;
 
 public class CollectorDataStoreFactory extends DelegateDataStoreFactory {

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/AggregatedCollectorCounter.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/AggregatedCollectorCounter.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/AggregatedCollectorCounter.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/AggregatedCollectorCounter.java
Tue Nov 12 16:27:50 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.counter;
+package org.apache.sirona.store.counter;
 
-import org.apache.sirona.collector.server.math.Aggregators;
 import org.apache.sirona.counters.AggregatedCounter;
 import org.apache.sirona.counters.Counter;
+import org.apache.sirona.math.Aggregators;
 
 import java.util.Collection;
 import java.util.Map;

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/CollectorCounter.java
Tue Nov 12 16:27:50 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.counter;
+package org.apache.sirona.store.counter;
 
 import org.apache.sirona.math.M2AwareStatisticalSummary;
 import org.apache.sirona.counters.Counter;

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/InMemoryCollectorCounterStore.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/InMemoryCollectorCounterStore.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/InMemoryCollectorCounterStore.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/InMemoryCollectorCounterStore.java
Tue Nov 12 16:27:50 2013
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.counter;
+package org.apache.sirona.store.counter;
 
 import org.apache.sirona.counters.Counter;
 import org.apache.sirona.math.M2AwareStatisticalSummary;
-import org.apache.sirona.store.counter.CollectorCounterStore;
-import org.apache.sirona.store.counter.InMemoryCounterDataStore;
 
 import java.util.Collection;
 import java.util.Map;

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/LeafCollectorCounter.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/LeafCollectorCounter.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/LeafCollectorCounter.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/counter/LeafCollectorCounter.java
Tue Nov 12 16:27:50 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.counter;
+package org.apache.sirona.store.counter;
 
 import org.apache.sirona.math.M2AwareStatisticalSummary;
 import org.apache.sirona.counters.Counter;

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/DelegatedCollectorGaugeDataStore.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/DelegatedCollectorGaugeDataStore.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/DelegatedCollectorGaugeDataStore.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java
Tue Nov 12 16:27:50 2013
@@ -14,15 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.gauge;
+package org.apache.sirona.store.gauge;
 
 import org.apache.sirona.MonitoringException;
 import org.apache.sirona.Role;
 import org.apache.sirona.configuration.Configuration;
-import org.apache.sirona.store.gauge.CollectorGaugeDataStore;
-import org.apache.sirona.store.gauge.GaugeDataStore;
-import org.apache.sirona.store.gauge.GaugeValuesRequest;
-import org.apache.sirona.store.gauge.InMemoryGaugeDataStore;
 
 import java.lang.reflect.Constructor;
 import java.util.Collection;

Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/status/InMemoryCollectorNodeStatusDataStore.java
(from r1540962, incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/status/InMemoryCollectorNodeStatusDataStore.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/status/InMemoryCollectorNodeStatusDataStore.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/status/InMemoryCollectorNodeStatusDataStore.java&p1=incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/status/InMemoryCollectorNodeStatusDataStore.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/store/status/InMemoryCollectorNodeStatusDataStore.java
(original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/status/InMemoryCollectorNodeStatusDataStore.java
Tue Nov 12 16:27:50 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.status;
+package org.apache.sirona.store.status;
 
 import org.apache.sirona.status.NodeStatus;
 import org.apache.sirona.store.status.CollectorNodeStatusDataStore;

Copied: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/AggregatorTest.java
(from r1540962, incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/AggregatorTest.java?p2=incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/AggregatorTest.java&p1=incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java
(original)
+++ incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/AggregatorTest.java
Tue Nov 12 16:27:50 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.counter;
+package org.apache.sirona.counters;
 
 import org.apache.sirona.Role;
 import org.apache.sirona.store.counter.CollectorCounterStore;
@@ -22,6 +22,7 @@ import org.apache.sirona.math.M2AwareSta
 import org.apache.sirona.counters.Counter;
 import org.apache.sirona.counters.Unit;
 import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.store.counter.InMemoryCollectorCounterStore;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Copied: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/gauges/CollectorGaugeTest.java
(from r1540962, incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/test/java/org/apache/sirona/gauges/CollectorGaugeTest.java?p2=incubator/sirona/trunk/core/src/test/java/org/apache/sirona/gauges/CollectorGaugeTest.java&p1=incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java&r1=1540962&r2=1541130&rev=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java
(original)
+++ incubator/sirona/trunk/core/src/test/java/org/apache/sirona/gauges/CollectorGaugeTest.java
Tue Nov 12 16:27:50 2013
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sirona.collector.server.store.gauge;
+package org.apache.sirona.gauges;
 
 import org.apache.sirona.Role;
 import org.apache.sirona.counters.Unit;
 import org.apache.sirona.store.gauge.CollectorGaugeDataStore;
 import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.store.gauge.DelegatedCollectorGaugeDataStore;
 import org.apache.sirona.store.gauge.GaugeValuesRequest;
 import org.junit.After;
 import org.junit.Before;

Modified: incubator/sirona/trunk/server/collector/src/main/resources/collector-sirona.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/main/resources/collector-sirona.properties?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/resources/collector-sirona.properties
(original)
+++ incubator/sirona/trunk/server/collector/src/main/resources/collector-sirona.properties
Tue Nov 12 16:27:50 2013
@@ -16,5 +16,5 @@
 # under the License.
 
 # collector data store to aggregate data
-org.apache.sirona.store.DataStoreFactory = org.apache.sirona.collector.server.store.CollectorDataStoreFactory
+org.apache.sirona.store.DataStoreFactory = org.apache.sirona.store.CollectorDataStoreFactory
 org.apache.sirona.core.gauge.activated = false
\ No newline at end of file

Modified: incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java
(original)
+++ incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java
Tue Nov 12 16:27:50 2013
@@ -38,7 +38,7 @@ import io.netty.handler.codec.http.HttpV
 import io.netty.handler.stream.ChunkedWriteHandler;
 import org.apache.sirona.MonitoringException;
 import org.apache.sirona.Role;
-import org.apache.sirona.collector.server.store.gauge.DelegatedCollectorGaugeDataStore;
+import org.apache.sirona.store.gauge.DelegatedCollectorGaugeDataStore;
 import org.apache.sirona.configuration.Configuration;
 import org.apache.sirona.counters.Counter;
 import org.apache.sirona.repositories.Repository;

Modified: incubator/sirona/trunk/server/collector/src/test/resources/sirona.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/test/resources/sirona.properties?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/test/resources/sirona.properties (original)
+++ incubator/sirona/trunk/server/collector/src/test/resources/sirona.properties Tue Nov 12
16:27:50 2013
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-org.apache.sirona.store.DataStoreFactory = org.apache.sirona.collector.server.store.CollectorDataStoreFactory
+org.apache.sirona.store.DataStoreFactory = org.apache.sirona.store.CollectorDataStoreFactory
 
 org.apache.sirona.cube.CubeBuilder.collector = http://localhost:1234
 org.apache.sirona.cube.CubeBuilder.marker = local

Modified: incubator/sirona/trunk/server/store/cassandra/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/pom.xml?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/pom.xml (original)
+++ incubator/sirona/trunk/server/store/cassandra/pom.xml Tue Nov 12 16:27:50 2013
@@ -32,9 +32,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-collector</artifactId>
-      <classifier>classes</classifier>
-      <scope>provided</scope>
+      <artifactId>sirona-core</artifactId>
     </dependency>
 
     <dependency>

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=1541130&r1=1541129&r2=1541130&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
Tue Nov 12 16:27:50 2013
@@ -31,13 +31,13 @@ import me.prettyprint.hector.api.query.Q
 import org.apache.sirona.Role;
 import org.apache.sirona.cassandra.DynamicDelegatedSerializer;
 import org.apache.sirona.cassandra.collector.CassandraSirona;
-import org.apache.sirona.collector.server.store.counter.AggregatedCollectorCounter;
-import org.apache.sirona.collector.server.store.counter.InMemoryCollectorCounterStore;
-import org.apache.sirona.collector.server.store.counter.LeafCollectorCounter;
 import org.apache.sirona.configuration.Configuration;
 import org.apache.sirona.counters.Counter;
 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 java.util.ArrayList;
 import java.util.Collection;

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraLeafCounter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraLeafCounter.java?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraLeafCounter.java
(original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraLeafCounter.java
Tue Nov 12 16:27:50 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.sirona.cassandra.collector.counter;
 
-import org.apache.sirona.collector.server.store.counter.LeafCollectorCounter;
+import org.apache.sirona.store.counter.LeafCollectorCounter;
 import org.apache.sirona.math.M2AwareStatisticalSummary;
 
 public class CassandraLeafCounter extends LeafCollectorCounter {

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java
(original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java
Tue Nov 12 16:27:50 2013
@@ -43,12 +43,11 @@ import java.util.Map;
 import static org.apache.sirona.cassandra.collector.CassandraSirona.column;
 
 public class CassandraCollectorNodeStatusDataStore implements CollectorNodeStatusDataStore
{
-    private final CassandraSirona cassandra;
     private final Keyspace keyspace;
     private final String family;
 
     public CassandraCollectorNodeStatusDataStore() {
-        this.cassandra = Configuration.findOrCreateInstance(CassandraSirona.class);
+        final CassandraSirona cassandra = Configuration.findOrCreateInstance(CassandraSirona.class);
         this.keyspace = cassandra.getKeyspace();
         this.family = cassandra.getStatusColumnFamily();
     }

Modified: incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/collector/counter/AgentCounterTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/collector/counter/AgentCounterTest.java?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/collector/counter/AgentCounterTest.java
(original)
+++ incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/collector/counter/AgentCounterTest.java
Tue Nov 12 16:27:50 2013
@@ -21,8 +21,8 @@ import me.prettyprint.hector.api.Keyspac
 import org.apache.sirona.Role;
 import org.apache.sirona.cassandra.framework.CassandraRunner;
 import org.apache.sirona.cassandra.framework.CassandraTestInject;
-import org.apache.sirona.collector.server.store.counter.AggregatedCollectorCounter;
-import org.apache.sirona.collector.server.store.counter.LeafCollectorCounter;
+import org.apache.sirona.store.counter.AggregatedCollectorCounter;
+import org.apache.sirona.store.counter.LeafCollectorCounter;
 import org.apache.sirona.counters.Counter;
 import org.apache.sirona.counters.Unit;
 import org.apache.sirona.math.M2AwareStatisticalSummary;

Modified: incubator/sirona/trunk/src/site/markdown/collector.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/collector.md?rev=1541130&r1=1541129&r2=1541130&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/collector.md (original)
+++ incubator/sirona/trunk/src/site/markdown/collector.md Tue Nov 12 16:27:50 2013
@@ -32,12 +32,12 @@ Take a servlet container and deploy `sir
 
 ## Configuration
 
-Just use the collector `DataStoreFactory`: `org.apache.sirona.collector.server.store.CollectorDataStoreFactory`.
+Just use the collector `DataStoreFactory`: `org.apache.sirona.store.CollectorDataStoreFactory`.
 
 For instance your `commons-monitoring.properties` can look like:
 
 <pre class="prettyprint linenums"><![CDATA[
-org.apache.sirona.store.DataStoreFactory = org.apache.sirona.collector.server.store.CollectorDataStoreFactory
+org.apache.sirona.store.DataStoreFactory = org.apache.sirona.store.CollectorDataStoreFactory
 ]]></pre>
 
 The `GaugeDataStore` can be configured through `org.apache.sirona.collector.gauge.store-class`
property.



Mime
View raw message