killbill-uncached

osgi-bundles: extract analytics and meter modules See: * …

7/2/2013 2:59:58 PM

https://github.com/killbill/killbill-analytics-plugin
* https://github.com/killbill/killbill-meter-plugin

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: e791b04

Tree: 975c490

Parents: 38d54ea

Changes

beatrix/pom.xml 6(+3 -3)

osgi-bundles/bundles/analytics/pom.xml 211(+0 -211)

osgi-bundles/bundles/analytics/README.md 51(+0 -51)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/AnalyticsActivator.java 84(+0 -84)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/AnalyticsListener.java 312(+0 -312)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/AnalyticsRefreshException.java 31(+0 -31)

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

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

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

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

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

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

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

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

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

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

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

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/BusinessExecutor.java 52(+0 -52)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AllBusinessObjectsDao.java 75(+0 -75)

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

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessAccountDao.java 70(+0 -70)

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

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.java 166(+0 -166)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessBundleSummaryDao.java 49(+0 -49)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessDBIProvider.java 108(+0 -108)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessFieldDao.java 80(+0 -80)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceAndInvoicePaymentDao.java 147(+0 -147)

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

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

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

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java 114(+0 -114)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessTagDao.java 80(+0 -80)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessAccountFactory.java 130(+0 -130)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessBundleSummaryFactory.java 148(+0 -148)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessFactoryBase.java 603(+0 -603)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessFieldFactory.java 67(+0 -67)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessInvoiceFactory.java 327(+0 -327)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessInvoicePaymentFactory.java 103(+0 -103)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessOverdueStatusFactory.java 122(+0 -122)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java 183(+0 -183)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessTagFactory.java 70(+0 -70)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessAccountFieldModelDao.java 49(+0 -49)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessAccountModelDao.java 417(+0 -417)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessAccountTagModelDao.java 52(+0 -52)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessBundleFieldModelDao.java 95(+0 -95)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessBundleSummaryModelDao.java 339(+0 -339)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessBundleTagModelDao.java 98(+0 -98)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessFieldModelDao.java 198(+0 -198)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java 70(+0 -70)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceFieldModelDao.java 98(+0 -98)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java 70(+0 -70)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java 599(+0 -599)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java 70(+0 -70)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemModelDao.java 70(+0 -70)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceModelDao.java 271(+0 -271)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoicePaymentBaseModelDao.java 736(+0 -736)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoicePaymentChargebackModelDao.java 61(+0 -61)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java 95(+0 -95)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoicePaymentModelDao.java 61(+0 -61)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoicePaymentRefundModelDao.java 61(+0 -61)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java 98(+0 -98)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceTagModelDao.java 98(+0 -98)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessModelDaoBase.java 200(+0 -200)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessOverdueStatusModelDao.java 193(+0 -193)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscription.java 310(+0 -310)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscriptionEvent.java 186(+0 -186)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java 527(+0 -527)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessTagModelDao.java 192(+0 -192)

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

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/http/AnalyticsServlet.java 376(+0 -376)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/http/ObjectMapperProvider.java 37(+0 -37)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/json/NamedXYTimeSeries.java 42(+0 -42)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/json/XY.java 67(+0 -67)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/analysis/AverageSmoother.java 34(+0 -34)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/analysis/DateGranularity.java 22(+0 -22)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/analysis/Smoother.java 134(+0 -134)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/analysis/SummingSmoother.java 34(+0 -34)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/ReportConfigurationSection.java 36(+0 -36)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/ReportsConfiguration.java 94(+0 -94)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/ReportSpecification.java 84(+0 -84)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/ReportsUserApi.java 300(+0 -300)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/reports/scheduler/JobsScheduler.java 129(+0 -129)

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/utils/BusinessInvoiceUtils.java 84(+0 -84)

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

osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg 1362(+0 -1362)

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

osgi-bundles/bundles/analytics/src/main/resources/reports/analytics.ini 93(+0 -93)

osgi-bundles/bundles/analytics/src/main/resources/reports/cancellations_per_day.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/chargebacks_per_day.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/conversions_per_day.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/invoice_adjustments_per_day.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/invoice_item_adjustments_per_day.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/invoice_item_credits_per_day.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/invoices_per_day.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/new_accounts_per_day.sql 9(+0 -9)

osgi-bundles/bundles/analytics/src/main/resources/reports/new_trials_last_24_hours.sql 14(+0 -14)

