Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading jetty #266

Merged
merged 3 commits into from
May 18, 2020
Merged

Upgrading jetty #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c100bb3
Upgrading jetty
cmungall Dec 7, 2018
72af2c7
Merge branch 'master' into cmungall-patch-6
balhoff May 18, 2020
8db14bf
Update jetty log methods.
balhoff May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions OWLTools-Runner/src/test/java/owltools/web/OWLServerMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ public void testServerCommunication() throws Exception {
HttpUriRequest httppost = createRequest();

// run request
Log.info("Executing="+httppost);
Log.getLog().info("Executing="+httppost);
//HttpResponse response = httpclient.execute(httpUriRequest);
HttpResponse response = httpclient.execute(httppost);
Log.info("Executed="+httpclient);
Log.getLog().info("Executed="+httpclient);

// check response
HttpEntity entity = response.getEntity();
Expand All @@ -71,7 +71,7 @@ public void testServerCommunication() throws Exception {
handleResponse(responseContent);
}
else {
Log.info("Status="+statusLine.getStatusCode());
Log.getLog().info("Status="+statusLine.getStatusCode());
EntityUtils.consumeQuietly(entity);
}

Expand Down Expand Up @@ -103,9 +103,9 @@ protected HttpUriRequest createRequest() throws URISyntaxException {
.setPath("/");

URI uri = uriBuilder.build();
Log.info("Getting URL="+uri);
Log.getLog().info("Getting URL="+uri);
HttpUriRequest httpUriRequest = new HttpGet(uri);
Log.info("Got URL="+uri);
Log.getLog().info("Got URL="+uri);
return httpUriRequest;
}

Expand Down
2 changes: 1 addition & 1 deletion OWLTools-Web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>7.5.4.v20111024</version>
<version>9.4.14.v20181114</version>
</dependency>
</dependencies>
</project>