diff --git a/data-discovery/mvn-install-own-deps.sh b/data-discovery/mvn-install-own-deps.sh
index adcacca013c98e21b84256b867b4bba426968796..1ed3d8b97d2156780a8d190c1780760504c34e11 100755
--- a/data-discovery/mvn-install-own-deps.sh
+++ b/data-discovery/mvn-install-own-deps.sh
@@ -19,12 +19,4 @@ mvn install:install-file \
-Dpackaging=jar \
-DgeneratePom=true
-mvn install:install-file \
- -Dfile=../java-libs/lib/vlkb-volib-0.9.1.jar \
- -DgroupId=vo \
- -DartifactId=vlkb-volib \
- -Dversion=0.9.1 \
- -Dpackaging=jar \
- -DgeneratePom=true
-
diff --git a/data-discovery/pom.xml b/data-discovery/pom.xml
index 10056ad4d9b60eceef2f4800d2295b31c570ab6f..f4708cc4830da8909ddea712079fdef6443a1af3 100644
--- a/data-discovery/pom.xml
+++ b/data-discovery/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>vo</groupId>
<artifactId>vlkb-volib</artifactId>
- <version>0.9.1</version>
+ <version>0.9.2</version>
</dependency>
<dependency>
diff --git a/data-discovery/src/main/java/webapi/MultiValuedParamNotSupported.java b/data-discovery/src/main/java/webapi/MultiValuedParamNotSupported.java
deleted file mode 100644
index 2b3dd3c6a1efaf93eeea9eccb4b359e0200ab8c4..0000000000000000000000000000000000000000
--- a/data-discovery/src/main/java/webapi/MultiValuedParamNotSupported.java
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-public class MultiValuedParamNotSupported extends IllegalArgumentException {
- public MultiValuedParamNotSupported(String errorMessage){//, Throwable err) {
- super(errorMessage);//, err);
- }
-}
diff --git a/data-discovery/src/main/java/webapi/SearchServlet.java b/data-discovery/src/main/java/webapi/SearchServlet.java
index 7b8c605907914ba16e26fb257513d8afc3a90d50..ab6ad1c8415813a9151df7d00c3396e0ff56336b 100644
--- a/data-discovery/src/main/java/webapi/SearchServlet.java
+++ b/data-discovery/src/main/java/webapi/SearchServlet.java
@@ -38,22 +38,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
LOGGER.config("DB: " + settings.dbConn.toString());
}
- 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);
- }
-
-
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException, UnsupportedEncodingException
{
@@ -146,7 +130,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
- doMultiValuedParamNotSupported(ex.getMessage(), writer);
+ Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);
writer.close();
}
catch(IllegalArgumentException ex)
@@ -157,7 +141,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
- doUsageError(ex.getMessage(), writer);
+ Response.doUsageError(ex.getMessage(), writer);
writer.close();
}
catch(Exception ex)
@@ -169,7 +153,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
- doError(ex.toString(), writer);
+ Response.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 42c0f4f966a2422c6b7d056f8b60cccf4fb89732..f8d3d25a1b82c003b262f1eca9cc411760f868a1 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
@@ -28,38 +28,17 @@ public class FormatResponseFilter implements Filter
private static final FormatResponseSettings settings = FormatResponseSettings.getInstance(
"formatresponsefilter.properties");
- //@Override
public void init(FilterConfig filterConfig) throws ServletException
{
LOGGER.config("Default charset: " + Charset.defaultCharset());
LOGGER.config("DB: " + settings.dbConn.toString());
}
- // FIXME move error handling funcs to VOlib
-
- private void doMultiValuedParamNotSupported(String message, PrintWriter printWriter)
- {
- printWriter.println("MultiValuedParamNotSupported : " + message);
- }
-
- private void doUsageError(String message, PrintWriter printWriter)
- {
- printWriter.println("UsageError : " + message);
- }
-
- private void doError(String message, PrintWriter printWriter)
- {
- printWriter.println("Error : " + message);
- }
-
-
-
- //@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException
{
LOGGER.fine("trace");
- LOGGER.fine("REQUEST START =============================================================================================");
+ LOGGER.fine("REQUEST START");
final String RESPONSE_ENCODING = "UTF-8";
final String DEFAULT_RESPONSEFORMAT = settings.defaults.responseFormat;
@@ -119,7 +98,7 @@ public class FormatResponseFilter implements Filter
final String errMsg = "Illegal response format request: " + respFormat;
LOGGER.warning(errMsg);
response.setContentType("text/plain");
- doUsageError(errMsg, responseWriter);
+ Response.doUsageError(errMsg, responseWriter);
// FIXME set http err code
}
@@ -138,7 +117,7 @@ public class FormatResponseFilter implements Filter
responseWrapper.setContentType("text/plain");
PrintWriter writer = responseWrapper.getWriter();
- doMultiValuedParamNotSupported(ex.getMessage(), writer);
+ Response.doMultiValuedParamNotSupported(ex.getMessage(), writer);
writer.close();
}
catch(IllegalArgumentException ex)
@@ -149,7 +128,7 @@ public class FormatResponseFilter implements Filter
responseWrapper.setContentType("text/plain");
PrintWriter writer = responseWrapper.getWriter();
- doUsageError(ex.getMessage(), writer);
+ Response.doUsageError(ex.getMessage(), writer);
writer.close();
}
catch(Exception ex)
@@ -161,11 +140,11 @@ public class FormatResponseFilter implements Filter
responseWrapper.setContentType("text/plain");
PrintWriter writer = responseWrapper.getWriter();
- doError(ex.toString(), writer);
+ Response.doError(ex.toString(), writer);
writer.close();
}
- LOGGER.fine("REQUEST END =============================================================================================");
+ LOGGER.fine("REQUEST END");
}
//@Override
diff --git a/java-libs/lib/vlkb-volib-0.9.1.jar b/java-libs/lib/vlkb-volib-0.9.1.jar
deleted file mode 100644
index 1e6d4454eff568b8218699363b5399f904acc70a..0000000000000000000000000000000000000000
Binary files a/java-libs/lib/vlkb-volib-0.9.1.jar and /dev/null differ
diff --git a/java-libs/lib/vlkb-volib-0.9.2.jar b/java-libs/lib/vlkb-volib-0.9.2.jar
new file mode 100644
index 0000000000000000000000000000000000000000..514ca7f74e15a69d9f2ed754e1334b2fafb0f538
Binary files /dev/null and b/java-libs/lib/vlkb-volib-0.9.2.jar differ