osgi-bundles/bundles/analytics/src/main/resources/reports/new_trials_per_day.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/payments_per_day.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/refunds_per_day.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/system_report_notifications_per_queue_name.sql 10(+0 -10)

osgi-bundles/bundles/analytics/src/main/resources/reports/system_report_payment_payment_failure.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/system_report_payment_payment_failure_aborted.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/system_report_payment_plugin_failure.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/system_report_payment_plugin_failure_aborted.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/system_report_payment_success.sql 11(+0 -11)

osgi-bundles/bundles/analytics/src/main/resources/reports/v_revenue_recognition.sql 25(+0 -25)

osgi-bundles/bundles/analytics/src/main/resources/sanity/sanity.sql 996(+0 -996)

osgi-bundles/bundles/analytics/src/main/resources/static/analytics.html 150(+0 -150)

osgi-bundles/bundles/analytics/src/main/resources/static/dashboard.html 124(+0 -124)

osgi-bundles/bundles/analytics/src/main/resources/static/javascript/d3.js 5(+0 -5)

osgi-bundles/bundles/analytics/src/main/resources/static/javascript/jquery-1.9.0.min.js 4(+0 -4)

osgi-bundles/bundles/analytics/src/main/resources/static/javascript/killbill.js 509(+0 -509)

osgi-bundles/bundles/analytics/src/main/resources/static/javascript/purl.js 271(+0 -271)

osgi-bundles/bundles/analytics/src/main/resources/static/styles/dashboard.css 66(+0 -66)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java 428(+0 -428)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteWithEmbeddedDB.java 103(+0 -103)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessAccount.java 68(+0 -68)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessField.java 93(+0 -93)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java 99(+0 -99)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java 73(+0 -73)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoicePayment.java 62(+0 -62)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessOverdueStatus.java 50(+0 -50)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSnapshot.java 180(+0 -180)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSubscriptionTransition.java 92(+0 -92)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessTag.java 96(+0 -96)

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

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/factory/TestBusinessBundleSummaryFactory.java 146(+0 -146)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/factory/TestBusinessInvoiceFactory.java 200(+0 -200)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountFieldModelDao.java 41(+0 -41)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountModelDao.java 87(+0 -87)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountTagModelDao.java 41(+0 -41)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessBundleSummaryModelDao.java 81(+0 -81)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceFieldModelDao.java 42(+0 -42)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java 101(+0 -101)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceModelDao.java 51(+0 -51)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentFieldModelDao.java 42(+0 -42)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentModelDao.java 119(+0 -119)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentTagModelDao.java 42(+0 -42)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceTagModelDao.java 42(+0 -42)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessOverdueStatusModelDao.java 49(+0 -49)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscription.java 160(+0 -160)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java 47(+0 -47)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionTransitionModelDao.java 88(+0 -88)

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

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/TestBusinessAnalyticsSqlDao.java 471(+0 -471)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/TestCallContext.java 82(+0 -82)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/http/TestAnalyticsServlet.java 110(+0 -110)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/TestAnalyticsListener.java 48(+0 -48)

osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/TestBusinessExecutor.java 85(+0 -85)

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

osgi-bundles/bundles/logger/pom.xml 2(+1 -1)

osgi-bundles/bundles/meter/pom.xml 214(+0 -214)

osgi-bundles/bundles/meter/README.md 5(+0 -5)

