Point IDEA at directories not individual jars.

This replaces the idea libraries with jar directories.

Also creates a 'bundled' lib directory in the main client, which
contains the jars that end up bundled with DMDirc. This allows
the plugins project to cleanly depend on these without depending
on any other dependencies the client has.

Change-Id: I929f402ebef5344dbc133b9a9828868e4f8c2dcd
Reviewed-on: http://gerrit.dmdirc.com/3735
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

.idea/libraries/build.xml

@@ -1,19 +0,0 @@
-<component name="libraryTable">
-  <library name="build">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/build/ant-contrib.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/ant-fikin.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/ant-nsis.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/commons-codec.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/commons-httpclient.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/commons-logging.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/jgit-describe.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/jsch.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/org.eclipse.jgit.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/xercesImpl.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/build/xml-apis.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/main.xml

@@ -1,24 +0,0 @@
-<component name="libraryTable">
-  <library name="main">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/main/dagger-compiler.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/dagger.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/guava.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/jackson-core.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/javawriter.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/javax.inject.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/jgit-describe.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/jsch.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/jsr305.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/org.eclipse.jgit.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/raven.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/slf4j-api.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/yamlbeans.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/main/migbase64.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/main/jsr305.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/plugins_build.xml

@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="plugins build">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/ant-contrib.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/ant.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/guava.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/javawriter.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/javax.inject.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/jgit-describe.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/jsch.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/org.eclipse.jgit.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/dagger-compiler.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/dagger.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/plugins_main.xml

@@ -1,29 +0,0 @@
-<component name="libraryTable">
-  <library name="plugins main">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/commons-lang.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/javax.inject.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jetty-util.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jetty.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jgit-describe.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jna.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jsch.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jsr305.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jxlayer.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/locksupport.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/menuscroller.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/miglayout-core.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/miglayout-swing.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/org.eclipse.jgit.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/platform.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/servlet-api.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/slf4j-api.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/smack.jar!/" />
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/smackx.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/main/jsr305.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/test.xml

@@ -1,17 +0,0 @@
-<component name="libraryTable">
-  <library name="test">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/test/clover.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/test/hamcrest-core.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/test/junit.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/test/logback-classic.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/test/logback-core.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/test/mockito-all.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/test/slf4j-api.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/test/mockito-all.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/parser.iml

@@ -11,7 +11,19 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="test" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/modules/parser/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/modules/parser/lib" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/modules/parser/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/modules/parser/lib" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
   </component>
 </module>
 

.idea/plugins.iml

@@ -12,12 +12,45 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="plugins build" level="project" />
-    <orderEntry type="library" name="plugins main" level="project" />
     <orderEntry type="module" module-name="DMDirc" />
     <orderEntry type="module" module-name="parser" />
-    <orderEntry type="library" scope="TEST" name="test" level="project" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/modules/plugins/lib/main" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/modules/plugins/lib/main" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/main" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/main" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/modules/plugins/lib/test" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/modules/plugins/lib/test" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/test" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/test" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/bundled" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib/bundled" recursive="false" />
+      </library>
+    </orderEntry>
   </component>
 </module>
 

.idea/util.iml

@@ -11,7 +11,19 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="test" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/modules/util/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/modules/util/lib" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/modules/util/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/modules/util/lib" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
   </component>
 </module>
 

DMDirc.iml

@@ -18,11 +18,34 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="build" level="project" />
-    <orderEntry type="library" name="main" level="project" />
-    <orderEntry type="library" name="test" level="project" />
     <orderEntry type="module" module-name="parser" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/main" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/lib/main" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/lib/main" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/lib/main" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/test" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/lib/test" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/lib/test" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/lib/test" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
   </component>
 </module>
 

ivy.xml

@@ -6,6 +6,7 @@
         <conf name="main" description="Everything needed to compile DMDirc separately"/>
         <conf name="test" description="Everything needed to test DMDirc"/>
         <conf name="analyse" description="Everything needed to run analysis on DMDirc"/>
+        <conf name="bundled" description="Things bundled and distributed in full with DMDirc"/>
     </configurations>
 
     <dependencies>
@@ -19,16 +20,16 @@
 
         <dependency org="com.google.code.findbugs" name="jsr305" rev="2.+" conf="main->default" />
 
-        <dependency org="com.squareup.dagger" name="dagger" rev="1.2.1" conf="main->default" />
+        <dependency org="com.squareup.dagger" name="dagger" rev="1.2.1" conf="bundled,main->default" />
         <dependency org="com.squareup.dagger" name="dagger-compiler" rev="1.2.1" conf="main->default" />
 
-        <dependency org="com.esotericsoftware.yamlbeans" name="yamlbeans" rev="1.+" conf="main->default" />
+        <dependency org="com.esotericsoftware.yamlbeans" name="yamlbeans" rev="1.+" conf="bundled,main->default" />
 
-        <dependency org="com.brsanthu" name="migbase64" rev="2.2" conf="main->default" />
+        <dependency org="com.brsanthu" name="migbase64" rev="2.2" conf="bundled,main->default" />
 
-        <dependency org="net.kencochrane.raven" name="raven" rev="4.+" conf="main->default" />
+        <dependency org="net.kencochrane.raven" name="raven" rev="4.+" conf="bundled,main->default" />
 
-        <dependency org="com.google.guava" name="guava" rev="17.+" conf="main->default" />
+        <dependency org="com.google.guava" name="guava" rev="17.+" conf="bundled,main->default" />
 
         <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
         <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />