Prosoft Git

killbill-memoizeit

Merge remote-tracking branch 'origin/master' into entitlement++ Conflicts: beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java

7/17/2013 9:41:23 PM
stephane brossier

stephane brossier

Commit: 4fbf070

Tree: 1e31c71

Parents: c755a5d
3b695c9

Changes

.gitignore 3(+1 -2)

.idea/.name 1(+1 -0)

.idea/codeStyleSettings.xml 57(+57 -0)

.idea/compiler.xml 83(+83 -0)

.idea/copyright/profiles_settings.xml 7(+7 -0)

.idea/dictionaries/pierre.xml 3(+3 -0)

.idea/encodings.xml 36(+36 -0)

.idea/inspectionProfiles/profiles_settings.xml 7(+7 -0)

.idea/inspectionProfiles/Project_Default.xml 38(+38 -0)

.idea/libraries/Maven__antlr_antlr_2_7_7.xml 13(+13 -0)

.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml 13(+13 -0)

.idea/libraries/Maven__asm_asm_3_1.xml 13(+13 -0)

.idea/libraries/Maven__biz_aQute_bndlib_1_50_0.xml 13(+13 -0)

.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml 13(+13 -0)

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_1.xml 13(+13 -0)

.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_1.xml 13(+13 -0)

.idea/libraries/Maven__classworlds_classworlds_1_1_alpha_2.xml 13(+13 -0)

.idea/libraries/Maven__com_beust_jcommander_1_12.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_1_0.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_1_0.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_1_0.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_csv_2_1_0.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_0_1.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_joda_2_0_1.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_0_0.xml 13(+13 -0)

.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_0_0.xml 13(+13 -0)

.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml 13(+13 -0)

.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml 13(+13 -0)

.idea/libraries/Maven__com_google_inject_extensions_guice_multibindings_3_0.xml 13(+13 -0)

.idea/libraries/Maven__com_google_inject_extensions_guice_servlet_3_0.xml 13(+13 -0)

.idea/libraries/Maven__com_google_inject_guice_3_0.xml 13(+13 -0)

.idea/libraries/Maven__com_h2database_h2_1_3_158.xml 13(+13 -0)

.idea/libraries/Maven__com_jayway_awaitility_awaitility_1_3_3.xml 13(+13 -0)

.idea/libraries/Maven__com_jolbox_bonecp_0_7_1_RELEASE.xml 13(+13 -0)

.idea/libraries/Maven__com_mchange_c3p0_0_9_2.xml 13(+13 -0)

.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_3_3.xml 13(+13 -0)

.idea/libraries/Maven__com_mogwee_mogwee_executors_1_2_0.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_arecibo_arecibo_jmx_1_0_3.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_arecibo_arecibo_metrics_2_0_0.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_async_http_client_1_7_1.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_test_jar_tests_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_commons_killbill_concurrent_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_commons_killbill_jdbi_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_analytics_0_3_2.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_2_5.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_2_5.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_jaxrs_jaxrs_metrics_2_0_0.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_base_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_core_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_eventtracker_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_jdbi_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_log4j_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_utils_0_1_7.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_metrics_eventtracker_common_4_1_2.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_metrics_eventtracker_http_4_1_2.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_metrics_eventtracker_smile_4_1_2.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_metrics_serialization_common_2_2_0.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_metrics_serialization_smile_2_2_0.xml 13(+13 -0)

.idea/libraries/Maven__com_ning_metrics_serialization_writer_2_2_0.xml 13(+13 -0)

.idea/libraries/Maven__com_samskivert_jmustache_1_5.xml 13(+13 -0)

.idea/libraries/Maven__com_sun_jersey_contribs_jersey_guice_1_12.xml 13(+13 -0)

.idea/libraries/Maven__com_sun_jersey_jersey_core_1_12.xml 13(+13 -0)

.idea/libraries/Maven__com_sun_jersey_jersey_server_1_12.xml 13(+13 -0)

.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_12.xml 13(+13 -0)

.idea/libraries/Maven__com_yammer_metrics_metrics_annotation_2_1_2.xml 13(+13 -0)

.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_1_2.xml 13(+13 -0)

.idea/libraries/Maven__com_yammer_metrics_metrics_guice_2_1_2.xml 13(+13 -0)

.idea/libraries/Maven__com_yammer_metrics_metrics_jdbi_2_1_2.xml 13(+13 -0)

.idea/libraries/Maven__com_yammer_metrics_metrics_servlet_2_1_2.xml 13(+13 -0)

.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml 13(+13 -0)

.idea/libraries/Maven__commons_io_commons_io_2_1.xml 13(+13 -0)

.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml 13(+13 -0)

.idea/libraries/Maven__io_netty_netty_3_3_1_Final.xml 13(+13 -0)

.idea/libraries/Maven__javax_activation_activation_1_1.xml 13(+13 -0)

.idea/libraries/Maven__javax_inject_javax_inject_1.xml 13(+13 -0)

.idea/libraries/Maven__javax_mail_mail_1_4_1.xml 13(+13 -0)

.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml 13(+13 -0)

.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml 13(+13 -0)

.idea/libraries/Maven__joda_time_joda_time_2_0.xml 13(+13 -0)

.idea/libraries/Maven__junit_junit_3_8_1.xml 13(+13 -0)

.idea/libraries/Maven__mysql_mysql_connector_java_5_1_22.xml 13(+13 -0)

.idea/libraries/Maven__mysql_mysql_connector_mxj_5_0_12.xml 13(+13 -0)

.idea/libraries/Maven__mysql_mysql_connector_mxj_db_files_5_0_12.xml 13(+13 -0)

.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_2.xml 13(+13 -0)

.idea/libraries/Maven__net_sf_kxml_kxml2_2_2_2.xml 13(+13 -0)

.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_commons_commons_compress_1_5.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_bundlerepository_1_6_6.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_3_1_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_annotation_3_1_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_compat_3_0_1.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_runtime_3_1_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_shell_3_0_1.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_deploymentadmin_0_9_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_4_0_3.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_gogo_runtime_0_10_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_log_1_0_1.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_metatype_1_0_6.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_1_6_2.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_annotations_1_7_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_ds_annotations_1_2_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_1_4_3.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_remote_1_1_2.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_webconsole_3_1_8.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_felix_org_osgi_core_1_0_1.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_artifact_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_model_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_plugin_api_2_0.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_profile_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_project_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_maven_settings_2_0_7.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_1_0_beta_2.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_shiro_shiro_core_1_2_1.xml 13(+13 -0)

.idea/libraries/Maven__org_apache_shiro_shiro_web_1_2_1.xml 13(+13 -0)

.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml 13(+13 -0)

.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_5.xml 13(+13 -0)

.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_5.xml 13(+13 -0)

.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1.xml 13(+13 -0)

.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_1_4_1.xml 13(+13 -0)

.idea/libraries/Maven__org_easymock_easymock_2_4.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_http_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_io_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_security_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_server_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_util_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_8_1_11_v20130520.xml 13(+13 -0)

.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml 13(+13 -0)

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml 13(+13 -0)

.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml 13(+13 -0)

.idea/libraries/Maven__org_jdbi_jdbi_2_39_1.xml 13(+13 -0)

.idea/libraries/Maven__org_jruby_jruby_complete_1_7_1.xml 13(+13 -0)

.idea/libraries/Maven__org_json_json_20070829.xml 13(+13 -0)

.idea/libraries/Maven__org_mockito_mockito_all_1_9_0.xml 13(+13 -0)

.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml 13(+13 -0)

.idea/libraries/Maven__org_osgi_org_osgi_compendium_4_3_1.xml 13(+13 -0)

.idea/libraries/Maven__org_osgi_org_osgi_core_4_3_1.xml 13(+13 -0)

.idea/libraries/Maven__org_skife_config_config_magic_0_14.xml 13(+13 -0)

.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml 13(+13 -0)

.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_5.xml 13(+13 -0)

.idea/libraries/Maven__org_slf4j_osgi_over_slf4j_1_7_5.xml 13(+13 -0)

.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml 13(+13 -0)

.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_5.xml 13(+13 -0)

.idea/libraries/Maven__org_testng_testng_6_3_1.xml 13(+13 -0)

.idea/libraries/Maven__org_tukaani_xz_1_2.xml 13(+13 -0)

.idea/libraries/Maven__org_weakref_jmxutils_1_12.xml 13(+13 -0)

.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml 13(+13 -0)

.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml 13(+13 -0)

.idea/misc.xml 17(+17 -0)

.idea/modules.xml 37(+37 -0)

.idea/scopes/scope_settings.xml 5(+5 -0)

.idea/uiDesigner.xml 125(+125 -0)

.idea/vcs.xml 7(+7 -0)

account/killbill-account.iml 65(+65 -0)

api/killbill-internal-api.iml 23(+23 -0)

beatrix/killbill-beatrix.iml 107(+107 -0)

beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java 2(+1 -1)

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java 87(+47 -40)

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java 5(+3 -2)

catalog/killbill-catalog.iml 63(+63 -0)

entitlement/killbill-entitlement.iml 70(+70 -0)

invoice/killbill-invoice.iml 74(+74 -0)

jaxrs/killbill-jaxrs.iml 64(+64 -0)

junction/killbill-junction.iml 72(+72 -0)

killbill.iml 14(+14 -0)

osgi/killbill-osgi.iml 71(+71 -0)

osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml 36(+36 -0)

osgi-bundles/bundles/killbill-osgi-bundles.iml 14(+14 -0)

osgi-bundles/bundles/logger/killbill-osgi-bundles-logger.iml 17(+17 -0)

osgi-bundles/bundles/webconsolebranding/killbill-osgi-bundles-webconsolebranding.iml 14(+14 -0)

osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml 69(+69 -0)

osgi-bundles/killbill-osgi-all-bundles.iml 14(+14 -0)

osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml 30(+30 -0)

osgi-bundles/libs/killbill-osgi-lib-bundles.iml 14(+14 -0)

osgi-bundles/libs/slf4j-osgi/killbill-osgi-bundles-lib-slf4j-osgi.iml 20(+20 -0)

osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml 34(+34 -0)

osgi-bundles/tests/killbill-osgi-test-bundles.iml 14(+14 -0)

osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml 59(+59 -0)

overdue/killbill-overdue.iml 74(+74 -0)

payment/killbill-payment.iml 79(+79 -0)

server/killbill-server.iml 144(+144 -0)

server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java 2(+1 -1)

tenant/killbill-tenant.iml 67(+67 -0)

usage/killbill-usage.iml 64(+64 -0)

util/killbill-util.iml 70(+70 -0)

util/src/test/java/com/ning/billing/api/TestApiListener.java 29(+28 -1)

util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDao.java 2(+1 -1)

util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java 2(+1 -1)

util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java 3(+3 -0)

Details

.gitignore 3(+1 -2) 

diff --git a/.gitignore b/.gitignore
index a7077d4..7fecb3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-*.idea
-*.iml
+.idea/workspace.xml
 *.ipr
 *.iws
 *.DS_Store

.idea/.name 1(+1 -0) 

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..9b66548
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+killbill
\ No newline at end of file

.idea/codeStyleSettings.xml 57(+57 -0) 

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..0391fca
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="GENERATE_FINAL_LOCALS" value="true" />
+        <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+        <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value />
+        </option>
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.ning" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+          </value>
+        </option>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="JAVA">
+          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+          <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
+          <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+          <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
+          <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+          <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+          <option name="IF_BRACE_FORCE" value="3" />
+          <option name="DOWHILE_BRACE_FORCE" value="3" />
+          <option name="WHILE_BRACE_FORCE" value="3" />
+          <option name="FOR_BRACE_FORCE" value="3" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
+

.idea/compiler.xml 83(+83 -0) 

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..06eb9a3
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+      <profile default="false" name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="killbill-account" />
+        <module name="killbill-beatrix" />
+        <module name="killbill-catalog" />
+        <module name="killbill-entitlement" />
+        <module name="killbill-internal-api" />
+        <module name="killbill-invoice" />
+        <module name="killbill-jaxrs" />
+        <module name="killbill-junction" />
+        <module name="killbill-osgi" />
+        <module name="killbill-osgi-bundles-jruby" />
+        <module name="killbill-osgi-bundles-lib-killbill" />
+        <module name="killbill-osgi-bundles-lib-slf4j-osgi" />
+        <module name="killbill-osgi-bundles-logger" />
+        <module name="killbill-osgi-bundles-test-beatrix" />
+        <module name="killbill-osgi-bundles-test-payment" />
+        <module name="killbill-osgi-bundles-webconsolebranding" />
+        <module name="killbill-overdue" />
+        <module name="killbill-payment" />
+        <module name="killbill-server" />
+        <module name="killbill-subscription" />
+        <module name="killbill-tenant" />
+        <module name="killbill-usage" />
+        <module name="killbill-util" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="killbill" target="1.6" />
+      <module name="killbill-account" target="1.6" />
+      <module name="killbill-beatrix" target="1.6" />
+      <module name="killbill-catalog" target="1.6" />
+      <module name="killbill-entitlement" target="1.6" />
+      <module name="killbill-internal-api" target="1.6" />
+      <module name="killbill-invoice" target="1.6" />
+      <module name="killbill-jaxrs" target="1.6" />
+      <module name="killbill-junction" target="1.6" />
+      <module name="killbill-osgi" target="1.6" />
+      <module name="killbill-osgi-all-bundles" target="1.6" />
+      <module name="killbill-osgi-bundles" target="1.6" />
+      <module name="killbill-osgi-bundles-defaultbundles" target="1.6" />
+      <module name="killbill-osgi-bundles-jruby" target="1.6" />
+      <module name="killbill-osgi-bundles-lib-killbill" target="1.6" />
+      <module name="killbill-osgi-bundles-lib-slf4j-osgi" target="1.6" />
+      <module name="killbill-osgi-bundles-logger" target="1.6" />
+      <module name="killbill-osgi-bundles-test-beatrix" target="1.6" />
+      <module name="killbill-osgi-bundles-test-payment" target="1.6" />
+      <module name="killbill-osgi-bundles-webconsolebranding" target="1.6" />
+      <module name="killbill-osgi-lib-bundles" target="1.6" />
+      <module name="killbill-osgi-test-bundles" target="1.6" />
+      <module name="killbill-overdue" target="1.6" />
+      <module name="killbill-payment" target="1.6" />
+      <module name="killbill-server" target="1.6" />
+      <module name="killbill-subscription" target="1.6" />
+      <module name="killbill-tenant" target="1.6" />
+      <module name="killbill-usage" target="1.6" />
+      <module name="killbill-util" target="1.6" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
+

.idea/copyright/profiles_settings.xml 7(+7 -0) 

diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..3432f79
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings default="">
+    <module2copyright>
+      <element module="All" copyright="apache" />
+    </module2copyright>
+  </settings>
+</component>
\ No newline at end of file

.idea/dictionaries/pierre.xml 3(+3 -0) 

diff --git a/.idea/dictionaries/pierre.xml b/.idea/dictionaries/pierre.xml
new file mode 100644
index 0000000..118b145
--- /dev/null
+++ b/.idea/dictionaries/pierre.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="pierre" />
+</component>
\ No newline at end of file

.idea/encodings.xml 36(+36 -0) 

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..437fcd7
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/account" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/api" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/beatrix" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/catalog" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/entitlement" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/invoice" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jaxrs" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/junction" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/bundles" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/bundles/jruby" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/bundles/logger" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/bundles/webconsolebranding" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/defaultbundles" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/libs" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/libs/killbill" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/libs/slf4j-osgi" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/tests" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/tests/beatrix" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/osgi-bundles/tests/payment" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/overdue" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/payment" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/subscription" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/tenant" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/usage" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/util" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
+

.idea/inspectionProfiles/profiles_settings.xml 7(+7 -0) 

diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file

.idea/inspectionProfiles/Project_Default.xml 38(+38 -0) 

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..95037c1
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,38 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0" is_locked="false">
+    <option name="myName" value="Project Default" />
+    <option name="myLocal" value="false" />
+    <inspection_tool class="ConfusingOctalEscape" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CyclicClassDependency" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HardcodedFileSeparators" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_recognizeExampleMediaType" value="false" />
+    </inspection_tool>
+    <inspection_tool class="HardcodedLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ImplicitCallToSuper" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_ignoreForObjectSubclasses" value="false" />
+    </inspection_tool>
+    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ListIndexOfReplaceableByContains" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="LiteralAsArgToStringEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="REPORT_VARIABLES" value="true" />
+      <option name="REPORT_PARAMETERS" value="true" />
+    </inspection_tool>
+    <inspection_tool class="MagicNumber" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_requireAnnotationsFirst" value="true" />
+    </inspection_tool>
+    <inspection_tool class="SizeReplaceableByIsEmpty" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TypeMayBeWeakened" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="useRighthandTypeAsWeakestTypeInAssignments" value="true" />
+      <option name="useParameterizedTypeForCollectionMethods" value="true" />
+      <option name="doNotWeakenToJavaLangObject" value="true" />
+      <option name="onlyWeakentoInterface" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryConstantArrayCreationExpression" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UseOfJDBCDriverClass" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UseOfSunClasses" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file