osgi-bundles/bundles/meter/scripts/load.rb 510(+0 -510)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/DecimationMode.java 22(+0 -22)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/TimeAggregationMode.java 26(+0 -26)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/user/AccumulatingJsonSamplesOutputer.java 79(+0 -79)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/user/DebugJsonSamplesOutputer.java 71(+0 -71)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/user/DecimatingJsonSamplesOutputer.java 109(+0 -109)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/user/DefaultJsonSamplesOutputer.java 55(+0 -55)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/user/DefaultMeterUserApi.java 136(+0 -136)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/user/JsonSamplesOutputer.java 181(+0 -181)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/api/user/MeterUserApi.java 149(+0 -149)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/DefaultMeterService.java 81(+0 -81)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/glue/CachingDefaultTimelineDaoProvider.java 47(+0 -47)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/glue/MeterModule.java 104(+0 -104)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/jaxrs/resources/MeterResource.java 230(+0 -230)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/MeterService.java 22(+0 -22)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/osgi/MeterActivator.java 47(+0 -47)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/aggregator/TimelineAggregator.java 438(+0 -438)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/aggregator/TimelineAggregatorSqlDao.java 44(+0 -44)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/BackgroundDBChunkWriter.java 229(+0 -229)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/categories/CategoryAndMetrics.java 108(+0 -108)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/categories/CategoryAndMetricsForSources.java 97(+0 -97)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/categories/CategoryIdAndMetricBinder.java 48(+0 -48)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/categories/CategoryIdAndMetricMapper.java 33(+0 -33)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/categories/CategoryRecordIdAndMetric.java 68(+0 -68)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/chunks/TimeBytesAndSampleBytes.java 92(+0 -92)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/chunks/TimelineChunk.java 209(+0 -209)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/chunks/TimelineChunkBinder.java 81(+0 -81)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/chunks/TimelineChunkMapper.java 61(+0 -61)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/chunks/TimelineChunksViews.java 32(+0 -32)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/codec/DefaultSampleCoder.java 527(+0 -527)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/codec/EncodedBytesAndSampleCount.java 79(+0 -79)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/codec/SampleAccumulator.java 155(+0 -155)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/codec/SampleCoder.java 76(+0 -76)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/codec/TimelineChunkAccumulator.java 81(+0 -81)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/codec/TimesAndSamplesCoder.java 79(+0 -79)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/AccumulatorSampleConsumer.java 123(+0 -123)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/CSVConsumer.java 45(+0 -45)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/CSVSampleProcessor.java 57(+0 -57)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/filter/DecimatingSampleFilter.java 248(+0 -248)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/SampleProcessor.java 38(+0 -38)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/TimelineChunkConsumer.java 24(+0 -24)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/TimelineChunkDecoded.java 109(+0 -109)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/consumer/TimeRangeSampleProcessor.java 68(+0 -68)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/metrics/MetricAndId.java 74(+0 -74)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/metrics/MetricAndIdMapper.java 31(+0 -31)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/metrics/SamplesForMetricAndSource.java 108(+0 -108)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/PendingChunkMap.java 50(+0 -50)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/persistent/CachingTimelineDao.java 243(+0 -243)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/persistent/DefaultTimelineDao.java 305(+0 -305)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/persistent/FileBackedBuffer.java 142(+0 -142)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/persistent/Replayer.java 166(+0 -166)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/persistent/StreamyBytesPersistentOutputStream.java 178(+0 -178)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/persistent/TimelineDao.java 88(+0 -88)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/persistent/TimelineSqlDao.java 128(+0 -128)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/samples/HalfFloat.java 105(+0 -105)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/samples/NullSample.java 24(+0 -24)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/samples/RepeatSample.java 97(+0 -97)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/samples/SampleBase.java 30(+0 -30)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/samples/SampleOpcode.java 124(+0 -124)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/samples/ScalarSample.java 180(+0 -180)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/shutdown/ShutdownSaveMode.java 31(+0 -31)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/shutdown/StartTimes.java 88(+0 -88)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/shutdown/StartTimesBinder.java 62(+0 -62)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/shutdown/StartTimesMapper.java 47(+0 -47)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/sources/SourceAndId.java 77(+0 -77)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/sources/SourceIdAndMetricIdMapper.java 31(+0 -31)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/sources/SourceMapper.java 31(+0 -31)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/sources/SourceRecordIdAndMetricRecordId.java 74(+0 -74)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/sources/SourceSamplesForTimestamp.java 131(+0 -131)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/TimelineEventHandler.java 564(+0 -564)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/TimelineSourceEventAccumulator.java 340(+0 -340)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/times/DefaultTimelineCoder.java 350(+0 -350)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/times/DefaultTimelineCursor.java 148(+0 -148)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/times/TimelineCoder.java 60(+0 -60)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/times/TimelineCursor.java 36(+0 -36)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/times/TimelineOpcode.java 48(+0 -48)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/util/DateTimeUtils.java 32(+0 -32)

osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/timeline/util/Hex.java 129(+0 -129)

osgi-bundles/bundles/meter/src/main/resources/com/ning/billing/meter/ddl.sql 75(+0 -75)

osgi-bundles/bundles/meter/src/main/resources/com/ning/billing/meter/timeline/aggregator/TimelineAggregatorSqlDao.sql.stg 63(+0 -63)

