diff --git a/data-discovery/pom.xml b/data-discovery/pom.xml index dc71e6087563971a43c8cee134fc3c2b862f63f2..1d20c3e1619c47b888604cd96f3b5fdab8a0c57e 100644 --- a/data-discovery/pom.xml +++ b/data-discovery/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>vo</groupId> <artifactId>vlkb-volib</artifactId> - <version>0.9.2</version> + <version>0.9.3</version> </dependency> <dependency> diff --git a/data-discovery/src/main/java/webapi/SearchServlet.java b/data-discovery/src/main/java/webapi/SearchServlet.java index 20b0896ad6671e818d425d291f2c7d3a92da686d..a6a471504f992dde352a331e605ce822da175eb6 100644 --- a/data-discovery/src/main/java/webapi/SearchServlet.java +++ b/data-discovery/src/main/java/webapi/SearchServlet.java @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import vo.parameter.*; +import vo.error.*; public class SearchServlet extends javax.servlet.http.HttpServlet { @@ -128,7 +129,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet response.setContentType("text/plain"); PrintWriter writer = response.getWriter(); - Response.doMultiValuedParamNotSupported(ex.getMessage(), writer); + Lib.doMultiValuedParamNotSupported(ex.getMessage(), writer); writer.close(); } catch(IllegalArgumentException ex) @@ -139,7 +140,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet response.setContentType("text/plain"); PrintWriter writer = response.getWriter(); - Response.doUsageError(ex.getMessage(), writer); + Lib.doUsageError(ex.getMessage(), writer); writer.close(); } catch(Exception ex) @@ -151,7 +152,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet response.setContentType("text/plain"); PrintWriter writer = response.getWriter(); - Response.doError(ex.toString(), writer); + Lib.doError(ex.toString(), writer); writer.close(); } diff --git a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java index f8d3d25a1b82c003b262f1eca9cc411760f868a1..223a4600943a4b05e3a8b7873748df95a7b5ed9d 100644 --- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java +++ b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java @@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponseWrapper; import java.nio.charset.Charset; import vo.parameter.*; +import vo.error.*; public class FormatResponseFilter implements Filter @@ -98,7 +99,7 @@ public class FormatResponseFilter implements Filter final String errMsg = "Illegal response format request: " + respFormat; LOGGER.warning(errMsg); response.setContentType("text/plain"); - Response.doUsageError(errMsg, responseWriter); + Lib.doUsageError(errMsg, responseWriter); // FIXME set http err code } @@ -117,7 +118,7 @@ public class FormatResponseFilter implements Filter responseWrapper.setContentType("text/plain"); PrintWriter writer = responseWrapper.getWriter(); - Response.doMultiValuedParamNotSupported(ex.getMessage(), writer); + Lib.doMultiValuedParamNotSupported(ex.getMessage(), writer); writer.close(); } catch(IllegalArgumentException ex) @@ -128,7 +129,7 @@ public class FormatResponseFilter implements Filter responseWrapper.setContentType("text/plain"); PrintWriter writer = responseWrapper.getWriter(); - Response.doUsageError(ex.getMessage(), writer); + Lib.doUsageError(ex.getMessage(), writer); writer.close(); } catch(Exception ex) @@ -140,7 +141,7 @@ public class FormatResponseFilter implements Filter responseWrapper.setContentType("text/plain"); PrintWriter writer = responseWrapper.getWriter(); - Response.doError(ex.toString(), writer); + Lib.doError(ex.toString(), writer); writer.close(); }