Merge branch 'ticket/141' into develop

James Moger

2014-09-04 969656cd8f417378d9840a246dca698ff8d16551

 gitblit.iml

@@ -7,20 +7,20 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/bugtraq" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/dagger" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/gen" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/bugtraq" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
    </content>
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library">
      <library name="dagger-1.1.0.jar">
      <library name="guice-4.0-beta4.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/dagger-1.1.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/guice-4.0-beta4.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/dagger-1.1.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/guice-4.0-beta4.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -36,24 +36,35 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="dagger-compiler-1.1.0.jar">
      <library name="aopalliance-1.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/dagger-compiler-1.1.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/aopalliance-1.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/dagger-compiler-1.1.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/aopalliance-1.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="javawriter-2.1.1.jar">
      <library name="guava-17.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/javawriter-2.1.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/guava-17.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/javawriter-2.1.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/guava-17.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="guice-servlet-4.0-gb1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -80,68 +91,57 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="slf4j-api-1.6.6.jar">
      <library name="slf4j-api-1.7.7.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.6.6.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.7.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.7.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="slf4j-log4j12-1.6.6.jar">
      <library name="slf4j-log4j12-1.7.7.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.6.6.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.7.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.7.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="mail-1.4.3.jar">
      <library name="javax.mail-1.5.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/mail-1.4.3.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/javax.mail-1.5.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/javax.mail-1.5.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="javax.servlet-api-3.0.1.jar">
      <library name="javax.servlet-api-3.1.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/javax.servlet-api-3.0.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/javax.servlet-api-3.1.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.1.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="jetty-webapp-8.1.13.v20130916.jar">
      <library name="jetty-all-9.2.1.v20140609.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/jetty-webapp-8.1.13.v20130916.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.1.v20140609.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-8.1.13.v20130916.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="jetty-ajp-8.1.13.v20130916.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/jetty-ajp-8.1.13.v20130916.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-8.1.13.v20130916.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.1.v20140609.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -179,79 +179,79 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-core-4.6.0.jar">
      <library name="lucene-core-4.8.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-core-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-core-4.8.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.8.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-analyzers-common-4.6.0.jar">
      <library name="lucene-analyzers-common-4.8.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.8.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.8.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-highlighter-4.6.0.jar">
      <library name="lucene-highlighter-4.8.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.8.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.8.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-memory-4.6.0.jar">
      <library name="lucene-memory-4.8.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.8.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.8.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-queries-4.6.0.jar">
      <library name="lucene-queries-4.8.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.8.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.8.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-queryparser-4.6.0.jar">
      <library name="lucene-queryparser-4.8.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.8.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.8.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-sandbox-4.6.0.jar">
      <library name="lucene-sandbox-4.8.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.8.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.6.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.8.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -408,13 +408,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="org.eclipse.jgit-3.3.1.201403241930-r.jar">
      <library name="org.eclipse.jgit-3.4.1.201406201815-r.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.3.1.201403241930-r.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.3.1.201403241930-r.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -485,13 +485,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="org.eclipse.jgit.http.server-3.3.1.201403241930-r.jar">
      <library name="org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.3.1.201403241930-r.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.3.1.201403241930-r.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -529,13 +529,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="sshd-core-0.10.1.jar">
      <library name="sshd-core-0.11.1-atlassian-1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/sshd-core-0.10.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.1-atlassian-1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.10.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.1-atlassian-1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -573,24 +573,24 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="gson-1.7.2.jar">
      <library name="gson-2.2.2.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/gson-1.7.2.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/gson-2.2.2.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/gson-2.2.2.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="groovy-all-1.8.8.jar">
      <library name="groovy-all-2.3.3.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/groovy-all-1.8.8.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/groovy-all-2.3.3.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/groovy-all-1.8.8.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/groovy-all-2.3.3.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -692,13 +692,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="freemarker-2.3.19.jar">
      <library name="freemarker-2.3.20.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/freemarker-2.3.19.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/freemarker-2.3.20.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/freemarker-2.3.19.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/freemarker-2.3.20.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -732,17 +732,6 @@
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/jna-3.5.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="guava-13.0.1.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/guava-13.0.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/guava-13.0.1.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -791,13 +780,24 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="pf4j-0.7.0.jar">
      <library name="pf4j-0.8.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/pf4j-0.7.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/pf4j-0.8.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/pf4j-0.7.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/pf4j-0.8.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="tika-core-1.5.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/tika-core-1.5.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/tika-core-1.5.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>