Prosoft Git

killbill-uncached

Remove old analytics code

6/14/2013 10:33:33 PM
stephane brossier

stephane brossier

Commit: e3721a7

Tree: 405bef2

Parents: 440c5df

Changes

analytics/pom.xml 155(+0 -155)

analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java 303(+0 -303)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultAnalyticsService.java 65(+0 -65)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessAccount.java 179(+0 -179)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessField.java 113(+0 -113)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessInvoice.java 295(+0 -295)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessInvoicePayment.java 277(+0 -277)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessOverdueStatus.java 122(+0 -122)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessSnapshot.java 144(+0 -144)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessSubscriptionTransition.java 496(+0 -496)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultBusinessTag.java 101(+0 -101)

analytics/src/main/java/com/ning/billing/analytics/api/DefaultTimeSeriesData.java 88(+0 -88)

analytics/src/main/java/com/ning/billing/analytics/api/sanity/DefaultAnalyticsSanityApi.java 81(+0 -81)

analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java 394(+0 -394)

analytics/src/main/java/com/ning/billing/analytics/BusinessAccountDao.java 154(+0 -154)

analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java 221(+0 -221)

analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java 203(+0 -203)

analytics/src/main/java/com/ning/billing/analytics/BusinessOverdueStatusDao.java 120(+0 -120)

analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java 261(+0 -261)

analytics/src/main/java/com/ning/billing/analytics/BusinessTagDao.java 154(+0 -154)

analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java 52(+0 -52)

analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsSanityDao.java 43(+0 -43)

analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsSanitySqlDao.java 62(+0 -62)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java 78(+0 -78)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldMapper.java 38(+0 -38)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.java 54(+0 -54)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountMapper.java 52(+0 -52)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java 63(+0 -63)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagMapper.java 37(+0 -37)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.java 53(+0 -53)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceBinder.java 91(+0 -91)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java 34(+0 -34)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java 53(+0 -53)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemBinder.java 94(+0 -94)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemMapper.java 60(+0 -60)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java 64(+0 -64)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceMapper.java 55(+0 -55)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentBinder.java 97(+0 -97)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldMapper.java 34(+0 -34)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.java 53(+0 -53)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentMapper.java 69(+0 -69)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java 56(+0 -56)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagMapper.java 34(+0 -34)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.java 52(+0 -52)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.java 64(+0 -64)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java 34(+0 -34)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java 52(+0 -52)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusBinder.java 63(+0 -63)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusMapper.java 43(+0 -43)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.java 52(+0 -52)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSqlProvider.java 37(+0 -37)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java 138(+0 -138)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldMapper.java 39(+0 -39)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.java 55(+0 -55)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java 95(+0 -95)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java 64(+0 -64)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagMapper.java 38(+0 -38)

analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.java 54(+0 -54)

analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java 110(+0 -110)

analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsSanityDao.java 81(+0 -81)

analytics/src/main/java/com/ning/billing/analytics/dao/TimeSeriesTuple.java 76(+0 -76)

analytics/src/main/java/com/ning/billing/analytics/dao/TimeSeriesTupleMapper.java 32(+0 -32)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountFieldModelDao.java 87(+0 -87)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountModelDao.java 257(+0 -257)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTagModelDao.java 82(+0 -82)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessFieldModelDao.java 41(+0 -41)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceFieldModelDao.java 76(+0 -76)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceItemModelDao.java 257(+0 -257)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceModelDao.java 204(+0 -204)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentFieldModelDao.java 76(+0 -76)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java 272(+0 -272)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTagModelDao.java 71(+0 -71)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTagModelDao.java 71(+0 -71)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessOverdueStatusModelDao.java 127(+0 -127)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscription.java 384(+0 -384)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionEvent.java 174(+0 -174)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionFieldModelDao.java 99(+0 -99)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionModelDao.java 200(+0 -200)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTagModelDao.java 93(+0 -93)

