Merge branch 'ticket/193' into develop

James Moger

2014-09-30 794034351714877b71838aec5c51dc015b55d848

 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>
@@ -534,7 +534,9 @@
          <root url="jar://$MODULE_DIR$/ext/sshd-core-0.12.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.12.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
@@ -778,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>
@@ -799,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>