.idea/libraries/Maven__antlr_antlr_2_7_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
new file mode 100644
index 0000000..b8d93d8
--- /dev/null
+++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: antlr:antlr:2.7.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
new file mode 100644
index 0000000..30ff5cb
--- /dev/null
+++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: aopalliance:aopalliance:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__asm_asm_3_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__asm_asm_3_1.xml b/.idea/libraries/Maven__asm_asm_3_1.xml
new file mode 100644
index 0000000..3386f10
--- /dev/null
+++ b/.idea/libraries/Maven__asm_asm_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: asm:asm:3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__biz_aQute_bndlib_1_50_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__biz_aQute_bndlib_1_50_0.xml b/.idea/libraries/Maven__biz_aQute_bndlib_1_50_0.xml
new file mode 100644
index 0000000..77a12e7
--- /dev/null
+++ b/.idea/libraries/Maven__biz_aQute_bndlib_1_50_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: biz.aQute:bndlib:1.50.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/biz/aQute/bndlib/1.50.0/bndlib-1.50.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/biz/aQute/bndlib/1.50.0/bndlib-1.50.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/biz/aQute/bndlib/1.50.0/bndlib-1.50.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml b/.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml
new file mode 100644
index 0000000..a8b5295
--- /dev/null
+++ b/.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cglib:cglib-nodep:2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.2/cglib-nodep-2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.2/cglib-nodep-2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_1.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_1.xml
new file mode 100644
index 0000000..8804c04
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-classic:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.0.1/logback-classic-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.0.1/logback-classic-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.0.1/logback-classic-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_1.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_1.xml
new file mode 100644
index 0000000..98728e1
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-core:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.0.1/logback-core-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.0.1/logback-core-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.0.1/logback-core-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__classworlds_classworlds_1_1_alpha_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__classworlds_classworlds_1_1_alpha_2.xml b/.idea/libraries/Maven__classworlds_classworlds_1_1_alpha_2.xml
new file mode 100644
index 0000000..c99448d
--- /dev/null
+++ b/.idea/libraries/Maven__classworlds_classworlds_1_1_alpha_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: classworlds:classworlds:1.1-alpha-2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_beust_jcommander_1_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_12.xml b/.idea/libraries/Maven__com_beust_jcommander_1_12.xml
new file mode 100644
index 0000000..2b9ea17
--- /dev/null
+++ b/.idea/libraries/Maven__com_beust_jcommander_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.beust:jcommander:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_1_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_1_0.xml
new file mode 100644
index 0000000..0680935
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.1.0/jackson-annotations-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.1.0/jackson-annotations-2.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.1.0/jackson-annotations-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_1_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_1_0.xml
new file mode 100644
index 0000000..fe79e57
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.1.0/jackson-core-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.1.0/jackson-core-2.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.1.0/jackson-core-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_1_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_1_0.xml
new file mode 100644
index 0000000..6770752
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.1.0/jackson-databind-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.1.0/jackson-databind-2.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.1.0/jackson-databind-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_csv_2_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_csv_2_1_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_csv_2_1_0.xml
new file mode 100644
index 0000000..855c856
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_csv_2_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/2.1.0/jackson-dataformat-csv-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/2.1.0/jackson-dataformat-csv-2.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/2.1.0/jackson-dataformat-csv-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_0_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_0_1.xml
new file mode 100644
index 0000000..3cc7856
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.0.1/jackson-dataformat-smile-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.0.1/jackson-dataformat-smile-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.0.1/jackson-dataformat-smile-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_joda_2_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_joda_2_0_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_joda_2_0_1.xml
new file mode 100644
index 0000000..6398ebc
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_joda_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.0.1/jackson-datatype-joda-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.0.1/jackson-datatype-joda-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.0.1/jackson-datatype-joda-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_0_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_0_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_0_0.xml
new file mode 100644
index 0000000..53f50e6
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.0.0/jackson-jaxrs-json-provider-2.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.0.0/jackson-jaxrs-json-provider-2.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.0.0/jackson-jaxrs-json-provider-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_0_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_0_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_0_0.xml
new file mode 100644
index 0000000..5f97891
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.0.0/jackson-module-jaxb-annotations-2.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.0.0/jackson-module-jaxb-annotations-2.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.0.0/jackson-module-jaxb-annotations-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
new file mode 100644
index 0000000..0e66824
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.findbugs:jsr305:1.3.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
new file mode 100644
index 0000000..b71e220
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:guava:14.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/14.0.1/guava-14.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/14.0.1/guava-14.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/14.0.1/guava-14.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_google_inject_extensions_guice_multibindings_3_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_google_inject_extensions_guice_multibindings_3_0.xml b/.idea/libraries/Maven__com_google_inject_extensions_guice_multibindings_3_0.xml
new file mode 100644
index 0000000..6608bc7
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_inject_extensions_guice_multibindings_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.inject.extensions:guice-multibindings:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-multibindings/3.0/guice-multibindings-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-multibindings/3.0/guice-multibindings-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-multibindings/3.0/guice-multibindings-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_google_inject_extensions_guice_servlet_3_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_google_inject_extensions_guice_servlet_3_0.xml b/.idea/libraries/Maven__com_google_inject_extensions_guice_servlet_3_0.xml
new file mode 100644
index 0000000..f8024fe
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_inject_extensions_guice_servlet_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.inject.extensions:guice-servlet:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_google_inject_guice_3_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_google_inject_guice_3_0.xml b/.idea/libraries/Maven__com_google_inject_guice_3_0.xml
new file mode 100644
index 0000000..b5a7a25
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_inject_guice_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.inject:guice:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/3.0/guice-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/3.0/guice-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/3.0/guice-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_h2database_h2_1_3_158.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_h2database_h2_1_3_158.xml b/.idea/libraries/Maven__com_h2database_h2_1_3_158.xml
new file mode 100644
index 0000000..7fa4192
--- /dev/null
+++ b/.idea/libraries/Maven__com_h2database_h2_1_3_158.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.h2database:h2:1.3.158">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.3.158/h2-1.3.158.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.3.158/h2-1.3.158-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.3.158/h2-1.3.158-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_jayway_awaitility_awaitility_1_3_3.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_jayway_awaitility_awaitility_1_3_3.xml b/.idea/libraries/Maven__com_jayway_awaitility_awaitility_1_3_3.xml
new file mode 100644
index 0000000..590d340
--- /dev/null
+++ b/.idea/libraries/Maven__com_jayway_awaitility_awaitility_1_3_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jayway.awaitility:awaitility:1.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/awaitility/awaitility/1.3.3/awaitility-1.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/awaitility/awaitility/1.3.3/awaitility-1.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/awaitility/awaitility/1.3.3/awaitility-1.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_jolbox_bonecp_0_7_1_RELEASE.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_jolbox_bonecp_0_7_1_RELEASE.xml b/.idea/libraries/Maven__com_jolbox_bonecp_0_7_1_RELEASE.xml
new file mode 100644
index 0000000..e01b95e
--- /dev/null
+++ b/.idea/libraries/Maven__com_jolbox_bonecp_0_7_1_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jolbox:bonecp:0.7.1.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jolbox/bonecp/0.7.1.RELEASE/bonecp-0.7.1.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jolbox/bonecp/0.7.1.RELEASE/bonecp-0.7.1.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jolbox/bonecp/0.7.1.RELEASE/bonecp-0.7.1.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_mchange_c3p0_0_9_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_mchange_c3p0_0_9_2.xml b/.idea/libraries/Maven__com_mchange_c3p0_0_9_2.xml
new file mode 100644
index 0000000..d5816dd
--- /dev/null
+++ b/.idea/libraries/Maven__com_mchange_c3p0_0_9_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mchange:c3p0:0.9.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mchange/c3p0/0.9.2/c3p0-0.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mchange/c3p0/0.9.2/c3p0-0.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mchange/c3p0/0.9.2/c3p0-0.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_3_3.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_3_3.xml b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_3_3.xml
new file mode 100644
index 0000000..3f9cb51
--- /dev/null
+++ b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_3_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mchange:mchange-commons-java:0.2.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mchange/mchange-commons-java/0.2.3.3/mchange-commons-java-0.2.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mchange/mchange-commons-java/0.2.3.3/mchange-commons-java-0.2.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mchange/mchange-commons-java/0.2.3.3/mchange-commons-java-0.2.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_mogwee_mogwee_executors_1_2_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_mogwee_mogwee_executors_1_2_0.xml b/.idea/libraries/Maven__com_mogwee_mogwee_executors_1_2_0.xml
new file mode 100644
index 0000000..9091318
--- /dev/null
+++ b/.idea/libraries/Maven__com_mogwee_mogwee_executors_1_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mogwee:mogwee-executors:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mogwee/mogwee-executors/1.2.0/mogwee-executors-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mogwee/mogwee-executors/1.2.0/mogwee-executors-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mogwee/mogwee-executors/1.2.0/mogwee-executors-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_arecibo_arecibo_jmx_1_0_3.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_arecibo_arecibo_jmx_1_0_3.xml b/.idea/libraries/Maven__com_ning_arecibo_arecibo_jmx_1_0_3.xml
new file mode 100644
index 0000000..7eefca9
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_arecibo_arecibo_jmx_1_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.arecibo:arecibo-jmx:1.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/arecibo/arecibo-jmx/1.0.3/arecibo-jmx-1.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/arecibo/arecibo-jmx/1.0.3/arecibo-jmx-1.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/arecibo/arecibo-jmx/1.0.3/arecibo-jmx-1.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_arecibo_arecibo_metrics_2_0_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_arecibo_arecibo_metrics_2_0_0.xml b/.idea/libraries/Maven__com_ning_arecibo_arecibo_metrics_2_0_0.xml
new file mode 100644
index 0000000..3a1f611
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_arecibo_arecibo_metrics_2_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.arecibo:arecibo-metrics:2.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/arecibo/arecibo-metrics/2.0.0/arecibo-metrics-2.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/arecibo/arecibo-metrics/2.0.0/arecibo-metrics-2.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/arecibo/arecibo-metrics/2.0.0/arecibo-metrics-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_async_http_client_1_7_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_async_http_client_1_7_1.xml b/.idea/libraries/Maven__com_ning_async_http_client_1_7_1.xml
new file mode 100644
index 0000000..5d935b4
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_async_http_client_1_7_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:async-http-client:1.7.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/async-http-client/1.7.1/async-http-client-1.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/async-http-client/1.7.1/async-http-client-1.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/async-http-client/1.7.1/async-http-client-1.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_0_1_7.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_0_1_7.xml
new file mode 100644
index 0000000..c3feecb
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.commons:killbill-clock:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-clock/0.1.7/killbill-clock-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-clock/0.1.7/killbill-clock-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-clock/0.1.7/killbill-clock-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_test_jar_tests_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_test_jar_tests_0_1_7.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_test_jar_tests_0_1_7.xml
new file mode 100644
index 0000000..d57c213
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_clock_test_jar_tests_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-clock/0.1.7/killbill-clock-0.1.7-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-clock/0.1.7/killbill-clock-0.1.7-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-clock/0.1.7/killbill-clock-0.1.7-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_commons_killbill_concurrent_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_concurrent_0_1_7.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_concurrent_0_1_7.xml
new file mode 100644
index 0000000..f8b395e
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_concurrent_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.commons:killbill-concurrent:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-concurrent/0.1.7/killbill-concurrent-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-concurrent/0.1.7/killbill-concurrent-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-concurrent/0.1.7/killbill-concurrent-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_commons_killbill_jdbi_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_jdbi_0_1_7.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_jdbi_0_1_7.xml
new file mode 100644
index 0000000..bcbf249
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_jdbi_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-jdbi/0.1.7/killbill-jdbi-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-jdbi/0.1.7/killbill-jdbi-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-jdbi/0.1.7/killbill-jdbi-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_7.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_7.xml
new file mode 100644
index 0000000..8900b90
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.commons:killbill-queue:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.7/killbill-queue-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.7/killbill-queue-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.7/killbill-queue-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_7.xml b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_7.xml
new file mode 100644
index 0000000..c5141fe
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_commons_killbill_queue_test_jar_tests_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.commons:killbill-queue:test-jar:tests:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.7/killbill-queue-0.1.7-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.7/killbill-queue-0.1.7-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/commons/killbill-queue/0.1.7/killbill-queue-0.1.7-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_3_4_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_3_4_SNAPSHOT.xml
new file mode 100644
index 0000000..7112ca8
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_3_4_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-account:test-jar:tests:0.3.4-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-account/0.3.4-SNAPSHOT/killbill-account-0.3.4-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-account/0.3.4-SNAPSHOT/killbill-account-0.3.4-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-account/0.3.4-SNAPSHOT/killbill-account-0.3.4-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_3_4_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_3_4_SNAPSHOT.xml
new file mode 100644
index 0000000..93dbeea
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_3_4_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-beatrix:test-jar:tests:0.3.4-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-beatrix/0.3.4-SNAPSHOT/killbill-beatrix-0.3.4-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-beatrix/0.3.4-SNAPSHOT/killbill-beatrix-0.3.4-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-beatrix/0.3.4-SNAPSHOT/killbill-beatrix-0.3.4-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_3_4_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_3_4_SNAPSHOT.xml
new file mode 100644
index 0000000..c314c0c
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_3_4_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.3.4-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-catalog/0.3.4-SNAPSHOT/killbill-catalog-0.3.4-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-catalog/0.3.4-SNAPSHOT/killbill-catalog-0.3.4-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-catalog/0.3.4-SNAPSHOT/killbill-catalog-0.3.4-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_3_4_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_3_4_SNAPSHOT.xml
new file mode 100644
index 0000000..1f0f1dc
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_3_4_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-invoice:test-jar:tests:0.3.4-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-invoice/0.3.4-SNAPSHOT/killbill-invoice-0.3.4-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-invoice/0.3.4-SNAPSHOT/killbill-invoice-0.3.4-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-invoice/0.3.4-SNAPSHOT/killbill-invoice-0.3.4-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_3_4_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_3_4_SNAPSHOT.xml
new file mode 100644
index 0000000..cf6eeae
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_3_4_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-junction:test-jar:tests:0.3.4-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-junction/0.3.4-SNAPSHOT/killbill-junction-0.3.4-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-junction/0.3.4-SNAPSHOT/killbill-junction-0.3.4-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-junction/0.3.4-SNAPSHOT/killbill-junction-0.3.4-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_analytics_0_3_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_analytics_0_3_2.xml b/.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_analytics_0_3_2.xml
new file mode 100644
index 0000000..1b2bf03
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_osgi_bundles_analytics_0_3_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-osgi-bundles-analytics:0.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-osgi-bundles-analytics/0.3.2/killbill-osgi-bundles-analytics-0.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-osgi-bundles-analytics/0.3.2/killbill-osgi-bundles-analytics-0.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-osgi-bundles-analytics/0.3.2/killbill-osgi-bundles-analytics-0.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_3_4_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_3_4_SNAPSHOT.xml
new file mode 100644
index 0000000..174847a
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_3_4_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.3.4-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-payment/0.3.4-SNAPSHOT/killbill-payment-0.3.4-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-payment/0.3.4-SNAPSHOT/killbill-payment-0.3.4-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-payment/0.3.4-SNAPSHOT/killbill-payment-0.3.4-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_3_4_SNAPSHOT.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_3_4_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_3_4_SNAPSHOT.xml
new file mode 100644
index 0000000..dc43b4f
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_3_4_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-util/0.3.4-SNAPSHOT/killbill-util-0.3.4-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-util/0.3.4-SNAPSHOT/killbill-util-0.3.4-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-util/0.3.4-SNAPSHOT/killbill-util-0.3.4-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_2_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_2_5.xml b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_2_5.xml
new file mode 100644
index 0000000..693d729
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_2_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-notification/0.2.5/killbill-plugin-api-notification-0.2.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-notification/0.2.5/killbill-plugin-api-notification-0.2.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-notification/0.2.5/killbill-plugin-api-notification-0.2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_2_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_2_5.xml b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_2_5.xml
new file mode 100644
index 0000000..a3dd52f
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_2_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-payment/0.2.5/killbill-plugin-api-payment-0.2.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-payment/0.2.5/killbill-plugin-api-payment-0.2.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-payment/0.2.5/killbill-plugin-api-payment-0.2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_jaxrs_jaxrs_metrics_2_0_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_jaxrs_jaxrs_metrics_2_0_0.xml b/.idea/libraries/Maven__com_ning_jaxrs_jaxrs_metrics_2_0_0.xml
new file mode 100644
index 0000000..978a659
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_jaxrs_jaxrs_metrics_2_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.jaxrs:jaxrs-metrics:2.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jaxrs/jaxrs-metrics/2.0.0/jaxrs-metrics-2.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jaxrs/jaxrs-metrics/2.0.0/jaxrs-metrics-2.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jaxrs/jaxrs-metrics/2.0.0/jaxrs-metrics-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_base_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_base_0_1_7.xml b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_base_0_1_7.xml
new file mode 100644
index 0000000..76ef745
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_base_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.jetty:ning-service-skeleton-base:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-base/0.1.7/ning-service-skeleton-base-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-base/0.1.7/ning-service-skeleton-base-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-base/0.1.7/ning-service-skeleton-base-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_core_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_core_0_1_7.xml b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_core_0_1_7.xml
new file mode 100644
index 0000000..a84ffdb
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_core_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.jetty:ning-service-skeleton-core:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-core/0.1.7/ning-service-skeleton-core-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-core/0.1.7/ning-service-skeleton-core-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-core/0.1.7/ning-service-skeleton-core-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_eventtracker_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_eventtracker_0_1_7.xml b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_eventtracker_0_1_7.xml
new file mode 100644
index 0000000..0cae60b
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_eventtracker_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.jetty:ning-service-skeleton-eventtracker:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-eventtracker/0.1.7/ning-service-skeleton-eventtracker-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-eventtracker/0.1.7/ning-service-skeleton-eventtracker-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-eventtracker/0.1.7/ning-service-skeleton-eventtracker-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_jdbi_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_jdbi_0_1_7.xml b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_jdbi_0_1_7.xml
new file mode 100644
index 0000000..d8b0362
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_jdbi_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.jetty:ning-service-skeleton-jdbi:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-jdbi/0.1.7/ning-service-skeleton-jdbi-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-jdbi/0.1.7/ning-service-skeleton-jdbi-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-jdbi/0.1.7/ning-service-skeleton-jdbi-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_log4j_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_log4j_0_1_7.xml b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_log4j_0_1_7.xml
new file mode 100644
index 0000000..8fb2f60
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_log4j_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.jetty:ning-service-skeleton-log4j:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-log4j/0.1.7/ning-service-skeleton-log4j-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-log4j/0.1.7/ning-service-skeleton-log4j-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-log4j/0.1.7/ning-service-skeleton-log4j-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_utils_0_1_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_utils_0_1_7.xml b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_utils_0_1_7.xml
new file mode 100644
index 0000000..9327f31
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_jetty_ning_service_skeleton_utils_0_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.jetty:ning-service-skeleton-utils:0.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-utils/0.1.7/ning-service-skeleton-utils-0.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-utils/0.1.7/ning-service-skeleton-utils-0.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/jetty/ning-service-skeleton-utils/0.1.7/ning-service-skeleton-utils-0.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_metrics_eventtracker_common_4_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_metrics_eventtracker_common_4_1_2.xml b/.idea/libraries/Maven__com_ning_metrics_eventtracker_common_4_1_2.xml
new file mode 100644
index 0000000..383aee8
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_metrics_eventtracker_common_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:metrics.eventtracker-common:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-common/4.1.2/metrics.eventtracker-common-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-common/4.1.2/metrics.eventtracker-common-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-common/4.1.2/metrics.eventtracker-common-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_metrics_eventtracker_http_4_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_metrics_eventtracker_http_4_1_2.xml b/.idea/libraries/Maven__com_ning_metrics_eventtracker_http_4_1_2.xml
new file mode 100644
index 0000000..c603d2a
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_metrics_eventtracker_http_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:metrics.eventtracker-http:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-http/4.1.2/metrics.eventtracker-http-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-http/4.1.2/metrics.eventtracker-http-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-http/4.1.2/metrics.eventtracker-http-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_metrics_eventtracker_smile_4_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_metrics_eventtracker_smile_4_1_2.xml b/.idea/libraries/Maven__com_ning_metrics_eventtracker_smile_4_1_2.xml
new file mode 100644
index 0000000..711423a
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_metrics_eventtracker_smile_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:metrics.eventtracker-smile:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-smile/4.1.2/metrics.eventtracker-smile-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-smile/4.1.2/metrics.eventtracker-smile-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.eventtracker-smile/4.1.2/metrics.eventtracker-smile-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_metrics_serialization_common_2_2_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_metrics_serialization_common_2_2_0.xml b/.idea/libraries/Maven__com_ning_metrics_serialization_common_2_2_0.xml
new file mode 100644
index 0000000..10dd8e3
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_metrics_serialization_common_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:metrics.serialization-common:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-common/2.2.0/metrics.serialization-common-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-common/2.2.0/metrics.serialization-common-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-common/2.2.0/metrics.serialization-common-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_metrics_serialization_smile_2_2_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_metrics_serialization_smile_2_2_0.xml b/.idea/libraries/Maven__com_ning_metrics_serialization_smile_2_2_0.xml
new file mode 100644
index 0000000..df56432
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_metrics_serialization_smile_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:metrics.serialization-smile:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-smile/2.2.0/metrics.serialization-smile-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-smile/2.2.0/metrics.serialization-smile-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-smile/2.2.0/metrics.serialization-smile-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_ning_metrics_serialization_writer_2_2_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_ning_metrics_serialization_writer_2_2_0.xml b/.idea/libraries/Maven__com_ning_metrics_serialization_writer_2_2_0.xml
new file mode 100644
index 0000000..86a7ba6
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_metrics_serialization_writer_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:metrics.serialization-writer:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-writer/2.2.0/metrics.serialization-writer-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-writer/2.2.0/metrics.serialization-writer-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/metrics.serialization-writer/2.2.0/metrics.serialization-writer-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_samskivert_jmustache_1_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_samskivert_jmustache_1_5.xml b/.idea/libraries/Maven__com_samskivert_jmustache_1_5.xml
new file mode 100644
index 0000000..2804cc0
--- /dev/null
+++ b/.idea/libraries/Maven__com_samskivert_jmustache_1_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.samskivert:jmustache:1.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/samskivert/jmustache/1.5/jmustache-1.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/samskivert/jmustache/1.5/jmustache-1.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/samskivert/jmustache/1.5/jmustache-1.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_sun_jersey_contribs_jersey_guice_1_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_guice_1_12.xml b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_guice_1_12.xml
new file mode 100644
index 0000000..50c2091
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_guice_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey.contribs:jersey-guice:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-guice/1.12/jersey-guice-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-guice/1.12/jersey-guice-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-guice/1.12/jersey-guice-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_sun_jersey_jersey_core_1_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_12.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_12.xml
new file mode 100644
index 0000000..74e2385
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey:jersey-core:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.12/jersey-core-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.12/jersey-core-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.12/jersey-core-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_sun_jersey_jersey_server_1_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_12.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_12.xml
new file mode 100644
index 0000000..4222ab3
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey:jersey-server:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.12/jersey-server-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.12/jersey-server-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.12/jersey-server-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_12.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_12.xml
new file mode 100644
index 0000000..1af4d26
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey:jersey-servlet:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-servlet/1.12/jersey-servlet-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-servlet/1.12/jersey-servlet-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-servlet/1.12/jersey-servlet-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_yammer_metrics_metrics_annotation_2_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_annotation_2_1_2.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_annotation_2_1_2.xml
new file mode 100644
index 0000000..a3e0b7c
--- /dev/null
+++ b/.idea/libraries/Maven__com_yammer_metrics_metrics_annotation_2_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.yammer.metrics:metrics-annotation:2.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-annotation/2.1.2/metrics-annotation-2.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-annotation/2.1.2/metrics-annotation-2.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-annotation/2.1.2/metrics-annotation-2.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_1_2.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_1_2.xml
new file mode 100644
index 0000000..f31dbe6
--- /dev/null
+++ b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.yammer.metrics:metrics-core:2.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-core/2.1.2/metrics-core-2.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-core/2.1.2/metrics-core-2.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-core/2.1.2/metrics-core-2.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_yammer_metrics_metrics_guice_2_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_guice_2_1_2.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_guice_2_1_2.xml
new file mode 100644
index 0000000..32c8ccb
--- /dev/null
+++ b/.idea/libraries/Maven__com_yammer_metrics_metrics_guice_2_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.yammer.metrics:metrics-guice:2.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-guice/2.1.2/metrics-guice-2.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-guice/2.1.2/metrics-guice-2.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-guice/2.1.2/metrics-guice-2.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_yammer_metrics_metrics_jdbi_2_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_jdbi_2_1_2.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_jdbi_2_1_2.xml
new file mode 100644
index 0000000..5253860
--- /dev/null
+++ b/.idea/libraries/Maven__com_yammer_metrics_metrics_jdbi_2_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.yammer.metrics:metrics-jdbi:2.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-jdbi/2.1.2/metrics-jdbi-2.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-jdbi/2.1.2/metrics-jdbi-2.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-jdbi/2.1.2/metrics-jdbi-2.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__com_yammer_metrics_metrics_servlet_2_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_servlet_2_1_2.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_servlet_2_1_2.xml
new file mode 100644
index 0000000..56a527a
--- /dev/null
+++ b/.idea/libraries/Maven__com_yammer_metrics_metrics_servlet_2_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.yammer.metrics:metrics-servlet:2.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-servlet/2.1.2/metrics-servlet-2.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-servlet/2.1.2/metrics-servlet-2.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-servlet/2.1.2/metrics-servlet-2.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml
new file mode 100644
index 0000000..52b553d
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-beanutils:commons-beanutils:1.8.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__commons_io_commons_io_2_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_1.xml b/.idea/libraries/Maven__commons_io_commons_io_2_1.xml
new file mode 100644
index 0000000..3b78142
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.1/commons-io-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.1/commons-io-2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.1/commons-io-2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
new file mode 100644
index 0000000..2ec8376
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-lang:commons-lang:2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__io_netty_netty_3_3_1_Final.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__io_netty_netty_3_3_1_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_3_1_Final.xml
new file mode 100644
index 0000000..57cab23
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_3_3_1_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty:3.3.1.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.3.1.Final/netty-3.3.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.3.1.Final/netty-3.3.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.3.1.Final/netty-3.3.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__javax_activation_activation_1_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
new file mode 100644
index 0000000..180d587
--- /dev/null
+++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:activation:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__javax_inject_javax_inject_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
new file mode 100644
index 0000000..93cf65a
--- /dev/null
+++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.inject:javax.inject:1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__javax_mail_mail_1_4_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml
new file mode 100644
index 0000000..2c155f3
--- /dev/null
+++ b/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.mail:mail:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.1/mail-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.1/mail-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml
new file mode 100644
index 0000000..63d10f6
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:javax.servlet-api:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
new file mode 100644
index 0000000..a0c4d76
--- /dev/null
+++ b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.ws.rs:jsr311-api:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__joda_time_joda_time_2_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_0.xml b/.idea/libraries/Maven__joda_time_joda_time_2_0.xml
new file mode 100644
index 0000000..9c364b1
--- /dev/null
+++ b/.idea/libraries/Maven__joda_time_joda_time_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: joda-time:joda-time:2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.0/joda-time-2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.0/joda-time-2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.0/joda-time-2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__junit_junit_3_8_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__junit_junit_3_8_1.xml b/.idea/libraries/Maven__junit_junit_3_8_1.xml
new file mode 100644
index 0000000..71b2993
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_3_8_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:3.8.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__mysql_mysql_connector_java_5_1_22.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_22.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_22.xml
new file mode 100644
index 0000000..869e1a9
--- /dev/null
+++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_22.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: mysql:mysql-connector-java:5.1.22">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.22/mysql-connector-java-5.1.22.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.22/mysql-connector-java-5.1.22-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.22/mysql-connector-java-5.1.22-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__mysql_mysql_connector_mxj_5_0_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__mysql_mysql_connector_mxj_5_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_mxj_5_0_12.xml
new file mode 100644
index 0000000..fdf96aa
--- /dev/null
+++ b/.idea/libraries/Maven__mysql_mysql_connector_mxj_5_0_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: mysql:mysql-connector-mxj:5.0.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-mxj/5.0.12/mysql-connector-mxj-5.0.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-mxj/5.0.12/mysql-connector-mxj-5.0.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-mxj/5.0.12/mysql-connector-mxj-5.0.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__mysql_mysql_connector_mxj_db_files_5_0_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__mysql_mysql_connector_mxj_db_files_5_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_mxj_db_files_5_0_12.xml
new file mode 100644
index 0000000..f52ffeb
--- /dev/null
+++ b/.idea/libraries/Maven__mysql_mysql_connector_mxj_db_files_5_0_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-mxj-db-files/5.0.12/mysql-connector-mxj-db-files-5.0.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-mxj-db-files/5.0.12/mysql-connector-mxj-db-files-5.0.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-mxj-db-files/5.0.12/mysql-connector-mxj-db-files-5.0.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_2.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_2.xml
new file mode 100644
index 0000000..1ed5b11
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.ehcache:ehcache-core:2.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.2/ehcache-core-2.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.2/ehcache-core-2.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.2/ehcache-core-2.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__net_sf_kxml_kxml2_2_2_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__net_sf_kxml_kxml2_2_2_2.xml b/.idea/libraries/Maven__net_sf_kxml_kxml2_2_2_2.xml
new file mode 100644
index 0000000..07bb263
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_kxml_kxml2_2_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.kxml:kxml2:2.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
new file mode 100644
index 0000000..6998bac
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.antlr:stringtemplate:3.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_commons_commons_compress_1_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_5.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_5.xml
new file mode 100644
index 0000000..182bcf9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-compress:1.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.5/commons-compress-1.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.5/commons-compress-1.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.5/commons-compress-1.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml
new file mode 100644
index 0000000..9ae605b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-email:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-email/1.2/commons-email-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-email/1.2/commons-email-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-email/1.2/commons-email-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_bundlerepository_1_6_6.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_bundlerepository_1_6_6.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_bundlerepository_1_6_6.xml
new file mode 100644
index 0000000..2375dba
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_bundlerepository_1_6_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.bundlerepository:1.6.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml 13(+13 -0) 

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
new file mode 100644
index 0000000..fbf058b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.configadmin:1.6.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.configadmin/1.6.0/org.apache.felix.configadmin-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.configadmin/1.6.0/org.apache.felix.configadmin-1.6.0-javadoc.jar!/" />
+    </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!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_3_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_3_1_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_3_1_0.xml
new file mode 100644
index 0000000..38e675b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.dependencymanager:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager/3.1.0/org.apache.felix.dependencymanager-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager/3.1.0/org.apache.felix.dependencymanager-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager/3.1.0/org.apache.felix.dependencymanager-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_annotation_3_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_annotation_3_1_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_annotation_3_1_0.xml
new file mode 100644
index 0000000..10684b6
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_annotation_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.dependencymanager.annotation:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.annotation/3.1.0/org.apache.felix.dependencymanager.annotation-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.annotation/3.1.0/org.apache.felix.dependencymanager.annotation-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.annotation/3.1.0/org.apache.felix.dependencymanager.annotation-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_compat_3_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_compat_3_0_1.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_compat_3_0_1.xml
new file mode 100644
index 0000000..0e316ea
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_compat_3_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.dependencymanager.compat:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.compat/3.0.1/org.apache.felix.dependencymanager.compat-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.compat/3.0.1/org.apache.felix.dependencymanager.compat-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.compat/3.0.1/org.apache.felix.dependencymanager.compat-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_runtime_3_1_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_runtime_3_1_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_runtime_3_1_0.xml
new file mode 100644
index 0000000..f9fa667
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_runtime_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.dependencymanager.runtime:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.runtime/3.1.0/org.apache.felix.dependencymanager.runtime-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.runtime/3.1.0/org.apache.felix.dependencymanager.runtime-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.runtime/3.1.0/org.apache.felix.dependencymanager.runtime-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_shell_3_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_shell_3_0_1.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_shell_3_0_1.xml
new file mode 100644
index 0000000..8cc5d2f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_dependencymanager_shell_3_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.dependencymanager.shell:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.shell/3.0.1/org.apache.felix.dependencymanager.shell-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.shell/3.0.1/org.apache.felix.dependencymanager.shell-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.dependencymanager.shell/3.0.1/org.apache.felix.dependencymanager.shell-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_deploymentadmin_0_9_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_deploymentadmin_0_9_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_deploymentadmin_0_9_0.xml
new file mode 100644
index 0000000..cc157ea
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_deploymentadmin_0_9_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.deploymentadmin:0.9.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.deploymentadmin/0.9.0/org.apache.felix.deploymentadmin-0.9.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.deploymentadmin/0.9.0/org.apache.felix.deploymentadmin-0.9.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.deploymentadmin/0.9.0/org.apache.felix.deploymentadmin-0.9.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_4_0_3.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_4_0_3.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_4_0_3.xml
new file mode 100644
index 0000000..a7aabc8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_4_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.framework:4.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.framework/4.0.3/org.apache.felix.framework-4.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.framework/4.0.3/org.apache.felix.framework-4.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <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

.idea/libraries/Maven__org_apache_felix_org_apache_felix_gogo_runtime_0_10_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_gogo_runtime_0_10_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_gogo_runtime_0_10_0.xml
new file mode 100644
index 0000000..6e2c3da
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_gogo_runtime_0_10_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.gogo.runtime:0.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_log_1_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_log_1_0_1.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_log_1_0_1.xml
new file mode 100644
index 0000000..b4e404c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_log_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.log:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.log/1.0.1/org.apache.felix.log-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.log/1.0.1/org.apache.felix.log-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.log/1.0.1/org.apache.felix.log-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_metatype_1_0_6.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_metatype_1_0_6.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_metatype_1_0_6.xml
new file mode 100644
index 0000000..c5c5159
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_metatype_1_0_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.metatype:1.0.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.metatype/1.0.6/org.apache.felix.metatype-1.0.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.metatype/1.0.6/org.apache.felix.metatype-1.0.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.metatype/1.0.6/org.apache.felix.metatype-1.0.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_1_6_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_1_6_2.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_1_6_2.xml
new file mode 100644
index 0000000..99ea257
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_1_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.scr:1.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr/1.6.2/org.apache.felix.scr-1.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr/1.6.2/org.apache.felix.scr-1.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr/1.6.2/org.apache.felix.scr-1.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_annotations_1_7_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_annotations_1_7_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_annotations_1_7_0.xml
new file mode 100644
index 0000000..71ace50
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_annotations_1_7_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.scr.annotations:1.7.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr.annotations/1.7.0/org.apache.felix.scr.annotations-1.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr.annotations/1.7.0/org.apache.felix.scr.annotations-1.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr.annotations/1.7.0/org.apache.felix.scr.annotations-1.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_ds_annotations_1_2_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_ds_annotations_1_2_0.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_ds_annotations_1_2_0.xml
new file mode 100644
index 0000000..206a360
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_scr_ds_annotations_1_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.scr.ds-annotations:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr.ds-annotations/1.2.0/org.apache.felix.scr.ds-annotations-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr.ds-annotations/1.2.0/org.apache.felix.scr.ds-annotations-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.scr.ds-annotations/1.2.0/org.apache.felix.scr.ds-annotations-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_1_4_3.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_1_4_3.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_1_4_3.xml
new file mode 100644
index 0000000..ce8c0c8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_1_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.shell:1.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.shell/1.4.3/org.apache.felix.shell-1.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.shell/1.4.3/org.apache.felix.shell-1.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.shell/1.4.3/org.apache.felix.shell-1.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_remote_1_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_remote_1_1_2.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_remote_1_1_2.xml
new file mode 100644
index 0000000..007d0ee
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_shell_remote_1_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.shell.remote:1.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.shell.remote/1.1.2/org.apache.felix.shell.remote-1.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.shell.remote/1.1.2/org.apache.felix.shell.remote-1.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.shell.remote/1.1.2/org.apache.felix.shell.remote-1.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_apache_felix_webconsole_3_1_8.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_apache_felix_webconsole_3_1_8.xml b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_webconsole_3_1_8.xml
new file mode 100644
index 0000000..8177364
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_apache_felix_webconsole_3_1_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.apache.felix.webconsole:3.1.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.webconsole/3.1.8/org.apache.felix.webconsole-3.1.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.webconsole/3.1.8/org.apache.felix.webconsole-3.1.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.apache.felix.webconsole/3.1.8/org.apache.felix.webconsole-3.1.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_felix_org_osgi_core_1_0_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_felix_org_osgi_core_1_0_1.xml b/.idea/libraries/Maven__org_apache_felix_org_osgi_core_1_0_1.xml
new file mode 100644
index 0000000..6e81f0c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_felix_org_osgi_core_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.felix:org.osgi.core:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_artifact_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_artifact_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_artifact_2_0_7.xml
new file mode 100644
index 0000000..23bff67
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_artifact_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-artifact:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_0_7.xml
new file mode 100644
index 0000000..80dcf79
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-artifact-manager:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_model_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_2_0_7.xml
new file mode 100644
index 0000000..93edb24
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_model_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-model:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_plugin_api_2_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_2_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_2_0.xml
new file mode 100644
index 0000000..b617ce2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-plugin-api:2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_0_7.xml
new file mode 100644
index 0000000..dcc4714
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-plugin-registry:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_profile_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_profile_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_profile_2_0_7.xml
new file mode 100644
index 0000000..d343626
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_profile_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-profile:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_project_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_project_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_project_2_0_7.xml
new file mode 100644
index 0000000..ff38d6a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_project_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-project:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_2_0_7.xml
new file mode 100644
index 0000000..e02259c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-repository-metadata:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_maven_settings_2_0_7.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_2_0_7.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_2_0_7.xml
new file mode 100644
index 0000000..1a6f81f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_maven_settings_2_0_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-settings:2.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_1_0_beta_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_1_0_beta_2.xml b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_1_0_beta_2.xml
new file mode 100644
index 0000000..0ce749a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_1_0_beta_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_shiro_shiro_core_1_2_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_2_1.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_2_1.xml
new file mode 100644
index 0000000..01b8779
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-core:1.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.2.1/shiro-core-1.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.2.1/shiro-core-1.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.2.1/shiro-core-1.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_apache_shiro_shiro_web_1_2_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_2_1.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_2_1.xml
new file mode 100644
index 0000000..ae0b349
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-web:1.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.2.1/shiro-web-1.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.2.1/shiro-web-1.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.2.1/shiro-web-1.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
new file mode 100644
index 0000000..d6f17aa
--- /dev/null
+++ b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.beanshell:bsh:2.0b4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_5.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_5.xml
new file mode 100644
index 0000000..5ceb6c0
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.5/jackson-core-asl-1.9.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.5/jackson-core-asl-1.9.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.5/jackson-core-asl-1.9.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_5.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_5.xml
new file mode 100644
index 0000000..ece7f39
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.5/jackson-mapper-asl-1.9.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.5/jackson-mapper-asl-1.9.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.5/jackson-mapper-asl-1.9.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1.xml
new file mode 100644
index 0000000..a121f49
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_1_4_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_1_4_1.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_1_4_1.xml
new file mode 100644
index 0000000..4ee4f56
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_1_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-utils:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_easymock_easymock_2_4.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_easymock_easymock_2_4.xml b/.idea/libraries/Maven__org_easymock_easymock_2_4.xml
new file mode 100644
index 0000000..42b7364
--- /dev/null
+++ b/.idea/libraries/Maven__org_easymock_easymock_2_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.easymock:easymock:2.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymock/2.4/easymock-2.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymock/2.4/easymock-2.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymock/2.4/easymock-2.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_8_1_11_v20130520.xml
new file mode 100644
index 0000000..f2fbc3e
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-continuation:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_8_1_11_v20130520.xml
new file mode 100644
index 0000000..2ac1340
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-deploy:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-deploy/8.1.11.v20130520/jetty-deploy-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-deploy/8.1.11.v20130520/jetty-deploy-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-deploy/8.1.11.v20130520/jetty-deploy-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_http_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_8_1_11_v20130520.xml
new file mode 100644
index 0000000..0f8ac93
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-http:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_io_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_8_1_11_v20130520.xml
new file mode 100644
index 0000000..32ae4ee
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-io:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_8_1_11_v20130520.xml
new file mode 100644
index 0000000..1b4d7a3
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-jmx:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-jmx/8.1.11.v20130520/jetty-jmx-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-jmx/8.1.11.v20130520/jetty-jmx-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-jmx/8.1.11.v20130520/jetty-jmx-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_security_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_8_1_11_v20130520.xml
new file mode 100644
index 0000000..18a704f
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-security:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-security/8.1.11.v20130520/jetty-security-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-security/8.1.11.v20130520/jetty-security-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-security/8.1.11.v20130520/jetty-security-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_server_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_8_1_11_v20130520.xml
new file mode 100644
index 0000000..ca5991c
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-server:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_8_1_11_v20130520.xml
new file mode 100644
index 0000000..6b09441
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-servlet:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-servlet/8.1.11.v20130520/jetty-servlet-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-servlet/8.1.11.v20130520/jetty-servlet-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-servlet/8.1.11.v20130520/jetty-servlet-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_util_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_8_1_11_v20130520.xml
new file mode 100644
index 0000000..3eca031
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-util:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_8_1_11_v20130520.xml
new file mode 100644
index 0000000..f08377e
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-webapp:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-webapp/8.1.11.v20130520/jetty-webapp-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-webapp/8.1.11.v20130520/jetty-webapp-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-webapp/8.1.11.v20130520/jetty-webapp-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_8_1_11_v20130520.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_8_1_11_v20130520.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_8_1_11_v20130520.xml
new file mode 100644
index 0000000..b547b66
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_8_1_11_v20130520.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-xml:8.1.11.v20130520">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-xml/8.1.11.v20130520/jetty-xml-8.1.11.v20130520.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-xml/8.1.11.v20130520/jetty-xml-8.1.11.v20130520-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-xml/8.1.11.v20130520/jetty-xml-8.1.11.v20130520-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml b/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
new file mode 100644
index 0000000..7dc899a
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
new file mode 100644
index 0000000..acdf443
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml
new file mode 100644
index 0000000..010812a
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-library:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_jdbi_jdbi_2_39_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_jdbi_jdbi_2_39_1.xml b/.idea/libraries/Maven__org_jdbi_jdbi_2_39_1.xml
new file mode 100644
index 0000000..89b5be4
--- /dev/null
+++ b/.idea/libraries/Maven__org_jdbi_jdbi_2_39_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jdbi:jdbi:2.39.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jdbi/jdbi/2.39.1/jdbi-2.39.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jdbi/jdbi/2.39.1/jdbi-2.39.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jdbi/jdbi/2.39.1/jdbi-2.39.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_jruby_jruby_complete_1_7_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_jruby_jruby_complete_1_7_1.xml b/.idea/libraries/Maven__org_jruby_jruby_complete_1_7_1.xml
new file mode 100644
index 0000000..d3f0c51
--- /dev/null
+++ b/.idea/libraries/Maven__org_jruby_jruby_complete_1_7_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jruby:jruby-complete:1.7.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jruby/jruby-complete/1.7.1/jruby-complete-1.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jruby/jruby-complete/1.7.1/jruby-complete-1.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jruby/jruby-complete/1.7.1/jruby-complete-1.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_json_json_20070829.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_json_json_20070829.xml b/.idea/libraries/Maven__org_json_json_20070829.xml
new file mode 100644
index 0000000..777984a
--- /dev/null
+++ b/.idea/libraries/Maven__org_json_json_20070829.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.json:json:20070829">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20070829/json-20070829.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20070829/json-20070829-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20070829/json-20070829-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_mockito_mockito_all_1_9_0.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_mockito_mockito_all_1_9_0.xml b/.idea/libraries/Maven__org_mockito_mockito_all_1_9_0.xml
new file mode 100644
index 0000000..8be7373
--- /dev/null
+++ b/.idea/libraries/Maven__org_mockito_mockito_all_1_9_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-all:1.9.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
new file mode 100644
index 0000000..74d2abc
--- /dev/null
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.objenesis:objenesis:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.2/objenesis-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.2/objenesis-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.2/objenesis-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_osgi_org_osgi_compendium_4_3_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_osgi_org_osgi_compendium_4_3_1.xml b/.idea/libraries/Maven__org_osgi_org_osgi_compendium_4_3_1.xml
new file mode 100644
index 0000000..cecc4b0
--- /dev/null
+++ b/.idea/libraries/Maven__org_osgi_org_osgi_compendium_4_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.osgi:org.osgi.compendium:4.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/osgi/org.osgi.compendium/4.3.1/org.osgi.compendium-4.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/osgi/org.osgi.compendium/4.3.1/org.osgi.compendium-4.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/osgi/org.osgi.compendium/4.3.1/org.osgi.compendium-4.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_osgi_org_osgi_core_4_3_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_osgi_org_osgi_core_4_3_1.xml b/.idea/libraries/Maven__org_osgi_org_osgi_core_4_3_1.xml
new file mode 100644
index 0000000..ace275f
--- /dev/null
+++ b/.idea/libraries/Maven__org_osgi_org_osgi_core_4_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.osgi:org.osgi.core:4.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_skife_config_config_magic_0_14.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_skife_config_config_magic_0_14.xml b/.idea/libraries/Maven__org_skife_config_config_magic_0_14.xml
new file mode 100644
index 0000000..4ee6817
--- /dev/null
+++ b/.idea/libraries/Maven__org_skife_config_config_magic_0_14.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.skife.config:config-magic:0.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skife/config/config-magic/0.14/config-magic-0.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skife/config/config-magic/0.14/config-magic-0.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skife/config/config-magic/0.14/config-magic-0.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml
new file mode 100644
index 0000000..8872ae7
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_5.xml
new file mode 100644
index 0000000..b4727ae
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.5/jul-to-slf4j-1.7.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.5/jul-to-slf4j-1.7.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.5/jul-to-slf4j-1.7.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_slf4j_osgi_over_slf4j_1_7_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_slf4j_osgi_over_slf4j_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_osgi_over_slf4j_1_7_5.xml
new file mode 100644
index 0000000..3818402
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_osgi_over_slf4j_1_7_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:osgi-over-slf4j:1.7.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/osgi-over-slf4j/1.7.5/osgi-over-slf4j-1.7.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/osgi-over-slf4j/1.7.5/osgi-over-slf4j-1.7.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/osgi-over-slf4j/1.7.5/osgi-over-slf4j-1.7.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml
new file mode 100644
index 0000000..6f808f1
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_5.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_5.xml
new file mode 100644
index 0000000..42b8c2b
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-simple:1.7.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_testng_testng_6_3_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_testng_testng_6_3_1.xml b/.idea/libraries/Maven__org_testng_testng_6_3_1.xml
new file mode 100644
index 0000000..37547cc
--- /dev/null
+++ b/.idea/libraries/Maven__org_testng_testng_6_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.testng:testng:6.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.3.1/testng-6.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.3.1/testng-6.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.3.1/testng-6.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_tukaani_xz_1_2.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_tukaani_xz_1_2.xml b/.idea/libraries/Maven__org_tukaani_xz_1_2.xml
new file mode 100644
index 0000000..bef050e
--- /dev/null
+++ b/.idea/libraries/Maven__org_tukaani_xz_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.tukaani:xz:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.2/xz-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.2/xz-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.2/xz-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_weakref_jmxutils_1_12.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_weakref_jmxutils_1_12.xml b/.idea/libraries/Maven__org_weakref_jmxutils_1_12.xml
new file mode 100644
index 0000000..81b18b4
--- /dev/null
+++ b/.idea/libraries/Maven__org_weakref_jmxutils_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.weakref:jmxutils:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/weakref/jmxutils/1.12/jmxutils-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/weakref/jmxutils/1.12/jmxutils-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/weakref/jmxutils/1.12/jmxutils-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml
new file mode 100644
index 0000000..0f8bd19
--- /dev/null
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.yaml:snakeyaml:1.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml 13(+13 -0) 

diff --git a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
new file mode 100644
index 0000000..0f2d9ef
--- /dev/null
+++ b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xmlpull:xmlpull:1.1.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

.idea/misc.xml 17(+17 -0) 

diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..8a80acb
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
+

.idea/modules.xml 37(+37 -0) 

diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..d5ca1f3
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/killbill.iml" filepath="$PROJECT_DIR$/killbill.iml" />
+      <module fileurl="file://$PROJECT_DIR$/account/killbill-account.iml" filepath="$PROJECT_DIR$/account/killbill-account.iml" />
+      <module fileurl="file://$PROJECT_DIR$/beatrix/killbill-beatrix.iml" filepath="$PROJECT_DIR$/beatrix/killbill-beatrix.iml" />
+      <module fileurl="file://$PROJECT_DIR$/catalog/killbill-catalog.iml" filepath="$PROJECT_DIR$/catalog/killbill-catalog.iml" />
+      <module fileurl="file://$PROJECT_DIR$/entitlement/killbill-entitlement.iml" filepath="$PROJECT_DIR$/entitlement/killbill-entitlement.iml" />
+      <module fileurl="file://$PROJECT_DIR$/api/killbill-internal-api.iml" filepath="$PROJECT_DIR$/api/killbill-internal-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/invoice/killbill-invoice.iml" filepath="$PROJECT_DIR$/invoice/killbill-invoice.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jaxrs/killbill-jaxrs.iml" filepath="$PROJECT_DIR$/jaxrs/killbill-jaxrs.iml" />
+      <module fileurl="file://$PROJECT_DIR$/junction/killbill-junction.iml" filepath="$PROJECT_DIR$/junction/killbill-junction.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi/killbill-osgi.iml" filepath="$PROJECT_DIR$/osgi/killbill-osgi.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/killbill-osgi-all-bundles.iml" filepath="$PROJECT_DIR$/osgi-bundles/killbill-osgi-all-bundles.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/bundles/killbill-osgi-bundles.iml" filepath="$PROJECT_DIR$/osgi-bundles/bundles/killbill-osgi-bundles.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml" filepath="$PROJECT_DIR$/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml" filepath="$PROJECT_DIR$/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml" filepath="$PROJECT_DIR$/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/libs/slf4j-osgi/killbill-osgi-bundles-lib-slf4j-osgi.iml" filepath="$PROJECT_DIR$/osgi-bundles/libs/slf4j-osgi/killbill-osgi-bundles-lib-slf4j-osgi.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/bundles/logger/killbill-osgi-bundles-logger.iml" filepath="$PROJECT_DIR$/osgi-bundles/bundles/logger/killbill-osgi-bundles-logger.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml" filepath="$PROJECT_DIR$/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml" filepath="$PROJECT_DIR$/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/bundles/webconsolebranding/killbill-osgi-bundles-webconsolebranding.iml" filepath="$PROJECT_DIR$/osgi-bundles/bundles/webconsolebranding/killbill-osgi-bundles-webconsolebranding.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/libs/killbill-osgi-lib-bundles.iml" filepath="$PROJECT_DIR$/osgi-bundles/libs/killbill-osgi-lib-bundles.iml" />
+      <module fileurl="file://$PROJECT_DIR$/osgi-bundles/tests/killbill-osgi-test-bundles.iml" filepath="$PROJECT_DIR$/osgi-bundles/tests/killbill-osgi-test-bundles.iml" />
+      <module fileurl="file://$PROJECT_DIR$/overdue/killbill-overdue.iml" filepath="$PROJECT_DIR$/overdue/killbill-overdue.iml" />
+      <module fileurl="file://$PROJECT_DIR$/payment/killbill-payment.iml" filepath="$PROJECT_DIR$/payment/killbill-payment.iml" />
+      <module fileurl="file://$PROJECT_DIR$/server/killbill-server.iml" filepath="$PROJECT_DIR$/server/killbill-server.iml" />
+      <module fileurl="file://$PROJECT_DIR$/subscription/killbill-subscription.iml" filepath="$PROJECT_DIR$/subscription/killbill-subscription.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tenant/killbill-tenant.iml" filepath="$PROJECT_DIR$/tenant/killbill-tenant.iml" />
+      <module fileurl="file://$PROJECT_DIR$/usage/killbill-usage.iml" filepath="$PROJECT_DIR$/usage/killbill-usage.iml" />
+      <module fileurl="file://$PROJECT_DIR$/util/killbill-util.iml" filepath="$PROJECT_DIR$/util/killbill-util.iml" />
+    </modules>
+  </component>
+</project>
+

