# HG changeset patch
# User tatsuki
# Date 1404704218 -32400
# Node ID a6bf0369f0a63439c0bf30b8d279bb14882219cd
# Parent 69b5565c4a631e9a151d1b4692966f68ddc50002
Change jetty Ver
diff -r 69b5565c4a63 -r a6bf0369f0a6 .classpath
--- a/.classpath Sat Jul 05 18:28:40 2014 +0900
+++ b/.classpath Mon Jul 07 12:36:58 2014 +0900
@@ -1,71 +1,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
diff -r 69b5565c4a63 -r a6bf0369f0a6 .project
--- a/.project Sat Jul 05 18:28:40 2014 +0900
+++ b/.project Mon Jul 07 12:36:58 2014 +0900
@@ -1,32 +1,21 @@
- jungle-network
- NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
-
- jungle-core
- bulletinboard
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.jdt.core.javanature
-
-
-
- Alice
- 2
- /Users/one/hg/Database/Alice
-
-
-
+ jungle-network
+ NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
+ jungle-core
+ bulletinboard
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+ org.eclipse.jdt.core.javanature
+
+
\ No newline at end of file
diff -r 69b5565c4a63 -r a6bf0369f0a6 pom.xml
--- a/pom.xml Sat Jul 05 18:28:40 2014 +0900
+++ b/pom.xml Mon Jul 07 12:36:58 2014 +0900
@@ -27,11 +27,17 @@
4.7
test
-
- org.mortbay.jetty
- jetty
- 6.1.26
-
+
+ org.eclipse.jetty
+ jetty-server
+ 9.2.1.v20140609
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ 9.2.1.v20140609
+
+
org.hectorclient
hector-core
diff -r 69b5565c4a63 -r a6bf0369f0a6 src/main/java/app/bbs/codesegment/StartBBSCodeSegment.java
--- a/src/main/java/app/bbs/codesegment/StartBBSCodeSegment.java Sat Jul 05 18:28:40 2014 +0900
+++ b/src/main/java/app/bbs/codesegment/StartBBSCodeSegment.java Mon Jul 07 12:36:58 2014 +0900
@@ -5,15 +5,17 @@
import javax.servlet.Servlet;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.CreateBoardMessageServlet;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.CreateBoardServlet;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.EditMessageServlet;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.EditMessageUseGetServlet;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.ShowBoardsServlet;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
+
import alice.codesegment.CodeSegment;
import alice.datasegment.CommandType;
@@ -97,7 +99,7 @@
context.addServletWithMapping(new ServletHolder(requestNumCheckServlet), requestNumCheckPath);
- serv.addHandler(context);
+ serv.setHandler(context);
try {
serv.start();
} catch (Exception e) {