Commit 45f91d28 authored by Robert Butora's avatar Robert Butora
Browse files

updates volib to 0.9.3 (fixes vo.error package and renames Response -> Lib)

parent 2e245c3c

data-discovery/pom.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
          <dependency>

          <dependency>

                  <groupId>vo</groupId>

                  <groupId>vo</groupId>

                  <artifactId>vlkb-volib</artifactId>

                  <artifactId>vlkb-volib</artifactId>

                  <version>0.9.2</version>

                  <version>0.9.3</version>

          </dependency>

          </dependency>





          <dependency>

          <dependency>

data-discovery/src/main/java/webapi/SearchServlet.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; 
import javax.servlet.http.HttpServletResponse;

import javax.servlet.http.HttpServletResponse;





import vo.parameter.*;

import vo.parameter.*;

import vo.error.*;





public class SearchServlet extends javax.servlet.http.HttpServlet

public class SearchServlet extends javax.servlet.http.HttpServlet

{

{
@@ -128,7 +129,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet 
         response.setContentType("text/plain");

         response.setContentType("text/plain");





         PrintWriter writer = response.getWriter();

         PrintWriter writer = response.getWriter();

         Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);

         Lib.doMultiValuedParamNotSupported(ex.getMessage(), writer);

         writer.close();

         writer.close();

      }

      }

      catch(IllegalArgumentException ex)

      catch(IllegalArgumentException ex)
@@ -139,7 +140,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet 
         response.setContentType("text/plain");

         response.setContentType("text/plain");





         PrintWriter writer = response.getWriter();

         PrintWriter writer = response.getWriter();

         Response.doUsageError(ex.getMessage(), writer);

         Lib.doUsageError(ex.getMessage(), writer);

         writer.close();

         writer.close();

      }

      }

      catch(Exception ex)

      catch(Exception ex)
@@ -151,7 +152,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet 
         response.setContentType("text/plain");

         response.setContentType("text/plain");





         PrintWriter writer = response.getWriter();

         PrintWriter writer = response.getWriter();

         Response.doError(ex.toString(), writer);

         Lib.doError(ex.toString(), writer);

         writer.close();

         writer.close();

      }

      }

data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponseWrapper; 
import java.nio.charset.Charset;

import java.nio.charset.Charset;





import vo.parameter.*;

import vo.parameter.*;

import vo.error.*;









public class FormatResponseFilter implements Filter

public class FormatResponseFilter implements Filter
@@ -98,7 +99,7 @@ public class FormatResponseFilter implements Filter 
               final String errMsg = "Illegal response format request: " + respFormat;

               final String errMsg = "Illegal response format request: " + respFormat;

               LOGGER.warning(errMsg);

               LOGGER.warning(errMsg);

               response.setContentType("text/plain");

               response.setContentType("text/plain");

               Response.doUsageError(errMsg, responseWriter);

               Lib.doUsageError(errMsg, responseWriter);

               // FIXME set http err code 

               // FIXME set http err code 

            }

            }
@@ -117,7 +118,7 @@ public class FormatResponseFilter implements Filter 
         responseWrapper.setContentType("text/plain");

         responseWrapper.setContentType("text/plain");





         PrintWriter writer = responseWrapper.getWriter();

         PrintWriter writer = responseWrapper.getWriter();

         Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);

         Lib.doMultiValuedParamNotSupported(ex.getMessage(), writer);

         writer.close();

         writer.close();

      }

      }

      catch(IllegalArgumentException ex)

      catch(IllegalArgumentException ex)
@@ -128,7 +129,7 @@ public class FormatResponseFilter implements Filter 
         responseWrapper.setContentType("text/plain");

         responseWrapper.setContentType("text/plain");





         PrintWriter writer = responseWrapper.getWriter();

         PrintWriter writer = responseWrapper.getWriter();

         Response.doUsageError(ex.getMessage(), writer);

         Lib.doUsageError(ex.getMessage(), writer);

         writer.close();

         writer.close();

      }

      }

      catch(Exception ex)

      catch(Exception ex)
@@ -140,7 +141,7 @@ public class FormatResponseFilter implements Filter 
         responseWrapper.setContentType("text/plain");

         responseWrapper.setContentType("text/plain");





         PrintWriter writer = responseWrapper.getWriter();

         PrintWriter writer = responseWrapper.getWriter();

         Response.doError(ex.toString(), writer);

         Lib.doError(ex.toString(), writer);

         writer.close();

         writer.close();

      }

      }