.idea/scopes/scope_settings.xml 5(+5 -0) 

diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000..922003b
--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file

.idea/uiDesigner.xml 125(+125 -0) 

diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..3b00020
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
+

.idea/vcs.xml 7(+7 -0) 

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..def6a6a
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+  </component>
+</project>
+

account/killbill-account.iml 65(+65 -0) 

diff --git a/account/killbill-account.iml b/account/killbill-account.iml
new file mode 100644
index 0000000..1361c00
--- /dev/null
+++ b/account/killbill-account.iml
@@ -0,0 +1,65 @@
+<?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" />
+      <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" 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" />
+    <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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <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-SNAPSHOT" 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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

api/killbill-internal-api.iml 23(+23 -0) 

diff --git a/api/killbill-internal-api.iml b/api/killbill-internal-api.iml
new file mode 100644
index 0000000..223bdd8
--- /dev/null
+++ b/api/killbill-internal-api.iml
@@ -0,0 +1,23 @@
+<?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" 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" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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 107(+107 -0) 

diff --git a/beatrix/killbill-beatrix.iml b/beatrix/killbill-beatrix.iml
new file mode 100644
index 0000000..f36a987
--- /dev/null
+++ b/beatrix/killbill-beatrix.iml
@@ -0,0 +1,107 @@
+<?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" />
+      <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" 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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.awaitility:awaitility:1.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+    <orderEntry type="module" module-name="killbill-account" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-account:test-jar:tests:0.3.4-SNAPSHOT" 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" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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="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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-account" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-catalog" />
+    <orderEntry type="module" module-name="killbill-entitlement" />
+    <orderEntry type="module" module-name="killbill-invoice" />
+    <orderEntry type="module" module-name="killbill-invoice" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-invoice:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-junction" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="module" module-name="killbill-junction" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-junction:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-osgi" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-lib-killbill" scope="TEST" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.felix:org.apache.felix.framework:4.0.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.felix:org.osgi.core:1.0.1" level="project" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-jruby" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-concurrent:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.jruby:jruby-complete:1.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-test-beatrix" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-test-payment" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-overdue" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-payment" />
+    <orderEntry type="module" module-name="killbill-payment" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-subscription" />
+    <orderEntry type="module" module-name="killbill-tenant" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+    <orderEntry type="module" module-name="killbill-usage" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-compress:1.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.tukaani:xz:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java 2(+1 -1) 

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java
index 4061d25..520eadd 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java
@@ -727,7 +727,7 @@ public class TestOverdueIntegration extends TestOverdueBase {
             }
         } else {
             // Upgrade - we don't expect a payment here due to the scenario (the account will have some CBA)
-            changeSubscriptionAndCheckForCompletion(subscription, "Assault-Rifle", BillingPeriod.MONTHLY, NextEvent.CHANGE, NextEvent.INVOICE);
+            changeSubscriptionAndCheckForCompletion(subscription, "Assault-Rifle", BillingPeriod.MONTHLY, NextEvent.CHANGE, NextEvent.INVOICE, NextEvent.INVOICE_ADJUSTMENT);
         }
     }
 }

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java 87(+47 -40) 

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
index 82b5e58..2a516f6 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
@@ -16,13 +16,27 @@
 
 package com.ning.billing.beatrix.integration;
 
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.inject.Guice;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Stage;
-import com.google.inject.name.Named;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDate;
+import org.skife.jdbi.v2.IDBI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+
 import com.ning.billing.account.api.Account;
 import com.ning.billing.account.api.AccountData;
 import com.ning.billing.account.api.AccountService;
@@ -77,22 +91,12 @@ import com.ning.billing.util.config.OSGIConfig;
 import com.ning.billing.util.svcapi.account.AccountInternalApi;
 import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
 import com.ning.billing.util.svcsapi.bus.BusService;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
 
