killbill-uncached
Changes
.idea/copyright/apache.xml 2(+1 -1)
.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_6_SNAPSHOT.xml 15(+15 -0)
.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_1_56_SNAPSHOT.xml 15(+15 -0)
account/killbill-account.iml 3(+1 -2)
api/killbill-api.iml 22(+22 -0)
beatrix/killbill-beatrix.iml 3(+1 -2)
catalog/killbill-catalog.iml 3(+1 -2)
entitlement/killbill-entitlement.iml 2(+1 -1)
entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java 16(+16 -0)
entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java 16(+16 -0)
entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleNoDB.java 16(+16 -0)
entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleWithEmbeddedDB.java 16(+16 -0)
invoice/killbill-invoice.iml 3(+1 -2)
jaxrs/killbill-jaxrs.iml 3(+1 -2)
junction/killbill-junction.iml 3(+1 -2)
osgi/killbill-osgi.iml 4(+2 -2)
overdue/killbill-overdue.iml 3(+1 -2)
payment/killbill-payment.iml 3(+1 -2)
server/killbill-server.iml 3(+1 -2)
tenant/killbill-tenant.iml 3(+1 -2)
usage/killbill-usage.iml 3(+1 -2)
util/killbill-util.iml 3(+1 -2)
Details
.idea/copyright/apache.xml 2(+1 -1)
diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml
index 81af6ab..d5736cd 100644
--- a/.idea/copyright/apache.xml
+++ b/.idea/copyright/apache.xml
@@ -1,6 +1,6 @@
<component name="CopyrightManager">
<copyright>
- <option name="notice" value="Copyright 2010-&#36;today.year Ning, Inc. Ning licenses this file to you under the Apache License, version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." />
+ <option name="notice" value="Copyright 2010-&#36;today.year Ning, Inc. Ning licenses this file to you under the Apache License, version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." />
<option name="keyword" value="Copyright" />
<option name="allowReplaceKeyword" value="" />
<option name="myName" value="apache" />
diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_6_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_6_SNAPSHOT.xml
new file mode 100644
index 0000000..26ad1c2
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_6_SNAPSHOT.xml
@@ -0,0 +1,24 @@
+<component name="libraryTable">
+ <library name="Maven: com.ning.billing.commons:killbill-queue:0.1.6-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.6-SNAPSHOT/killbill-queue-0.1.6-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.6-SNAPSHOT/killbill-queue-0.1.6-SNAPSHOT-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.6-SNAPSHOT/killbill-queue-0.1.6-SNAPSHOT-sources.jar!/" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/jdbi/src/main/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/jdbi/src/test/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/util/src/main/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/util/src/test/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/queue/src/main/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/queue/src/test/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/locker/src/main/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/locker/src/test/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/concurrent/src/main/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/concurrent/src/test/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/embeddeddb/src/main/java" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_6_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_6_SNAPSHOT.xml
new file mode 100644
index 0000000..6f27bb7
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_6_SNAPSHOT.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Maven: com.ning.billing.commons:killbill-queue:test-jar:tests:0.1.6-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.6-SNAPSHOT/killbill-queue-0.1.6-SNAPSHOT-tests.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.6-SNAPSHOT/killbill-queue-0.1.6-SNAPSHOT-test-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.6-SNAPSHOT/killbill-queue-0.1.6-SNAPSHOT-test-sources.jar!/" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/queue/src/main/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-commons/queue/src/test/java" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_1_56_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_1_56_SNAPSHOT.xml
new file mode 100644
index 0000000..e61ac04
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_1_56_SNAPSHOT.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Maven: com.ning.billing:killbill-beatrix:test-jar:tests:0.1.56-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/beatrix/pom.xml!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$PROJECT_DIR$/payment/pom-javadoc.jar!/" />
+ <root url="jar://$PROJECT_DIR$/beatrix/pom-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$PROJECT_DIR$/payment/pom-sources.jar!/" />
+ <root url="jar://$PROJECT_DIR$/beatrix/pom-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_test_0_1_56_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_test_0_1_56_SNAPSHOT.xml
new file mode 100644
index 0000000..b6d4c5e
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_test_0_1_56_SNAPSHOT.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+ <library name="Maven: com.ning.billing:killbill-osgi-bundles-test:0.1.56-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-osgi-bundles-test/0.1.56-SNAPSHOT/killbill-osgi-bundles-test-0.1.56-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-osgi-bundles-test/0.1.56-SNAPSHOT/killbill-osgi-bundles-test-0.1.56-SNAPSHOT-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-osgi-bundles-test/0.1.56-SNAPSHOT/killbill-osgi-bundles-test-0.1.56-SNAPSHOT-sources.jar!/" />
+ <root url="file://$PROJECT_DIR$/osgi-bundles/tests/payment/src/test/java" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ning_killbill_zuora_plugin_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_killbill_zuora_plugin_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..f726bf1
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_killbill_zuora_plugin_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Maven: com.ning.killbill:zuora-plugin:1.0.0-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/killbill/zuora-plugin/1.0.0-SNAPSHOT/zuora-plugin-1.0.0-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/killbill/zuora-plugin/1.0.0-SNAPSHOT/zuora-plugin-1.0.0-SNAPSHOT-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/killbill/zuora-plugin/1.0.0-SNAPSHOT/zuora-plugin-1.0.0-SNAPSHOT-sources.jar!/" />
+ <root url="file://$PROJECT_DIR$/../killbill-zuora-plugin/src/main/java" />
+ <root url="file://$PROJECT_DIR$/../killbill-zuora-plugin/src/test/java" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml
index fbf058b..9a00161 100644
--- a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml
@@ -8,6 +8,7 @@
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.configadmin/1.6.0/org.apache.felix.configadmin-1.6.0-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.framework/4.0.3/org.apache.felix.framework-4.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
account/killbill-account.iml 3(+1 -2)
diff --git a/account/killbill-account.iml b/account/killbill-account.iml
index 0bd0fa2..e7b28cf 100644
--- a/account/killbill-account.iml
+++ b/account/killbill-account.iml
@@ -11,7 +11,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.1.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.0" level="project" />
@@ -23,7 +22,7 @@
<orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
api/killbill-api.iml 22(+22 -0)
diff --git a/api/killbill-api.iml b/api/killbill-api.iml
new file mode 100644
index 0000000..db7d579
--- /dev/null
+++ b/api/killbill-api.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
+ <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+ </component>
+</module>
+
beatrix/killbill-beatrix.iml 3(+1 -2)
diff --git a/beatrix/killbill-beatrix.iml b/beatrix/killbill-beatrix.iml
index 7fc6278..4afbbc8 100644
--- a/beatrix/killbill-beatrix.iml
+++ b/beatrix/killbill-beatrix.iml
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
@@ -32,7 +31,7 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.0" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="module" module-name="killbill-util" />
catalog/killbill-catalog.iml 3(+1 -2)
diff --git a/catalog/killbill-catalog.iml b/catalog/killbill-catalog.iml
index 426cb6a..e9c6354 100644
--- a/catalog/killbill-catalog.iml
+++ b/catalog/killbill-catalog.iml
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
@@ -21,7 +20,7 @@
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
entitlement/killbill-entitlement.iml 2(+1 -1)
diff --git a/entitlement/killbill-entitlement.iml b/entitlement/killbill-entitlement.iml
index 5b56a6e..5f5d352 100644
--- a/entitlement/killbill-entitlement.iml
+++ b/entitlement/killbill-entitlement.iml
@@ -23,7 +23,7 @@
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
<orderEntry type="module" module-name="killbill-catalog" scope="TEST" production-on-test="" />
<orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java b/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
index ebd3a59..991c545 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.ning.billing.entitlement.glue;
import com.google.inject.AbstractModule;
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
index e3e4e8e..86c25a1 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.ning.billing.entitlement;
import org.testng.annotations.AfterMethod;
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
index b9999fa..f3339d6 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.ning.billing.entitlement;
import com.google.inject.Guice;
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModule.java b/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModule.java
index 425b87b..7ae3800 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModule.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModule.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.ning.billing.entitlement.glue;
import com.ning.billing.catalog.MockCatalogModule;
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleNoDB.java b/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleNoDB.java
index 6d3319d..aff1d31 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleNoDB.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleNoDB.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.ning.billing.entitlement.glue;
import com.ning.billing.GuicyKillbillTestNoDBModule;
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleWithEmbeddedDB.java b/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleWithEmbeddedDB.java
index 75f2325..a81c8ae 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleWithEmbeddedDB.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/glue/TestEntitlementModuleWithEmbeddedDB.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.ning.billing.entitlement.glue;
import com.ning.billing.GuicyKillbillTestWithEmbeddedDBModule;
invoice/killbill-invoice.iml 3(+1 -2)
diff --git a/invoice/killbill-invoice.iml b/invoice/killbill-invoice.iml
index 556ea8d..71f6e87 100644
--- a/invoice/killbill-invoice.iml
+++ b/invoice/killbill-invoice.iml
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
@@ -28,7 +27,7 @@
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
<orderEntry type="module" module-name="killbill-catalog" scope="TEST" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
jaxrs/killbill-jaxrs.iml 3(+1 -2)
diff --git a/jaxrs/killbill-jaxrs.iml b/jaxrs/killbill-jaxrs.iml
index 2ef1f8c..166936c 100644
--- a/jaxrs/killbill-jaxrs.iml
+++ b/jaxrs/killbill-jaxrs.iml
@@ -11,7 +11,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
@@ -29,7 +28,7 @@
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.2" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.3.3" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
junction/killbill-junction.iml 3(+1 -2)
diff --git a/junction/killbill-junction.iml b/junction/killbill-junction.iml
index 3d5fe31..b09de30 100644
--- a/junction/killbill-junction.iml
+++ b/junction/killbill-junction.iml
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
@@ -24,7 +23,7 @@
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
<orderEntry type="module" module-name="killbill-catalog" scope="TEST" production-on-test="" />
<orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
osgi/killbill-osgi.iml 4(+2 -2)
diff --git a/osgi/killbill-osgi.iml b/osgi/killbill-osgi.iml
index f19aa06..4d163ef 100644
--- a/osgi/killbill-osgi.iml
+++ b/osgi/killbill-osgi.iml
@@ -5,12 +5,12 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
@@ -23,7 +23,7 @@
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
diff --git a/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml b/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
index d43cff6..257d1d6 100644
--- a/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
+++ b/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
@@ -9,7 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
diff --git a/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml b/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
index a2fa985..f6aa346 100644
--- a/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
+++ b/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
@@ -3,13 +3,11 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-osgi-bundles-analytics:0.3.2" level="project" />
<orderEntry type="module" module-name="killbill-osgi-bundles-jruby" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
diff --git a/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml b/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
index 3289080..9c1dd7f 100644
--- a/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
+++ b/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
@@ -5,11 +5,13 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
diff --git a/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml b/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml
index e9f5b84..986d0f3 100644
--- a/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml
+++ b/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml
@@ -4,6 +4,7 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
@@ -11,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
diff --git a/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml b/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
index 73ee382..ddcef65 100644
--- a/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
+++ b/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
@@ -11,7 +11,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
@@ -29,7 +28,7 @@
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.2" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.3.3" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
overdue/killbill-overdue.iml 3(+1 -2)
diff --git a/overdue/killbill-overdue.iml b/overdue/killbill-overdue.iml
index 79622fe..6cee137 100644
--- a/overdue/killbill-overdue.iml
+++ b/overdue/killbill-overdue.iml
@@ -11,7 +11,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
@@ -28,7 +27,7 @@
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
<orderEntry type="module" module-name="killbill-catalog" scope="TEST" production-on-test="" />
<orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
payment/killbill-payment.iml 3(+1 -2)
diff --git a/payment/killbill-payment.iml b/payment/killbill-payment.iml
index ec99a4e..b5c0d46 100644
--- a/payment/killbill-payment.iml
+++ b/payment/killbill-payment.iml
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
@@ -32,7 +31,7 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.0" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
server/killbill-server.iml 3(+1 -2)
diff --git a/server/killbill-server.iml b/server/killbill-server.iml
index 05d91bc..568c46a 100644
--- a/server/killbill-server.iml
+++ b/server/killbill-server.iml
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:1.0.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
@@ -31,7 +30,7 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.0" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="module" module-name="killbill-util" />
diff --git a/subscription/killbill-subscription.iml b/subscription/killbill-subscription.iml
index eb3843f..2b69a86 100644
--- a/subscription/killbill-subscription.iml
+++ b/subscription/killbill-subscription.iml
@@ -28,7 +28,7 @@
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
<orderEntry type="module" module-name="killbill-catalog" scope="TEST" production-on-test="" />
<orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
tenant/killbill-tenant.iml 3(+1 -2)
diff --git a/tenant/killbill-tenant.iml b/tenant/killbill-tenant.iml
index 29ba03f..88026fe 100644
--- a/tenant/killbill-tenant.iml
+++ b/tenant/killbill-tenant.iml
@@ -11,7 +11,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
@@ -21,7 +20,7 @@
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
usage/killbill-usage.iml 3(+1 -2)
diff --git a/usage/killbill-usage.iml b/usage/killbill-usage.iml
index 7a1d8a7..47ccc94 100644
--- a/usage/killbill-usage.iml
+++ b/usage/killbill-usage.iml
@@ -11,7 +11,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
@@ -20,7 +19,7 @@
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
util/killbill-util.iml 3(+1 -2)
diff --git a/util/killbill-util.iml b/util/killbill-util.iml
index 8a9ad6c..378f6e0 100644
--- a/util/killbill-util.iml
+++ b/util/killbill-util.iml
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.1.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.0" level="project" />
@@ -36,7 +35,7 @@
<orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.2" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.3.3" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2" level="project" />
- <orderEntry type="module" module-name="killbill-internal-api" />
+ <orderEntry type="module" module-name="killbill-api" />
<orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
<orderEntry type="library" name="Maven: org.skife.config:config-magic:0.14" level="project" />
<orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />