killbill-memoizeit

Ongoing work on 1.0 APIs

Remove surefire from junction-- travis fails Add repair tests …

in beatrix
Add AO test in Beatrix that fails-- see RI-1171

Adding junction module to server

Remove unused wrong impport that makese Travis fail

Merge branch 'integration' into server Conflicts: api/src/main/java/com/ning/billing/ErrorCode.java api/src/main/java/com/ning/billing/entitlement/api/EntitlementService.java api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEventTransition.java api/src/main/java/com/ning/billing/junction/api/BillingApi.java beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundleData.java entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionData.java entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/BundleSqlDao.java entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoSql.java entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModuleSql.java invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultBillingEvent.java junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestDefaultBillingEvent.java junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestDefaultEntitlementBillingApi.java

New test and stabalizing old tests

Added several new tests and worked through a lot of test guice …

issues with the refactor

Updating tests

Adding tests for API, more refactoring/renaming.

Merge branch 'integration' of git@github.com:ning/killbill …

into integration