osgi-bundles/bundles/meter/src/main/resources/com/ning/billing/meter/timeline/persistent/TimelineSqlDao.sql.stg 253(+0 -253)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/MeterTestSuite.java 71(+0 -71)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/MeterTestSuiteNoDB.java 20(+0 -20)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/MeterTestSuiteWithEmbeddedDB.java 85(+0 -85)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/aggregator/TestTimelineAggregator.java 169(+0 -169)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/categories/TestCategoryAndMetrics.java 67(+0 -67)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/chunks/TestTimeBytesAndSampleBytes.java 50(+0 -50)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/chunks/TestTimelineChunk.java 73(+0 -73)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/codec/TestEncodedBytesAndSampleCount.java 50(+0 -50)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/codec/TestSampleCoder.java 212(+0 -212)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/codec/TestSampleCompression.java 77(+0 -77)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/codec/TestTimelineChunkAccumulator.java 163(+0 -163)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/codec/TestTimelineChunkToJson.java 105(+0 -105)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/consumer/filter/TestDecimatingFilter.java 110(+0 -110)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/consumer/TestAccumulatorSampleConsumer.java 51(+0 -51)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/consumer/TestCSVConsumer.java 78(+0 -78)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/metrics/TestSamplesForMetricAndSource.java 39(+0 -39)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/MockFileBackedBuffer.java 72(+0 -72)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/MockTimelineDao.java 232(+0 -232)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/persistent/TestDefaultTimelineDao.java 101(+0 -101)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/persistent/TestFileBackedBuffer.java 149(+0 -149)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/persistent/TestReplayer.java 98(+0 -98)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/persistent/TestSamplesReplayer.java 118(+0 -118)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/samples/TestNullSample.java 33(+0 -33)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/samples/TestRepeatSample.java 51(+0 -51)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/samples/TestSampleOpcode.java 44(+0 -44)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/samples/TestScalarSample.java 77(+0 -77)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestDateTimeUtils.java 41(+0 -41)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestInMemoryEventHandler.java 113(+0 -113)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestTimelineEventHandler.java 130(+0 -130)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestTimelineSourceEventAccumulator.java 97(+0 -97)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TimelineLoadGenerator.java 212(+0 -212)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/times/TestDefaultTimelineCoder.java 393(+0 -393)

osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/times/TestTimelineOpcode.java 32(+0 -32)

osgi-bundles/bundles/pom.xml 2(+0 -2)

pom.xml 2(+1 -1)

Details

beatrix/pom.xml 6(+3 -3)

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 72bf9d0..8abd8e9 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -211,9 +211,9 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${project.version}.jar" />
+                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-${project.version}-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-${project.version}-jar-with-dependencies.jar"></copy>
+                                <copy file="${basedir}/../osgi-bundles/bundles/jruby/target/killbill-osgi-bundles-jruby-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-jruby-${project.version}.jar"></copy>
                             </tasks>
                         </configuration>
                     </execution>

osgi-bundles/bundles/logger/pom.xml 2(+1 -1)

diff --git a/osgi-bundles/bundles/logger/pom.xml b/osgi-bundles/bundles/logger/pom.xml
index ce33426..bfb1baf 100644
--- a/osgi-bundles/bundles/logger/pom.xml
+++ b/osgi-bundles/bundles/logger/pom.xml
@@ -56,7 +56,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Activator>com.ning.billing.osgi.bundles.logger.Activator</Bundle-Activator>
-                        <Export-Package />
+                        <Export-Package></Export-Package>
                         <Private-Package>com.ning.billing.osgi.bundles.logger.*</Private-Package>
                         <!-- Optional resolution because exported by the Felix system bundle -->
                         <Import-Package>*;resolution:=optional</Import-Package>

osgi-bundles/bundles/pom.xml 2(+0 -2)

diff --git a/osgi-bundles/bundles/pom.xml b/osgi-bundles/bundles/pom.xml
index b9e76d1..27b2a55 100644
--- a/osgi-bundles/bundles/pom.xml
+++ b/osgi-bundles/bundles/pom.xml
@@ -26,10 +26,8 @@
     <packaging>pom</packaging>
     <name>Killbill billing platform: OSGI bundles</name>
     <modules>
-        <module>analytics</module>
         <module>jruby</module>
         <module>logger</module>
-        <module>meter</module>
         <module>webconsolebranding</module>
     </modules>
 </project>

pom.xml 2(+1 -1)

diff --git a/pom.xml b/pom.xml
index c375b48..b8a9a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>com.ning.billing</groupId>
-        <version>0.2.6</version>
+        <version>0.3.0</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.3.2-SNAPSHOT</version>