github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to jetty 9.3.9

Browse source
This commit is contained in:
John Lees-Miller 2016-06-02 11:57:04 +01:00
parent 465db49a22
commit 1edaf5fe77
4 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
services/git-bridge/pom.xml
View file

@ -59,9 +59,14 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<version>9.2.6.v20141205</version>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>9.3.9.v20160517</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.3.9.v20160517</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>

2
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/FileServlet.java
View file

@ -28,7 +28,7 @@ public class FileServlet extends ResourceHandler {
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
String method = baseRequest.getMethod();
if (method.equals("GET")) {
HttpURI uri = baseRequest.getUri();
HttpURI uri = baseRequest.getHttpURI();
Log.info(method + " <- " + uri);
MultiMap<String> multimap = new MultiMap<String>();
uri.decodeQueryTo(multimap);

2
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PostbackHandler.java
View file

@ -38,7 +38,7 @@ public class PostbackHandler extends AbstractHandler {
}
String projectName = parts[1];
String postbackKey = parts[2];
Log.info(baseRequest.getMethod() + " <- " + baseRequest.getUri());
Log.info(baseRequest.getMethod() + " <- " + baseRequest.getHttpURI());
PostbackContents postbackContents = new PostbackContents(bridgeAPI, projectName, postbackKey, contents);
JsonObject body = new JsonObject();

8
services/git-bridge/writelatex-git-bridge.iml
View file

@ -17,9 +17,13 @@
<orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.4" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.aggregate:jetty-all:9.2.6.v20141205" level="project" />
<orderEntry type="library" name="Maven: javax.websocket:javax.websocket-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.3.9.v20160517" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.3.9.v20160517" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.9.v20160517" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.3.9.v20160517" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.9.v20160517" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.3.9.v20160517" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
<orderEntry type="library" name="Maven: com.ning:async-http-client:1.9.3" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty:3.9.5.Final" level="project" />