killbill-memoizeit

More .idea changes due to (painful) upgrade. See 1fd0eb424f0233faba40a80ec6222227a950c08b

4/14/2017 9:14:22 PM

stephane brossier

Commit: b380dde

Tree: 71e39ea

Parents: 1fd0eb4

Changes

.idea/compiler.xml 2(+1 -1)

.idea/misc.xml 42(+39 -3)

.idea/modules.xml 34(+1 -33)

.idea/vcs.xml 2(+1 -1)

Details

.idea/compiler.xml 2(+1 -1)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index a55366d..7a229a7 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -36,7 +36,6 @@
       </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" />
@@ -55,6 +54,7 @@
       <module name="killbill-tenant" target="1.6" />
       <module name="killbill-usage" target="1.6" />
       <module name="killbill-util" target="1.6" />
+      <module name="killbill2" target="1.6" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file

.idea/misc.xml 42(+39 -3)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4989967..8df87b3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ClientPropertiesManager">
+    <properties class="javax.swing.AbstractButton">
+      <property name="hideActionText" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JComponent">
+      <property name="html.disable" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JEditorPane">
+      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+      <property name="charset" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.JList">
+      <property name="List.isFileList" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JPasswordField">
+      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JSlider">
+      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+      <property name="JSlider.isFilled" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTable">
+      <property name="Table.isFileList" class="java.lang.Boolean" />
+      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JToolBar">
+      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTree">
+      <property name="JTree.lineStyle" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.text.JTextComponent">
+      <property name="caretAspectRatio" class="java.lang.Double" />
+      <property name="caretWidth" class="java.lang.Integer" />
+    </properties>
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -7,7 +45,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file

.idea/modules.xml 34(+1 -33)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index bca5bb6..9786143 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/util/target/generated-sources/generated-sources.iml" filepath="$PROJECT_DIR$/util/target/generated-sources/generated-sources.iml" />
-      <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" />
@@ -22,37 +20,7 @@
       <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" />
-      <module fileurl="file://$PROJECT_DIR$/api/src/main/main.iml" filepath="$PROJECT_DIR$/api/src/main/main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/tenant/src/main/main1.iml" filepath="$PROJECT_DIR$/tenant/src/main/main1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/invoice/src/main/main10.iml" filepath="$PROJECT_DIR$/invoice/src/main/main10.iml" />
-      <module fileurl="file://$PROJECT_DIR$/catalog/src/main/main11.iml" filepath="$PROJECT_DIR$/catalog/src/main/main11.iml" />
-      <module fileurl="file://$PROJECT_DIR$/overdue/src/main/main12.iml" filepath="$PROJECT_DIR$/overdue/src/main/main12.iml" />
-      <module fileurl="file://$PROJECT_DIR$/currency/src/main/main13.iml" filepath="$PROJECT_DIR$/currency/src/main/main13.iml" />
-      <module fileurl="file://$PROJECT_DIR$/util/src/main/main14.iml" filepath="$PROJECT_DIR$/util/src/main/main14.iml" />
-      <module fileurl="file://$PROJECT_DIR$/payment/src/main/main15.iml" filepath="$PROJECT_DIR$/payment/src/main/main15.iml" />
-      <module fileurl="file://$PROJECT_DIR$/profiles/killpay/src/main/main16.iml" filepath="$PROJECT_DIR$/profiles/killpay/src/main/main16.iml" />
-      <module fileurl="file://$PROJECT_DIR$/beatrix/src/main/main2.iml" filepath="$PROJECT_DIR$/beatrix/src/main/main2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/junction/src/main/main3.iml" filepath="$PROJECT_DIR$/junction/src/main/main3.iml" />
-      <module fileurl="file://$PROJECT_DIR$/profiles/killbill/src/main/main4.iml" filepath="$PROJECT_DIR$/profiles/killbill/src/main/main4.iml" />
-      <module fileurl="file://$PROJECT_DIR$/subscription/src/main/main5.iml" filepath="$PROJECT_DIR$/subscription/src/main/main5.iml" />
-      <module fileurl="file://$PROJECT_DIR$/entitlement/src/main/main6.iml" filepath="$PROJECT_DIR$/entitlement/src/main/main6.iml" />
-      <module fileurl="file://$PROJECT_DIR$/usage/src/main/main7.iml" filepath="$PROJECT_DIR$/usage/src/main/main7.iml" />
-      <module fileurl="file://$PROJECT_DIR$/jaxrs/src/main/main8.iml" filepath="$PROJECT_DIR$/jaxrs/src/main/main8.iml" />
-      <module fileurl="file://$PROJECT_DIR$/account/src/main/main9.iml" filepath="$PROJECT_DIR$/account/src/main/main9.iml" />
-      <module fileurl="file://$PROJECT_DIR$/invoice/src/test/test.iml" filepath="$PROJECT_DIR$/invoice/src/test/test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/payment/src/test/test1.iml" filepath="$PROJECT_DIR$/payment/src/test/test1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/entitlement/src/test/test10.iml" filepath="$PROJECT_DIR$/entitlement/src/test/test10.iml" />
-      <module fileurl="file://$PROJECT_DIR$/usage/src/test/test11.iml" filepath="$PROJECT_DIR$/usage/src/test/test11.iml" />
-      <module fileurl="file://$PROJECT_DIR$/profiles/killbill/src/test/test12.iml" filepath="$PROJECT_DIR$/profiles/killbill/src/test/test12.iml" />
-      <module fileurl="file://$PROJECT_DIR$/junction/src/test/test13.iml" filepath="$PROJECT_DIR$/junction/src/test/test13.iml" />
-      <module fileurl="file://$PROJECT_DIR$/beatrix/src/test/test2.iml" filepath="$PROJECT_DIR$/beatrix/src/test/test2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/overdue/src/test/test3.iml" filepath="$PROJECT_DIR$/overdue/src/test/test3.iml" />
-      <module fileurl="file://$PROJECT_DIR$/jaxrs/src/test/test4.iml" filepath="$PROJECT_DIR$/jaxrs/src/test/test4.iml" />
-      <module fileurl="file://$PROJECT_DIR$/account/src/test/test5.iml" filepath="$PROJECT_DIR$/account/src/test/test5.iml" />
-      <module fileurl="file://$PROJECT_DIR$/tenant/src/test/test6.iml" filepath="$PROJECT_DIR$/tenant/src/test/test6.iml" />
-      <module fileurl="file://$PROJECT_DIR$/util/src/test/test7.iml" filepath="$PROJECT_DIR$/util/src/test/test7.iml" />
-      <module fileurl="file://$PROJECT_DIR$/subscription/src/test/test8.iml" filepath="$PROJECT_DIR$/subscription/src/test/test8.iml" />
-      <module fileurl="file://$PROJECT_DIR$/catalog/src/test/test9.iml" filepath="$PROJECT_DIR$/catalog/src/test/test9.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/killbill2.iml" filepath="$PROJECT_DIR$/.idea/killbill2.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

.idea/vcs.xml 2(+1 -1)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file