analytics/src/main/java/com/ning/billing/analytics/model/BusinessTagModelDao.java 32(+0 -32)

analytics/src/main/java/com/ning/billing/analytics/PaymentMethodUtils.java 60(+0 -60)

analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java 151(+0 -151)

analytics/src/main/java/com/ning/billing/analytics/utils/Rounder.java 36(+0 -36)

analytics/src/main/resources/com/ning/billing/analytics/dao/AnalyticsSanitySqlDao.sql.stg 301(+0 -301)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg 42(+0 -42)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountSqlDao.sql.stg 123(+0 -123)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg 39(+0 -39)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.sql.stg 39(+0 -39)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg 141(+0 -141)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.sql.stg 39(+0 -39)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg 122(+0 -122)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.sql.stg 37(+0 -37)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.sql.stg 138(+0 -138)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.sql.stg 37(+0 -37)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg 50(+0 -50)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg 46(+0 -46)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg 229(+0 -229)

analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg 43(+0 -43)

analytics/src/main/resources/com/ning/billing/analytics/ddl.sql 259(+0 -259)

analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestSuiteNoDB.java 139(+0 -139)

analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestSuiteWithEmbeddedDB.java 162(+0 -162)

analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java 236(+0 -236)

analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java 94(+0 -94)

analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java 269(+0 -269)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountFieldSqlDao.java 90(+0 -90)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountTagSqlDao.java 88(+0 -88)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java 86(+0 -86)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java 117(+0 -117)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentFieldSqlDao.java 86(+0 -86)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java 118(+0 -118)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentTagSqlDao.java 84(+0 -84)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceSqlDao.java 107(+0 -107)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java 84(+0 -84)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessOverdueStatusSqlDao.java 75(+0 -75)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionFieldSqlDao.java 92(+0 -92)

analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionTagSqlDao.java 90(+0 -90)

analytics/src/test/java/com/ning/billing/analytics/glue/TestAnalyticsModule.java 68(+0 -68)

analytics/src/test/java/com/ning/billing/analytics/glue/TestAnalyticsModuleNoDB.java 74(+0 -74)

analytics/src/test/java/com/ning/billing/analytics/glue/TestAnalyticsModuleWithEmbeddedDB.java 39(+0 -39)

analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java 127(+0 -127)

analytics/src/test/java/com/ning/billing/analytics/MockDuration.java 50(+0 -50)

analytics/src/test/java/com/ning/billing/analytics/MockPhase.java 124(+0 -124)

analytics/src/test/java/com/ning/billing/analytics/MockProduct.java 74(+0 -74)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java 67(+0 -67)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountField.java 52(+0 -52)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountTag.java 44(+0 -44)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoice.java 70(+0 -70)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java 48(+0 -48)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java 80(+0 -80)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java 86(+0 -86)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentField.java 48(+0 -48)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentTag.java 43(+0 -43)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java 42(+0 -42)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessOverdueStatus.java 57(+0 -57)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscription.java 174(+0 -174)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionEvent.java 125(+0 -125)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java 162(+0 -162)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionField.java 56(+0 -56)

analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionTag.java 52(+0 -52)

analytics/src/test/java/com/ning/billing/analytics/TestBusinessInvoiceRecorder.java 64(+0 -64)

analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java 87(+0 -87)

analytics/src/test/java/com/ning/billing/analytics/TestBusinessTagRecorder.java 78(+0 -78)

analytics/src/test/java/com/ning/billing/analytics/TestPaymentMethodUtils.java 56(+0 -56)

analytics/src/test/java/com/ning/billing/analytics/utils/TestRounder.java 40(+0 -40)

api/src/main/java/com/ning/billing/analytics/api/AnalyticsService.java 25(+0 -25)

api/src/main/java/com/ning/billing/analytics/api/BusinessAccount.java 77(+0 -77)

api/src/main/java/com/ning/billing/analytics/api/BusinessField.java 38(+0 -38)

