killbill-aplcache

move BillingEvent and BllingEventSet to Invoice

1/6/2012 4:57:27 PM

jeff

Commit: 0f95ee0

Tree: 253f95a

Parents: 8f13518

Changes

invoice/src/main/java/com/ning/billing/invoice/model/BillingEventSet.java 2(+1 -1)

invoice/src/main/java/com/ning/billing/invoice/model/DefaultBillingEvent.java 7(+1 -6)

invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java 1(+0 -1)

invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java 1(+0 -1)

invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java 4(+2 -2)

Details

invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java 1(+0 -1)

diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java
index 54ca894..a24bb35 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java
@@ -20,7 +20,6 @@ import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.entitlement.api.billing.BillingEvent;
 import com.ning.billing.entitlement.api.billing.BillingModeType;
-import com.ning.billing.invoice.api.BillingEventSet;
 import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.invoice.api.InvoiceItem;
 import org.joda.time.DateTime;

invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java 1(+0 -1)

diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java b/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java
index 6066a75..b4d81a7 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java
@@ -17,7 +17,6 @@
 package com.ning.billing.invoice.model;
 
 import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.api.BillingEventSet;
 import com.ning.billing.invoice.api.Invoice;
 import org.joda.time.DateTime;

invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java 4(+2 -2)

diff --git a/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java b/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
index d01c470..c560e77 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
@@ -20,8 +20,8 @@ import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.entitlement.api.billing.BillingEvent;
 import com.ning.billing.entitlement.api.billing.BillingModeType;
-import com.ning.billing.invoice.api.BillingEventSet;
-import com.ning.billing.invoice.api.DefaultBillingEvent;
+import com.ning.billing.invoice.model.BillingEventSet;
+import com.ning.billing.invoice.model.DefaultBillingEvent;
 import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.invoice.api.InvoiceItem;
 import com.ning.billing.invoice.model.DefaultInvoiceGenerator;