killbill-aplcache

into integration

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
	server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java

Jeff Certain

Commit: 12d8b89

Tree: ebaf40c

Parents: 82356e8
00b0fbd

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

4/26/2012 10:33:34 PM

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

stephane brossier

Commit: 00b0fbd

Tree: 479f05b

Parents: 98e1126

Adding junction module to server

4/26/2012 7:23:16 PM

stephane brossier

Commit: 98e1126

Tree: 629029c

Parents: 2a68d89

Remove unused wrong impport that makese Travis fail

4/26/2012 7:09:19 PM

stephane brossier

Commit: 2a68d89

Tree: 717d174

Parents: 4966179

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

4/26/2012 6:54:08 PM

stephane brossier

Commit: 4966179

Tree: 25c2627

Parents: fa19413
09a9c05