-import javax.annotation.Nullable;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Stage;
 
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
@@ -113,7 +117,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
     protected static final Logger log = LoggerFactory.getLogger(TestIntegration.class);
     protected static long AT_LEAST_ONE_MONTH_MS = 32L * 24L * 3600L * 1000L;
 
-    protected static final long DELAY = 5000;
+    protected static final long DELAY = 10000;
 
 
     @Inject
@@ -197,6 +201,9 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
     @Inject
     protected RecordIdApi recordIdApi;
 
+    @Inject
+    protected IDBI idbi;
+
     @javax.inject.Inject
     protected CacheControllerDispatcher controlCacheDispatcher;
 
@@ -228,7 +235,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
     public void beforeClass() throws Exception {
         final Injector g = Guice.createInjector(Stage.PRODUCTION, new BeatrixIntegrationModule(configSource));
         g.injectMembers(this);
-        busHandler = new TestApiListener(this);
+        busHandler = new TestApiListener(this, idbi);
 
         SetupBundleWithAssertion setupTest = new SetupBundleWithAssertion("whatever", osgiConfig, "whatever");
         setupTest.cleanBundleInstallDir();
@@ -351,17 +358,17 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
 
     protected AccountData getAccountData(final int billingDay) {
         return new MockAccountBuilder().name(UUID.randomUUID().toString().substring(1, 8))
-                .firstNameLength(6)
-                .email(UUID.randomUUID().toString().substring(1, 8))
-                .phone(UUID.randomUUID().toString().substring(1, 8))
-                .migrated(false)
-                .isNotifiedForInvoices(false)
-                .externalKey(UUID.randomUUID().toString().substring(1, 8))
-                .billingCycleDayLocal(billingDay)
-                .currency(Currency.USD)
-                .paymentMethodId(UUID.randomUUID())
-                .timeZone(DateTimeZone.UTC)
-                .build();
+                                       .firstNameLength(6)
+                                       .email(UUID.randomUUID().toString().substring(1, 8))
+                                       .phone(UUID.randomUUID().toString().substring(1, 8))
+                                       .migrated(false)
+                                       .isNotifiedForInvoices(false)
+                                       .externalKey(UUID.randomUUID().toString().substring(1, 8))
+                                       .billingCycleDayLocal(billingDay)
+                                       .currency(Currency.USD)
+                                       .paymentMethodId(UUID.randomUUID())
+                                       .timeZone(DateTimeZone.UTC)
+                                       .build();
     }
 
     protected void addMonthsAndCheckForCompletion(final int nbMonth, final NextEvent... events) {
@@ -494,9 +501,9 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
             public Subscription apply(@Nullable final Void dontcare) {
                 try {
                     final Subscription subscription = subscriptionUserApi.createSubscription(bundleId,
-                            new PlanPhaseSpecifier(productName, productCategory, billingPeriod, PriceListSet.DEFAULT_PRICELIST_NAME, null),
-                            null,
-                            callContext);
+                                                                                             new PlanPhaseSpecifier(productName, productCategory, billingPeriod, PriceListSet.DEFAULT_PRICELIST_NAME, null),
+                                                                                             null,
+                                                                                             callContext);
                     assertNotNull(subscription);
                     return subscription;
                 } catch (SubscriptionUserApiException e) {
@@ -552,7 +559,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
             public Void apply(@Nullable final Void input) {
                 try {
                     invoiceUserApi.insertCreditForInvoice(account.getId(), invoice.getId(), invoice.getBalance(), invoice.getInvoiceDate(),
-                            account.getCurrency(), callContext);
+                                                          account.getCurrency(), callContext);
                 } catch (InvoiceApiException e) {
                     fail(e.toString());
                 }
@@ -567,7 +574,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
             public Void apply(@Nullable final Void input) {
                 try {
                     invoiceUserApi.insertInvoiceItemAdjustment(account.getId(), invoice.getId(), invoice.getInvoiceItems().get(itemNb - 1).getId(),
-                            invoice.getInvoiceDate(), callContext);
+                                                               invoice.getInvoiceDate(), callContext);
                 } catch (InvoiceApiException e) {
                     fail(e.toString());
                 }

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java 5(+3 -2) 

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
index 6eb52a2..e8b8f87 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
@@ -78,6 +78,7 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
     @Test(groups = {"slow"}, enabled = true)
     public void testAutoInvoiceOffAccount() throws Exception {
         clock.setTime(new DateTime(2012, 5, 1, 0, 3, 42, 0));
+        busHandler.pushExpectedEvents(NextEvent.TAG);
         add_AUTO_INVOICING_OFF_Tag(account.getId(), ObjectType.ACCOUNT);
 
         // set next invoice to fail and create network
@@ -104,7 +105,7 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
         invoices = invoiceApi.getInvoicesByAccount(account.getId(), callContext);
         assertEquals(invoices.size(), 0);
 
-        busHandler.pushExpectedEvents(NextEvent.INVOICE);
+        busHandler.pushExpectedEvents(NextEvent.TAG, NextEvent.INVOICE, NextEvent.PAYMENT);
         remove_AUTO_INVOICING_OFF_Tag(account.getId(), ObjectType.ACCOUNT);
         assertTrue(busHandler.isCompleted(DELAY));
 
@@ -163,7 +164,7 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
 
         add_AUTO_INVOICING_OFF_Tag(baseSubscription.getBundleId(), ObjectType.BUNDLE);
 
-        busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.PHASE, NextEvent.INVOICE);
+        busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT);
         clock.addDays(40); // DAY 40 out of trial
         assertTrue(busHandler.isCompleted(DELAY));

catalog/killbill-catalog.iml 63(+63 -0) 

diff --git a/catalog/killbill-catalog.iml b/catalog/killbill-catalog.iml
new file mode 100644
index 0000000..0461713
--- /dev/null
+++ b/catalog/killbill-catalog.iml
@@ -0,0 +1,63 @@
+<?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" />
+      <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" 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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

entitlement/killbill-entitlement.iml 70(+70 -0) 

diff --git a/entitlement/killbill-entitlement.iml b/entitlement/killbill-entitlement.iml
new file mode 100644
index 0000000..ba6c548
--- /dev/null
+++ b/entitlement/killbill-entitlement.iml
@@ -0,0 +1,70 @@
+<?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" />
+      <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" 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" />
+    <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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <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-SNAPSHOT" level="project" />
+    <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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-catalog" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-queue:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

invoice/killbill-invoice.iml 74(+74 -0) 

diff --git a/invoice/killbill-invoice.iml b/invoice/killbill-invoice.iml
new file mode 100644
index 0000000..3d7cbc5
--- /dev/null
+++ b/invoice/killbill-invoice.iml
@@ -0,0 +1,74 @@
+<?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" />
+      <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" 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" />
+    <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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.awaitility:awaitility:1.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" 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-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

jaxrs/killbill-jaxrs.iml 64(+64 -0) 

diff --git a/jaxrs/killbill-jaxrs.iml b/jaxrs/killbill-jaxrs.iml
new file mode 100644
index 0000000..0d1f356
--- /dev/null
+++ b/jaxrs/killbill-jaxrs.iml
@@ -0,0 +1,64 @@
+<?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" />
+      <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.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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" level="project" />
+    <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="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" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

junction/killbill-junction.iml 72(+72 -0) 

diff --git a/junction/killbill-junction.iml b/junction/killbill-junction.iml
new file mode 100644
index 0000000..2ddc0a5
--- /dev/null
+++ b/junction/killbill-junction.iml
@@ -0,0 +1,72 @@
+<?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/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" 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" 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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <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-SNAPSHOT" 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-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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-catalog" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-entitlement" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-entitlement:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-entitlement" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

killbill.iml 14(+14 -0) 

diff --git a/killbill.iml b/killbill.iml
new file mode 100644
index 0000000..8015fa7
--- /dev/null
+++ b/killbill.iml
@@ -0,0 +1,14 @@
+<?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" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

osgi/killbill-osgi.iml 71(+71 -0) 

diff --git a/osgi/killbill-osgi.iml b/osgi/killbill-osgi.iml
new file mode 100644
index 0000000..3f70fce
--- /dev/null
+++ b/osgi/killbill-osgi.iml
@@ -0,0 +1,71 @@
+<?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" />
+      <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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.awaitility:awaitility:1.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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="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" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-lib-killbill" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" 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.apache.felix:org.apache.felix.framework:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.osgi.core:1.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml 36(+36 -0) 

diff --git a/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml b/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
new file mode 100644
index 0000000..b545d6f
--- /dev/null
+++ b/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
@@ -0,0 +1,36 @@
+<?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" 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-SNAPSHOT" 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-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-lib-killbill" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-concurrent:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.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.jruby:jruby-complete:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

osgi-bundles/bundles/killbill-osgi-bundles.iml 14(+14 -0) 

diff --git a/osgi-bundles/bundles/killbill-osgi-bundles.iml b/osgi-bundles/bundles/killbill-osgi-bundles.iml
new file mode 100644
index 0000000..8015fa7
--- /dev/null
+++ b/osgi-bundles/bundles/killbill-osgi-bundles.iml
@@ -0,0 +1,14 @@
+<?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" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

osgi-bundles/bundles/logger/killbill-osgi-bundles-logger.iml 17(+17 -0) 

diff --git a/osgi-bundles/bundles/logger/killbill-osgi-bundles-logger.iml b/osgi-bundles/bundles/logger/killbill-osgi-bundles-logger.iml
new file mode 100644
index 0000000..3c6d458
--- /dev/null
+++ b/osgi-bundles/bundles/logger/killbill-osgi-bundles-logger.iml
@@ -0,0 +1,17 @@
+<?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" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+  </component>
+</module>
+

osgi-bundles/bundles/webconsolebranding/killbill-osgi-bundles-webconsolebranding.iml 14(+14 -0) 

diff --git a/osgi-bundles/bundles/webconsolebranding/killbill-osgi-bundles-webconsolebranding.iml b/osgi-bundles/bundles/webconsolebranding/killbill-osgi-bundles-webconsolebranding.iml
new file mode 100644
index 0000000..9a514de
--- /dev/null
+++ b/osgi-bundles/bundles/webconsolebranding/killbill-osgi-bundles-webconsolebranding.iml
@@ -0,0 +1,14 @@
+<?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/resources" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml 69(+69 -0) 

diff --git a/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml b/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
new file mode 100644
index 0000000..f68584d
--- /dev/null
+++ b/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
@@ -0,0 +1,69 @@
+<?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" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-lib-killbill" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-concurrent:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.jruby:jruby-complete:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-logger" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-webconsolebranding" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.bundlerepository:1.6.6" level="project" />
+    <orderEntry type="library" name="Maven: org.easymock:easymock:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.configadmin:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager.annotation:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: biz.aQute:bndlib:1.50.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-project:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: classworlds:classworlds:1.1-alpha-2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-profile:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact-manager:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-registry:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20070829" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager.compat:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager.runtime:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager.shell:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.shell:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.gogo.runtime:0.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.deploymentadmin:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.log:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.metatype:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.kxml:kxml2:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.scr:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.scr.annotations:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.scr.ds-annotations:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.shell.remote:1.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.webconsole:3.1.8" level="project" />
+  </component>
+</module>
+

osgi-bundles/killbill-osgi-all-bundles.iml 14(+14 -0) 

diff --git a/osgi-bundles/killbill-osgi-all-bundles.iml b/osgi-bundles/killbill-osgi-all-bundles.iml
new file mode 100644
index 0000000..8015fa7
--- /dev/null
+++ b/osgi-bundles/killbill-osgi-all-bundles.iml
@@ -0,0 +1,14 @@
+<?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" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml 30(+30 -0) 

diff --git a/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml b/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
new file mode 100644
index 0000000..04e0976
--- /dev/null
+++ b/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
@@ -0,0 +1,30 @@
+<?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.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-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: joda-time:joda-time:2.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification: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" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

osgi-bundles/libs/killbill-osgi-lib-bundles.iml 14(+14 -0) 

diff --git a/osgi-bundles/libs/killbill-osgi-lib-bundles.iml b/osgi-bundles/libs/killbill-osgi-lib-bundles.iml
new file mode 100644
index 0000000..8015fa7
--- /dev/null
+++ b/osgi-bundles/libs/killbill-osgi-lib-bundles.iml
@@ -0,0 +1,14 @@
+<?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" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

osgi-bundles/libs/slf4j-osgi/killbill-osgi-bundles-lib-slf4j-osgi.iml 20(+20 -0) 

diff --git a/osgi-bundles/libs/slf4j-osgi/killbill-osgi-bundles-lib-slf4j-osgi.iml b/osgi-bundles/libs/slf4j-osgi/killbill-osgi-bundles-lib-slf4j-osgi.iml
new file mode 100644
index 0000000..00e2ad8
--- /dev/null
+++ b/osgi-bundles/libs/slf4j-osgi/killbill-osgi-bundles-lib-slf4j-osgi.iml
@@ -0,0 +1,20 @@
+<?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="module" module-name="killbill-osgi-bundles-lib-killbill" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+  </component>
+</module>
+

osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml 34(+34 -0) 

diff --git a/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml b/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml
new file mode 100644
index 0000000..98bdaf1
--- /dev/null
+++ b/osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml
@@ -0,0 +1,34 @@
+<?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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+      <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" 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-SNAPSHOT" 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-osgi-bundles-lib-killbill" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

osgi-bundles/tests/killbill-osgi-test-bundles.iml 14(+14 -0) 

diff --git a/osgi-bundles/tests/killbill-osgi-test-bundles.iml b/osgi-bundles/tests/killbill-osgi-test-bundles.iml
new file mode 100644
index 0000000..e2309b3
--- /dev/null
+++ b/osgi-bundles/tests/killbill-osgi-test-bundles.iml
@@ -0,0 +1,14 @@
+<?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/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml 59(+59 -0) 

diff --git a/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml b/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
new file mode 100644
index 0000000..d1fac54
--- /dev/null
+++ b/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
@@ -0,0 +1,59 @@
+<?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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+      <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" 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-SNAPSHOT" 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-osgi-bundles-lib-killbill" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="module" module-name="killbill-util" production-on-test="" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" 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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" level="project" />
+    <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="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" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

overdue/killbill-overdue.iml 74(+74 -0) 

diff --git a/overdue/killbill-overdue.iml b/overdue/killbill-overdue.iml
new file mode 100644
index 0000000..ff2cf3a
--- /dev/null
+++ b/overdue/killbill-overdue.iml
@@ -0,0 +1,74 @@
+<?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" />
+      <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" 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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.awaitility:awaitility:1.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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-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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-catalog" scope="TEST" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-queue:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

payment/killbill-payment.iml 79(+79 -0) 

diff --git a/payment/killbill-payment.iml b/payment/killbill-payment.iml
new file mode 100644
index 0000000..19ddadc
--- /dev/null
+++ b/payment/killbill-payment.iml
@@ -0,0 +1,79 @@
+<?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" />
+      <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" 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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject.extensions:guice-multibindings:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.awaitility:awaitility:1.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="module" module-name="killbill-account" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-account:test-jar:tests:0.3.4-SNAPSHOT" 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" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-invoice" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-invoice:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-junction" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-junction:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-queue:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

server/killbill-server.iml 144(+144 -0) 

diff --git a/server/killbill-server.iml b/server/killbill-server.iml
new file mode 100644
index 0000000..77d016e
--- /dev/null
+++ b/server/killbill-server.iml
@@ -0,0 +1,144 @@
+<?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" />
+      <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" 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" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:14.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-multibindings:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-servlet:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:async-http-client:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.3.1.Final" level="project" />
+    <orderEntry type="module" module-name="killbill-account" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" 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="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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-beatrix" />
+    <orderEntry type="module" module-name="killbill-catalog" />
+    <orderEntry type="module" module-name="killbill-entitlement" />
+    <orderEntry type="module" module-name="killbill-invoice" />
+    <orderEntry type="module" module-name="killbill-junction" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="module" module-name="killbill-payment" />
+    <orderEntry type="module" module-name="killbill-subscription" />
+    <orderEntry type="module" module-name="killbill-tenant" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+    <orderEntry type="module" module-name="killbill-usage" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.1" level="project" />
+    <orderEntry type="module" module-name="killbill-beatrix" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-beatrix:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-jaxrs" />
+    <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-osgi" />
+    <orderEntry type="module" module-name="killbill-osgi-bundles-lib-killbill" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:osgi-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.framework:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.felix:org.osgi.core:1.0.1" level="project" />
+    <orderEntry type="module" module-name="killbill-overdue" />
+    <orderEntry type="module" module-name="killbill-payment" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.jetty:ning-service-skeleton-base:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:metrics.eventtracker-smile:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mogwee:mogwee-executors:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:metrics.eventtracker-common:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:metrics.serialization-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:metrics.serialization-writer:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:metrics.eventtracker-http:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:metrics.serialization-smile:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.arecibo:arecibo-jmx:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.arecibo:arecibo-metrics:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.jetty:ning-service-skeleton-core:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.jaxrs:jaxrs-metrics:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-guice:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-annotation:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-servlet:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.jetty:ning-service-skeleton-eventtracker:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.jetty:ning-service-skeleton-utils:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.jetty:ning-service-skeleton-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-jdbi:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.jetty:ning-service-skeleton-log4j:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.12" level="project" />
+    <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-guice:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-servlet:1.12" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-deploy:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-webapp:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-xml:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-util:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-servlet:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-security:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-server:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-continuation:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-http:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-io:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-jmx:8.1.11.v20130520" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java 2(+1 -1) 

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
index 855471a..d326ec9 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
@@ -255,7 +255,7 @@ public class TestJaxrsBase extends KillbillClient {
 
         //mapper.setPropertyNamingStrategy(new PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy());
 
-        busHandler = new TestApiListener(null);
+        busHandler = new TestApiListener(null, getDBTestingHelper().getDBI());
     }
 
     protected void loadConfig() {

tenant/killbill-tenant.iml 67(+67 -0) 

diff --git a/tenant/killbill-tenant.iml b/tenant/killbill-tenant.iml
new file mode 100644
index 0000000..f58c010
--- /dev/null
+++ b/tenant/killbill-tenant.iml
@@ -0,0 +1,67 @@
+<?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" />
+      <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.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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <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-SNAPSHOT" 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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

usage/killbill-usage.iml 64(+64 -0) 

diff --git a/usage/killbill-usage.iml b/usage/killbill-usage.iml
new file mode 100644
index 0000000..ecd0dc0
--- /dev/null
+++ b/usage/killbill-usage.iml
@@ -0,0 +1,64 @@
+<?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" />
+      <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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <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-SNAPSHOT" 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="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" />
+    <orderEntry type="module" module-name="killbill-util" />
+    <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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" 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="library" name="Maven: com.ning.billing.commons:killbill-clock:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="module" module-name="killbill-util" scope="TEST" production-on-test="" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.3.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

util/killbill-util.iml 70(+70 -0) 

diff --git a/util/killbill-util.iml b/util/killbill-util.iml
new file mode 100644
index 0000000..fdc9040
--- /dev/null
+++ b/util/killbill-util.iml
@@ -0,0 +1,70 @@
+<?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" />
+      <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" 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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.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" />
+    <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" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject.extensions:guice-multibindings:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.158" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.awaitility:awaitility:1.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.7.1.RELEASE" level="project" />
+    <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="library" name="Maven: com.ning.billing:killbill-api:0.3.2-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="killbill-internal-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" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-clock:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-queue:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jdbi:jdbi:2.39.1" level="project" />
+    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.weakref:jmxutils:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing.commons:killbill-queue:test-jar:tests:0.1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.samskivert:jmustache:1.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-java:5.1.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj:5.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-mxj-db-files:5.0.12" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
+  </component>
+</module>
+

util/src/test/java/com/ning/billing/api/TestApiListener.java 29(+28 -1) 

diff --git a/util/src/test/java/com/ning/billing/api/TestApiListener.java b/util/src/test/java/com/ning/billing/api/TestApiListener.java
index 82553da..3643d94 100644
--- a/util/src/test/java/com/ning/billing/api/TestApiListener.java
+++ b/util/src/test/java/com/ning/billing/api/TestApiListener.java
@@ -19,6 +19,7 @@ package com.ning.billing.api;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
+import java.util.concurrent.Callable;
 
 import javax.inject.Inject;
 
@@ -33,12 +34,18 @@ import com.ning.billing.util.events.RepairSubscriptionInternalEvent;
 import com.ning.billing.util.events.TagDefinitionInternalEvent;
 import com.ning.billing.util.events.TagInternalEvent;
 import org.joda.time.DateTime;
+import org.skife.jdbi.v2.Handle;
+import org.skife.jdbi.v2.IDBI;
+import org.skife.jdbi.v2.tweak.HandleCallback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Joiner;
 import com.google.common.eventbus.Subscribe;
 
+import static com.jayway.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 public class TestApiListener {
 
     protected static final Logger log = LoggerFactory.getLogger(TestApiListener.class);
@@ -46,17 +53,19 @@ public class TestApiListener {
     private final List<NextEvent> nextExpectedEvent;
 
     private final TestListenerStatus testStatus;
+    private final IDBI idbi;
 
     private boolean nonExpectedMode;
 
     private volatile boolean completed;
 
     @Inject
-    public TestApiListener(final TestListenerStatus testStatus) {
+    public TestApiListener(final TestListenerStatus testStatus, final IDBI idbi) {
         nextExpectedEvent = new Stack<NextEvent>();
         this.completed = false;
         this.testStatus = testStatus;
         this.nonExpectedMode = false;
+        this.idbi = idbi;
     }
 
     public enum NextEvent {
@@ -231,6 +240,24 @@ public class TestApiListener {
                     final DateTime before = new DateTime();
                     wait(500);
                     if (completed) {
+                        // TODO PIERRE Kludge alert!
+                        // When we arrive here, we got notified by the current thread (Bus listener) that we received
+                        // all expected events. But other handlers might still be processing them.
+                        // Since there is only one bus thread, and that the test thread waits for all events to be processed,
+                        // we're guaranteed that all are processed when the bus events table is empty.
+                        await().atMost(10, SECONDS).until(new Callable<Boolean>() {
+                            @Override
+                            public Boolean call() throws Exception {
+                                final long inProcessingBusEvents = idbi.withHandle(new HandleCallback<Long>() {
+                                    @Override
+                                    public Long withHandle(final Handle handle) throws Exception {
+                                        return (Long) handle.select("select count(distinct record_id) count from bus_events").get(0).get("count");
+                                    }
+                                });
+                                log.debug("Events still in processing: " + inProcessingBusEvents);
+                                return inProcessingBusEvents == 0;
+                            }
+                        });
                         return completed;
                     }
                     final DateTime after = new DateTime();

util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDao.java 2(+1 -1) 

diff --git a/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDao.java b/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDao.java
index 90a84a4..e9ebb64 100644
--- a/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDao.java
+++ b/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDao.java
@@ -44,7 +44,7 @@ public class TestDefaultTagDao extends UtilTestSuiteWithEmbeddedDB {
     @BeforeMethod(groups = "slow")
     public void beforeMethod() throws Exception {
         super.beforeMethod();
-        eventsListener = new TestApiListener(null);
+        eventsListener = new TestApiListener(null, idbi);
         eventBus.register(eventsListener);
     }

util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java 2(+1 -1) 

diff --git a/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java b/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
index d750dd1..908de4f 100644
--- a/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
+++ b/util/src/test/java/com/ning/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
@@ -42,7 +42,7 @@ public class TestDefaultTagDefinitionDao extends UtilTestSuiteWithEmbeddedDB {
     @BeforeMethod(groups = "slow")
     public void beforeMethod() throws Exception {
         super.beforeMethod();
-        eventsListener = new TestApiListener(null);
+        eventsListener = new TestApiListener(null, idbi);
         eventBus.register(eventsListener);
     }

util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java 3(+3 -0) 

diff --git a/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java
index b618f24..ee15ee9 100644
--- a/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java
@@ -18,6 +18,7 @@ package com.ning.billing.util;
 
 import javax.inject.Inject;
 
+import org.skife.jdbi.v2.IDBI;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -65,6 +66,8 @@ public abstract class UtilTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuite
     protected DefaultTagDao tagDao;
     @Inject
     protected AuditDao auditDao;
+    @Inject
+    protected IDBI idbi;
 
     @BeforeClass(groups = "slow")
     public void beforeClass() throws Exception {

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github