api/src/main/java/com/ning/billing/analytics/api/BusinessInvoice.java 86(+0 -86)

api/src/main/java/com/ning/billing/analytics/api/BusinessInvoicePayment.java 64(+0 -64)

api/src/main/java/com/ning/billing/analytics/api/BusinessOverdueStatus.java 38(+0 -38)

api/src/main/java/com/ning/billing/analytics/api/BusinessSnapshot.java 36(+0 -36)

api/src/main/java/com/ning/billing/analytics/api/BusinessSubscriptionTransition.java 93(+0 -93)

api/src/main/java/com/ning/billing/analytics/api/BusinessTag.java 33(+0 -33)

api/src/main/java/com/ning/billing/analytics/api/sanity/AnalyticsSanityApi.java 50(+0 -50)

api/src/main/java/com/ning/billing/analytics/api/TimeSeriesData.java 34(+0 -34)

api/src/main/java/com/ning/billing/analytics/api/user/AnalyticsUserApi.java 73(+0 -73)

api/src/main/java/com/ning/billing/osgi/api/OSGIKillbill.java 5(+0 -5)

beatrix/pom.xml 5(+0 -5)

beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixIntegrationModule.java 2(+0 -2)

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java 652(+0 -652)

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java 13(+0 -13)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessAccountJson.java 194(+0 -194)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessFieldJson.java 112(+0 -112)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoiceJson.java 466(+0 -466)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoicePaymentJson.java 312(+0 -312)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessOverdueStatusJson.java 140(+0 -140)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessSnapshotJson.java 200(+0 -200)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessSubscriptionTransitionJson.java 496(+0 -496)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessTagJson.java 99(+0 -99)

jaxrs/src/main/java/com/ning/billing/jaxrs/json/TimeSeriesDataJson.java 103(+0 -103)

jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AnalyticsResource.java 142(+0 -142)

osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java 18(+0 -18)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/DefaultTimeSeriesData.java 89(+0 -89)

osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyActivator.java 2(+0 -2)

osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java 23(+0 -23)

pom.xml 6(+0 -6)

server/pom.xml 4(+0 -4)

server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java 2(+0 -2)

server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java 6(+0 -6)

Details

api/src/main/java/com/ning/billing/osgi/api/OSGIKillbill.java 5(+0 -5) 

diff --git a/api/src/main/java/com/ning/billing/osgi/api/OSGIKillbill.java b/api/src/main/java/com/ning/billing/osgi/api/OSGIKillbill.java
index 1b5b9bf..43c0032 100644
--- a/api/src/main/java/com/ning/billing/osgi/api/OSGIKillbill.java
+++ b/api/src/main/java/com/ning/billing/osgi/api/OSGIKillbill.java
@@ -17,8 +17,6 @@
 package com.ning.billing.osgi.api;
 
 import com.ning.billing.account.api.AccountUserApi;
-import com.ning.billing.analytics.api.sanity.AnalyticsSanityApi;
-import com.ning.billing.analytics.api.user.AnalyticsUserApi;
 import com.ning.billing.catalog.api.CatalogUserApi;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi;
 import com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi;
@@ -51,9 +49,6 @@ public interface OSGIKillbill {
      */
     public AccountUserApi getAccountUserApi();
 
-    public AnalyticsSanityApi getAnalyticsSanityApi();
-
-    public AnalyticsUserApi getAnalyticsUserApi();
 
     public CatalogUserApi getCatalogUserApi();

beatrix/pom.xml 5(+0 -5) 

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 48e34bb..d825aba 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -164,11 +164,6 @@
         </dependency>
         <dependency>
             <groupId>com.ning.billing</groupId>
-            <artifactId>killbill-analytics</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.ning.billing</groupId>
             <artifactId>killbill-overdue</artifactId>
             <scope>test</scope>
         </dependency>

beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixIntegrationModule.java 2(+0 -2) 

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixIntegrationModule.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixIntegrationModule.java
index 915cdc2..c22d3d6 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixIntegrationModule.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixIntegrationModule.java
@@ -25,7 +25,6 @@ import org.skife.config.ConfigSource;
 import com.ning.billing.GuicyKillbillTestWithEmbeddedDBModule;
 import com.ning.billing.account.api.AccountService;
 import com.ning.billing.account.glue.DefaultAccountModule;
-import com.ning.billing.analytics.setup.AnalyticsModule;
 import com.ning.billing.beatrix.DefaultBeatrixService;
 import com.ning.billing.beatrix.bus.api.ExternalBus;
 import com.ning.billing.beatrix.extbus.BeatrixListener;
@@ -112,7 +111,6 @@ public class BeatrixIntegrationModule extends AbstractModule {
         install(new TagStoreModule());
         install(new CustomFieldModule());
         install(new DefaultAccountModule(configSource));
-        install(new AnalyticsModule(configSource));
         install(new CatalogModule(configSource));
         install(new DefaultEntitlementModule(configSource));
         install(new DefaultInvoiceModuleWithSwitchRepairLogic(configSource));

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java 13(+0 -13) 

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
index 424b686..2c4dfab 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
@@ -38,9 +38,6 @@ import com.ning.billing.account.api.Account;
 import com.ning.billing.account.api.AccountData;
 import com.ning.billing.account.api.AccountService;
 import com.ning.billing.account.api.AccountUserApi;
-import com.ning.billing.analytics.AnalyticsListener;
-import com.ning.billing.analytics.api.user.DefaultAnalyticsUserApi;
-import com.ning.billing.analytics.setup.AnalyticsModule;
 import com.ning.billing.api.TestApiListener;
 import com.ning.billing.api.TestApiListener.NextEvent;
 import com.ning.billing.api.TestListenerStatus;
@@ -172,15 +169,9 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
     protected AccountUserApi accountUserApi;
 
     @Inject
-    protected DefaultAnalyticsUserApi analyticsUserApi;
-
-    @Inject
     protected TagUserApi tagUserApi;
 
     @Inject
-    protected AnalyticsListener analyticsListener;
-
-    @Inject
     protected InvoiceChecker invoiceChecker;
 
     @Inject
@@ -236,10 +227,6 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
 
     @BeforeClass(groups = "slow")
     public void beforeClass() throws Exception {
-        configSource.setProperty(AnalyticsModule.ANALYTICS_DBI_CONFIG_STRING + "url", getDBTestingHelper().getJdbcConnectionString());
-        configSource.setProperty(AnalyticsModule.ANALYTICS_DBI_CONFIG_STRING + "user", DBTestingHelper.USERNAME);
-        configSource.setProperty(AnalyticsModule.ANALYTICS_DBI_CONFIG_STRING + "password", DBTestingHelper.PASSWORD);
-
         final Injector g = Guice.createInjector(Stage.PRODUCTION, new BeatrixIntegrationModule(configSource));
         g.injectMembers(this);
         busHandler = new TestApiListener(this);

osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java 18(+0 -18) 

diff --git a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java
index c24f217..016f238 100644
--- a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java
+++ b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIKillbill.java
@@ -19,8 +19,6 @@ package com.ning.billing.osgi;
 import javax.inject.Inject;
 
 import com.ning.billing.account.api.AccountUserApi;
-import com.ning.billing.analytics.api.sanity.AnalyticsSanityApi;
-import com.ning.billing.analytics.api.user.AnalyticsUserApi;
 import com.ning.billing.catalog.api.CatalogUserApi;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi;
 import com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi;
@@ -45,8 +43,6 @@ import com.ning.billing.util.api.TagUserApi;
 public class DefaultOSGIKillbill implements OSGIKillbill {
 
     private final AccountUserApi accountUserApi;
-    private final AnalyticsSanityApi analyticsSanityApi;
-    private final AnalyticsUserApi analyticsUserApi;
     private final CatalogUserApi catalogUserApi;
     private final EntitlementMigrationApi entitlementMigrationApi;
     private final EntitlementTimelineApi entitlementTimelineApi;
@@ -70,8 +66,6 @@ public class DefaultOSGIKillbill implements OSGIKillbill {
 
     @Inject
     public DefaultOSGIKillbill(final AccountUserApi accountUserApi,
-                               final AnalyticsSanityApi analyticsSanityApi,
-                               final AnalyticsUserApi analyticsUserApi,
                                final CatalogUserApi catalogUserApi,
                                final EntitlementMigrationApi entitlementMigrationApi,
                                final EntitlementTimelineApi entitlementTimelineApi,
@@ -92,8 +86,6 @@ public class DefaultOSGIKillbill implements OSGIKillbill {
                                final RecordIdApi recordIdApi,
                                final PluginConfigServiceApi configServiceApi) {
         this.accountUserApi = accountUserApi;
-        this.analyticsSanityApi = analyticsSanityApi;
-        this.analyticsUserApi = analyticsUserApi;
         this.catalogUserApi = catalogUserApi;
         this.entitlementMigrationApi = entitlementMigrationApi;
         this.entitlementTimelineApi = entitlementTimelineApi;
@@ -121,16 +113,6 @@ public class DefaultOSGIKillbill implements OSGIKillbill {
     }
 
     @Override
-    public AnalyticsSanityApi getAnalyticsSanityApi() {
-        return analyticsSanityApi;
-    }
-
-    @Override
-    public AnalyticsUserApi getAnalyticsUserApi() {
-        return analyticsUserApi;
-    }
-
-    @Override
     public CatalogUserApi getCatalogUserApi() {
         return catalogUserApi;
     }

osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyActivator.java 2(+0 -2) 

diff --git a/osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyActivator.java b/osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyActivator.java
index 5d7dc0d..8746b18 100644
--- a/osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyActivator.java
+++ b/osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyActivator.java
@@ -171,8 +171,6 @@ public class JRubyActivator extends KillbillActivatorBase {
 
         // See killbill/plugin.rb for the naming convention magic
         killbillUserApis.put("account_user_api", killbillAPI.getAccountUserApi());
-        killbillUserApis.put("analytics_sanity_api", killbillAPI.getAnalyticsSanityApi());
-        killbillUserApis.put("analytics_user_api", killbillAPI.getAnalyticsUserApi());
         killbillUserApis.put("catalog_user_api", killbillAPI.getCatalogUserApi());
         killbillUserApis.put("entitlement_migration_api", killbillAPI.getEntitlementMigrationApi());
         killbillUserApis.put("entitlement_timeline_api", killbillAPI.getEntitlementTimelineApi());

osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java 23(+0 -23) 

diff --git a/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java b/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
index 5cc50a7..1f26b05 100644
--- a/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
+++ b/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
@@ -20,8 +20,6 @@ import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
 
 import com.ning.billing.account.api.AccountUserApi;
-import com.ning.billing.analytics.api.sanity.AnalyticsSanityApi;
-import com.ning.billing.analytics.api.user.AnalyticsUserApi;
 import com.ning.billing.catalog.api.CatalogUserApi;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi;
 import com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi;
@@ -72,27 +70,6 @@ public class OSGIKillbillAPI extends OSGIKillbillLibraryBase implements OSGIKill
     }
 
     @Override
-    public AnalyticsSanityApi getAnalyticsSanityApi() {
-        return withServiceTracker(killbillTracker, new APICallback<AnalyticsSanityApi, OSGIKillbill>(KILLBILL_SERVICE_NAME) {
-            @Override
-            public AnalyticsSanityApi executeWithService(final OSGIKillbill service) {
-                return service.getAnalyticsSanityApi();
-            }
-        });
-    }
-
-    @Override
-    public AnalyticsUserApi getAnalyticsUserApi() {
-        return withServiceTracker(killbillTracker, new APICallback<AnalyticsUserApi, OSGIKillbill>(KILLBILL_SERVICE_NAME) {
-            @Override
-            public AnalyticsUserApi executeWithService(final OSGIKillbill service) {
-                return service.getAnalyticsUserApi();
-            }
-        });
-
-    }
-
-    @Override
     public CatalogUserApi getCatalogUserApi() {
         return withServiceTracker(killbillTracker, new APICallback<CatalogUserApi, OSGIKillbill>(KILLBILL_SERVICE_NAME) {
             @Override

pom.xml 6(+0 -6) 

diff --git a/pom.xml b/pom.xml
index f4e0e3e..412aa6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
     </properties>
     <modules>
         <module>account</module>
-        <module>analytics</module>
         <module>api</module>
         <module>beatrix</module>
         <module>catalog</module>
@@ -123,11 +122,6 @@
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>
-                <artifactId>killbill-analytics</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.ning.billing</groupId>
                 <artifactId>killbill-jaxrs</artifactId>
                 <version>${project.version}</version>
             </dependency>

server/pom.xml 4(+0 -4) 

diff --git a/server/pom.xml b/server/pom.xml
index f165283..c9eaa25 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -195,10 +195,6 @@
         </dependency>
         <dependency>
             <groupId>com.ning.billing</groupId>
-            <artifactId>killbill-analytics</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.ning.billing</groupId>
             <artifactId>killbill-junction</artifactId>
         </dependency>
         <dependency>

server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java 2(+0 -2) 

diff --git a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
index c567342..4df07bb 100644
--- a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
+++ b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
@@ -22,7 +22,6 @@ import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.IDBI;
 
 import com.ning.billing.account.glue.DefaultAccountModule;
-import com.ning.billing.analytics.setup.AnalyticsModule;
 import com.ning.billing.beatrix.glue.BeatrixModule;
 import com.ning.billing.catalog.glue.CatalogModule;
 import com.ning.billing.entitlement.glue.DefaultEntitlementModule;
@@ -131,7 +130,6 @@ public class KillbillServerModule extends AbstractModule {
         install(new DefaultInvoiceModule(configSource));
         install(new TemplateModule());
         install(new DefaultEntitlementModule(configSource));
-        install(new AnalyticsModule(configSource));
         install(new PaymentModule(configSource));
         install(new BeatrixModule());
         install(new DefaultJunctionModule(configSource));

server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java 6(+0 -6) 

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
index 900b676..5ec6ec7 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
@@ -38,7 +38,6 @@ import org.testng.annotations.BeforeSuite;
 import com.ning.billing.GuicyKillbillTestWithEmbeddedDBModule;
 import com.ning.billing.KillbillConfigSource;
 import com.ning.billing.account.glue.DefaultAccountModule;
-import com.ning.billing.analytics.setup.AnalyticsModule;
 import com.ning.billing.api.TestApiListener;
 import com.ning.billing.beatrix.glue.BeatrixModule;
 import com.ning.billing.catalog.glue.CatalogModule;
@@ -184,10 +183,6 @@ public class TestJaxrsBase extends KillbillClient {
             Modules.override(new com.ning.billing.payment.setup.PaymentModule()).with(new PaymentMockModule());
             */
 
-            configSource.setProperty(AnalyticsModule.ANALYTICS_DBI_CONFIG_STRING + "url", helper.getJdbcConnectionString());
-            configSource.setProperty(AnalyticsModule.ANALYTICS_DBI_CONFIG_STRING + "user", DBTestingHelper.USERNAME);
-            configSource.setProperty(AnalyticsModule.ANALYTICS_DBI_CONFIG_STRING + "password", DBTestingHelper.PASSWORD);
-
             install(new GuicyKillbillTestWithEmbeddedDBModule());
 
 
@@ -206,7 +201,6 @@ public class TestJaxrsBase extends KillbillClient {
             install(new InvoiceModuleWithMockSender(configSource));
             install(new TemplateModule());
             install(new DefaultEntitlementModule(configSource));
-            install(new AnalyticsModule(configSource));
             install(new PaymentMockModule(configSource));
             install(new BeatrixModule());
             install(new DefaultJunctionModule(configSource));

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github