killbill-memoizeit

Merged killbill-account branch into payment-work branch …

12/13/2011 5:43:25 AM

and updated payment code with new names

alena

Commit: b56eacf

Tree: e370e17

Parents: 20f783b
c7aa0c8

update pom to snapshot 18; fix analytics unit tests

12/9/2011 7:15:44 PM

jeff

Commit: c7aa0c8

Tree: 926e6ba

Parents: 144baf3

added PaymentProviderName to Account

12/9/2011 3:31:37 PM

jeff

Commit: 144baf3

Tree: db7c3c5

Parents: d0d0b94

TagStore persistence; dao cleanup

12/9/2011 2:08:41 PM

jeff

Commit: d0d0b94

Tree: dcb0463

Parents: 5aa9a40

update FieldStore to remove jdbi workaround (getIdAsString); …

12/8/2011 5:28:42 PM

TagStore persistence, moved Mapper classes to inner classes

jeff

Commit: 5aa9a40

Tree: 93e7d67

Parents: 9a6c609

tags for account

12/7/2011 6:03:30 PM

jeff

Commit: 9a6c609

Tree: 646c949

Parents: 30d29fd

Merge branch 'master' of github.com:ning/killbill into killbill-account; …

12/7/2011 4:57:47 PM

finish renaming

Conflicts:
	analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java
	analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java
	analytics/src/test/java/com/ning/billing/analytics/MockIEntitlementUserApi.java
	analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java
	analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscription.java
	analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransition.java
	analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
	analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
	api/src/main/java/com/ning/billing/account/api/AccountService.java
	api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApi.java
	api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
	api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
	api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransition.java
	catalog/src/main/java/com/ning/billing/catalog/DefaultInternationalPrice.java
	catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java
	catalog/src/test/java/com/ning/billing/catalog/TestInternationalPrice.java
	entitlement/src/main/java/com/ning/billing/entitlement/alignment/PlanAligner.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/test/DefaultEntitlementTestApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBuilder.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionData.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/core/ApiEventProcessorBase.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/core/DefaultApiEventProcessor.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/EntitlementDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EventSqlDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/IEntitlementDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/SubscriptionSqlDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java
	entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java
	entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEvent.java
	entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/ApiTestListener.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreateMemory.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreateSql.java
	entitlement/src/test/java/com/ning/billing/entitlement/engine/core/MockApiEventProcessorMemory.java
	entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java
	util/src/main/java/com/ning/billing/util/clock/Clock.java