Merge branch 'ticket/135' into develop

James Moger

2014-09-26 ba04d6d62e443cbd23c0544094aa2e55d01b2d0f

 gitblit.iml

@@ -135,13 +135,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="jetty-all-9.2.1.v20140609.jar">
      <library name="jetty-all-9.2.2.v20140723.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.1.v20140609.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.2.v20140723.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.1.v20140609.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.2.v20140723.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -179,79 +179,79 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-core-4.8.1.jar">
      <library name="lucene-core-4.10.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-core-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-analyzers-common-4.8.1.jar">
      <library name="lucene-analyzers-common-4.10.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-highlighter-4.8.1.jar">
      <library name="lucene-highlighter-4.10.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-memory-4.8.1.jar">
      <library name="lucene-memory-4.10.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-queries-4.8.1.jar">
      <library name="lucene-queries-4.10.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-queryparser-4.8.1.jar">
      <library name="lucene-queryparser-4.10.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="lucene-sandbox-4.8.1.jar">
      <library name="lucene-sandbox-4.10.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.8.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -529,13 +529,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="sshd-core-0.11.1-atlassian-1.jar">
      <library name="sshd-core-0.12.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.1-atlassian-1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/sshd-core-0.12.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.1-atlassian-1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.12.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -780,13 +780,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="pf4j-0.8.0.jar">
      <library name="pf4j-0.9.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/pf4j-0.8.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/pf4j-0.9.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/pf4j-0.8.0.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/pf4j-0.9.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -801,6 +801,17 @@
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="jsoup-1.7.3.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/jsoup-1.7.3.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/jsoup-1.7.3.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library" scope="TEST">
      <library name="junit-4.11.jar">
        <CLASSES>