Change in asterixdb[master]: Update Jetty to Latest Released Version (9.3.11)

2016-08-04 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Update Jetty to Latest Released Version (9.3.11)
..


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/242/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1048
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I387198865c8c44dc0d1aabe9a8eb06eb056f694b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: Update Jetty to Latest Released Version (9.3.11)

2016-08-04 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Update Jetty to Latest Released Version (9.3.11)
..


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/242/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1048
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I387198865c8c44dc0d1aabe9a8eb06eb056f694b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: Update Jetty to Latest Released Version (9.3.11)

2016-08-04 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Update Jetty to Latest Released Version (9.3.11)
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2114/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1048
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I387198865c8c44dc0d1aabe9a8eb06eb056f694b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Update Jetty to Latest Released Version (9.3.11)

2016-08-04 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Update Jetty to Latest Released Version (9.3.11)
..


Patch Set 1:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1048
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I387198865c8c44dc0d1aabe9a8eb06eb056f694b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Update Jetty to Latest Released Version (9.3.11)

2016-08-04 Thread Michael Blow (Code Review) 
Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1048

Change subject: Update Jetty to Latest Released Version (9.3.11)
..

Update Jetty to Latest Released Version (9.3.11)

Change-Id: I387198865c8c44dc0d1aabe9a8eb06eb056f694b
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-external-data/pom.xml
M asterixdb/pom.xml
M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/WebServer.java
6 files changed, 77 insertions(+), 65 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/48/1048/1

diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index be1c124..b06a03e 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -178,20 +178,20 @@
   
 
   javax.servlet
-  servlet-api
+  javax.servlet-api
   jar
 
 
   org.eclipse.jetty
   jetty-server
-  8.0.0.RC0
+  9.3.11.v20160721
   jar
   compile
 
 
   org.eclipse.jetty
   jetty-servlet
-  8.0.0.RC0
+  9.3.11.v20160721
   jar
   compile
 
diff --git a/asterixdb/asterix-external-data/pom.xml 
b/asterixdb/asterix-external-data/pom.xml
index a05af3d..d4fa801 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -183,7 +183,7 @@
   
 
   javax.servlet
-  servlet-api
+  javax.servlet-api
   jar
 
 
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 4fb3e37..3172cff 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -68,7 +68,7 @@
 2.2.0
 4.11
 2.4
-2.5
+3.1.0
 20090211
 0.7.6.201602180812
   
@@ -261,6 +261,11 @@
 
   
 
+  
+  
+org.apache.maven.plugins
+maven-dependency-plugin
+2.10
   
 
 
@@ -756,7 +761,7 @@
   
   
 javax.servlet
-servlet-api
+javax.servlet-api
 ${servlet.api.version}
 jar
   
diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
index 2b59165..26b4cb6 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
@@ -41,14 +41,14 @@
 
   org.eclipse.jetty
   jetty-server
-  8.0.0.RC0
+  9.3.11.v20160721
   jar
   compile
 
 
   org.eclipse.jetty
   jetty-webapp
-  8.0.0.RC0
+  9.3.11.v20160721
   jar
   compile
 
diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java
index aa15c38..75b7473 100755
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java
@@ -31,12 +31,11 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.jetty.http.HttpMethods;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-
 import org.apache.hyracks.control.cc.ClusterControllerService;
 import org.apache.hyracks.control.common.work.SynchronizableWork;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 
 public class ApplicationInstallationHandler extends AbstractHandler {
 private ClusterControllerService ccs;
@@ -64,57 +63,64 @@
 String rootDir = ccs.getServerContext().getBaseDir().toString();
 final String deploymentDir = rootDir.endsWith(File.separator) ? 
rootDir + "applications/" + deployIdString
 : rootDir + File.separator + "/applications/" + 
File.separator + deployIdString;
-if (HttpMethods.PUT.equals(request.getMethod())) {
-class OutputStreamGetter extends SynchronizableWork {
-private OutputStream os;
+switch (HttpMethod.valueOf(request.getMethod())) {
+case PUT: {
+class OutputStreamGetter extends SynchronizableWork {
+private OutputStream os;
 
-