James Moger
2013-11-16 d65a6baca9a20461f976a2455d70eecc7faf2db5
Update to Jetty 8.1.13 for Servlet 3

Change-Id: If3f30af2ed250968e65cde58bd413213f4d384b1
5 files modified
24 ■■■■ changed files
.classpath 6 ●●●● patch | view | raw | blame | history
build.moxie 2 ●●● patch | view | raw | blame | history
gitblit.iml 12 ●●●● patch | view | raw | blame | history
releases.moxie 2 ●●● patch | view | raw | blame | history
src/main/java/com/gitblit/GitBlitServer.java 2 ●●● patch | view | raw | blame | history
.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
    <classpathentry kind="src" path="src/main/java" />
    <classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
    <classpathentry kind="src" output="bin/test-classes" path="src/test/java"/>
    <classpathentry kind="src" path="src/main/resources" />
    <classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17.jar" />
    <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
@@ -9,8 +9,8 @@
    <classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6.jar" />
    <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" />
    <classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1.jar" />
    <classpathentry kind="lib" path="ext/jetty-webapp-7.6.13.v20130916.jar" sourcepath="ext/src/jetty-webapp-7.6.13.v20130916.jar" />
    <classpathentry kind="lib" path="ext/jetty-ajp-7.6.13.v20130916.jar" sourcepath="ext/src/jetty-ajp-7.6.13.v20130916.jar" />
    <classpathentry kind="lib" path="ext/jetty-webapp-8.1.13.v20130916.jar" sourcepath="ext/src/jetty-webapp-8.1.13.v20130916.jar"/>
    <classpathentry kind="lib" path="ext/jetty-ajp-8.1.13.v20130916.jar" sourcepath="ext/src/jetty-ajp-8.1.13.v20130916.jar"/>
    <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
    <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
    <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
build.moxie
@@ -98,7 +98,7 @@
# Convenience properties for dependencies
properties: {
  jetty.version  : 7.6.13.v20130916
  jetty.version  : 8.1.13.v20130916
  wicket.version : 1.4.21
  lucene.version : 3.6.1
  jgit.version   : 3.1.0.201310021548-r
gitblit.iml
@@ -77,24 +77,24 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="jetty-webapp-7.6.13.v20130916.jar">
      <library name="jetty-webapp-8.1.13.v20130916.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/jetty-webapp-7.6.13.v20130916.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/jetty-webapp-8.1.13.v20130916.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-7.6.13.v20130916.jar!/" />
          <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-7.6.13.v20130916.jar">
      <library name="jetty-ajp-8.1.13.v20130916.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/jetty-ajp-7.6.13.v20130916.jar!/" />
          <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-7.6.13.v20130916.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-8.1.13.v20130916.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
releases.moxie
@@ -48,7 +48,7 @@
    - Added GO setting to automatically redirect all http requests to the secure https connector
    - Automatically display common repository root documents as tabs on the docs page
    dependencyChanges:
    - updated to Jetty 7.6.13
    - updated to Jetty 8.1.13
    - updated to JGit 3.1.0
    - replaced MarkdownPapers with pegdown 1.4.1
    - added Eclipse WikiText libraries for processing confluence, mediawiki, textile, tracwiki, and twiki
src/main/java/com/gitblit/GitBlitServer.java
@@ -340,7 +340,7 @@
        HashSessionManager sessionManager = new HashSessionManager();
        sessionManager.setHttpOnly(true);
        // Use secure cookies if only serving https
        sessionManager.setSecureCookies(params.port <= 0 && params.securePort > 0);
        sessionManager.setSecureRequestOnly(params.port <= 0 && params.securePort > 0);
        rootContext.getSessionHandler().setSessionManager(sessionManager);
        // Ensure there is a defined User Service