diff --git a/data-access/servlet/src/main/java/ops/VlkbCli.java b/data-access/servlet/src/main/java/ops/VlkbCli.java index f10ff25fd7f7c8f1e8ae2ea78b3317a2633035d3..97e4fcd03c283d3ccac7c9b889b2e1728bd678a0 100644 --- a/data-access/servlet/src/main/java/ops/VlkbCli.java +++ b/data-access/servlet/src/main/java/ops/VlkbCli.java @@ -36,6 +36,7 @@ import java.text.SimpleDateFormat; import org.json.simple.JSONArray; import vo.parameter.*; +import vo.error.*; class VlkbCli implements Vlkb { diff --git a/data-access/servlet/src/main/java/webapi/ServletCutout.java b/data-access/servlet/src/main/java/webapi/ServletCutout.java index 459109938b7132c3329426a7d0ceadf8327a1c6a..c0d9495f43fb8fb50b16e81a905b75f6b1b70941 100644 --- a/data-access/servlet/src/main/java/webapi/ServletCutout.java +++ b/data-access/servlet/src/main/java/webapi/ServletCutout.java @@ -44,6 +44,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import vo.parameter.*; +import vo.error.*; public class ServletCutout extends HttpServlet { @@ -167,22 +168,6 @@ public class ServletCutout extends HttpServlet } - protected void doMultiValuedParamNotSupported(String message, PrintWriter printWriter) - { - printWriter.println("MultiValuedParamNotSupported : " + message); - } - - protected void doUsageError(String message, PrintWriter printWriter) - { - printWriter.println("UsageError : " + message); - } - - protected void doError(String message, PrintWriter printWriter) - { - printWriter.println("Error : " + message); - } - - /* HTTP/J2EE -> SODA */ @@ -307,7 +292,7 @@ public class ServletCutout extends HttpServlet response.setContentType("text/plain"); PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING)); - doMultiValuedParamNotSupported(ex.getMessage(), writer); + Lib.doMultiValuedParamNotSupported(ex.getMessage(), writer); writer.close(); } @@ -319,7 +304,7 @@ public class ServletCutout extends HttpServlet response.setContentType("text/plain"); PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING)); - doUsageError(ex.getMessage(), writer); + Lib.doUsageError(ex.getMessage(), writer); writer.close(); } @@ -332,7 +317,7 @@ public class ServletCutout extends HttpServlet response.setContentType("text/plain"); PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING)); - doError(ex.toString(), writer); + Lib.doError(ex.toString(), writer); writer.close(); } diff --git a/java-libs/lib/vlkb-volib-0.9.1-SNAPSHOT.jar b/java-libs/lib/vlkb-volib-0.9.1-SNAPSHOT.jar deleted file mode 100644 index 4af8f63066eaec4a80adaabf4e4dd13fb30d47c3..0000000000000000000000000000000000000000 Binary files a/java-libs/lib/vlkb-volib-0.9.1-SNAPSHOT.jar and /dev/null differ diff --git a/java-libs/lib/vlkb-volib-0.9.3.jar b/java-libs/lib/vlkb-volib-0.9.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..af38dee1155e10efe07f8029b4e34110eb56dce5 Binary files /dev/null and b/java-libs/lib/vlkb-volib-0.9.3.jar differ