Move XMPP parser to plugins (sync other changes.)

.idea/client.iml

@@ -19,22 +19,21 @@
     <orderEntry type="module" module-name="util" exported="" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.brsanthu:migbase64:2.2" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:5.0.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.4.2" level="project" />
     <orderEntry type="library" exported="" name="Gradle: javax.el:el-api:2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="module" module-name="common" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0-rc4" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.10.17" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:6.0.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.9" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
   </component>
 </module>

.idea/gradle.xml

@@ -12,6 +12,7 @@
             <option value="$PROJECT_DIR$/parser" />
             <option value="$PROJECT_DIR$/parser/common" />
             <option value="$PROJECT_DIR$/parser/irc" />
+            <option value="$PROJECT_DIR$/parser/xmpp" />
             <option value="$PROJECT_DIR$/plugins" />
             <option value="$PROJECT_DIR$/plugins/activewindow" />
             <option value="$PROJECT_DIR$/plugins/audio" />
@@ -36,6 +37,7 @@
             <option value="$PROJECT_DIR$/plugins/mediasource_vlc" />
             <option value="$PROJECT_DIR$/plugins/mediasource_windows" />
             <option value="$PROJECT_DIR$/plugins/nickcolours" />
+            <option value="$PROJECT_DIR$/plugins/nickkeep" />
             <option value="$PROJECT_DIR$/plugins/nma" />
             <option value="$PROJECT_DIR$/plugins/notifications" />
             <option value="$PROJECT_DIR$/plugins/nowplaying" />
@@ -44,6 +46,7 @@
             <option value="$PROJECT_DIR$/plugins/parser_irc" />
             <option value="$PROJECT_DIR$/plugins/parser_xmpp" />
             <option value="$PROJECT_DIR$/plugins/parserdebug" />
+            <option value="$PROJECT_DIR$/plugins/qauth" />
             <option value="$PROJECT_DIR$/plugins/redirect" />
             <option value="$PROJECT_DIR$/plugins/scriptplugin" />
             <option value="$PROJECT_DIR$/plugins/sessionlock" />

.idea/logging.iml

@@ -25,5 +25,6 @@
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.10.17" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
   </component>
 </module>

.idea/modules.xml

@@ -52,6 +52,7 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/util.iml" filepath="$PROJECT_DIR$/.idea/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/windowflashing.iml" filepath="$PROJECT_DIR$/.idea/windowflashing.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/windowstatus.iml" filepath="$PROJECT_DIR$/.idea/windowstatus.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/xmpp.iml" filepath="$PROJECT_DIR$/.idea/xmpp.iml" />
     </modules>
   </component>
 </project>

.idea/nickkeep.iml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id=":plugins:nickkeep" external.linked.project.path="$MODULE_DIR$/plugins/nickkeep" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/nickkeep/build" />
-    <output-test url="file://$MODULE_DIR$/plugins/nickkeep/build" />
+    <output url="file://$MODULE_DIR$/plugins/nickkeep/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/plugins/nickkeep/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/plugins/nickkeep">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/res" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/test-res" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/test-res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/generated" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/nickkeep/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/nickkeep/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/parser.iml

@@ -10,10 +10,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="module" module-name="common" />
     <orderEntry type="module" module-name="irc" />
+    <orderEntry type="module" module-name="xmpp" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
   </component>
 </module>

.idea/parser_xmpp.iml

@@ -9,15 +9,12 @@
       <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/generated" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: org.igniterealtime.smack:smack:3.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.igniterealtime.smack:smackx:3.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
@@ -27,5 +24,6 @@
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.10.17" level="project" />
+    <orderEntry type="module" module-name="xmpp" exported="" />
   </component>
 </module>

.idea/qauth.iml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id=":plugins:qauth" external.linked.project.path="$MODULE_DIR$/plugins/qauth" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/qauth/build" />
-    <output-test url="file://$MODULE_DIR$/plugins/qauth/build" />
+    <output url="file://$MODULE_DIR$/plugins/qauth/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/plugins/qauth/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/plugins/qauth">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/res" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/test-res" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/test-res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/generated" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/qauth/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/qauth/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/ui_swing.iml

@@ -18,7 +18,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="client" exported="" />
     <orderEntry type="library" exported="" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.swinglabs:jxlayer:3.0.4" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />

.idea/util.iml

@@ -20,7 +20,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.10.17" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
   </component>
 </module>

.idea/xmpp.iml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":parser:xmpp" external.linked.project.path="$MODULE_DIR$/parser/xmpp" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc.parser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/parser/xmpp/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/parser/xmpp/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/parser/xmpp">
+      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/parser/xmpp/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/parser/xmpp/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="common" exported="" />
+    <orderEntry type="library" exported="" name="Gradle: org.igniterealtime.smack:smack:3.2.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: org.igniterealtime.smack:smackx:3.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.10.17" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.9" level="project" />
+  </component>
+</module>

settings.gradle

@@ -6,6 +6,7 @@ include 'parser'
 include 'plugins'
 include 'parser:common'
 include 'parser:irc'
+include 'parser:xmpp'
 
 // Include all of the plugin projects
 project(':plugins').projectDir.eachDir() { File dir ->