You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ro...@apache.org on 2010/02/11 23:54:50 UTC
svn commit: r909170 - in /incubator/wink/trunk:
wink-examples/ext/History/src/test/java/org/apache/wink/example/history/
wink-server/src/main/java/org/apache/wink/server/internal/servlet/
wink-server/src/main/java/org/apache/wink/server/internal/utils/...
Author: rott
Date: Thu Feb 11 22:54:34 2010
New Revision: 909170
URL: http://svn.apache.org/viewvc?rev=909170&view=rev
Log:
protect against MalformedURLException when properties file path does not start with slash - sorry for the churn on this one
Removed:
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/
Modified:
incubator/wink/trunk/wink-examples/ext/History/src/test/java/org/apache/wink/example/history/HistoryTest.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethod2Test.java
Modified: incubator/wink/trunk/wink-examples/ext/History/src/test/java/org/apache/wink/example/history/HistoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/src/test/java/org/apache/wink/example/history/HistoryTest.java?rev=909170&r1=909169&r2=909170&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/History/src/test/java/org/apache/wink/example/history/HistoryTest.java (original)
+++ incubator/wink/trunk/wink-examples/ext/History/src/test/java/org/apache/wink/example/history/HistoryTest.java Thu Feb 11 22:54:34 2010
@@ -53,7 +53,7 @@
@Override
protected String getPropertiesFile() {
- return TestUtils.packageToPath(getClass().getPackage().getName()) + "\\history.properties";
+ return TestUtils.packageToPath(getClass().getPackage().getName()) + "/history.properties";
}
public void testAll() throws Exception {
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=909170&r1=909169&r2=909170&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Thu Feb 11 22:54:34 2010
@@ -19,6 +19,7 @@
*******************************************************************************/
package org.apache.wink.server.internal.servlet;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@@ -179,6 +180,21 @@
return new ServletWinkApplication(getServletContext(), appLocationParameter);
}
+ /**
+ * loadProperties will try to load the properties in the following order.
+ * <ol>
+ * <li>Custom configuration file (defined in init parameter)</li>
+ * <li>The default properties file</li>
+ * <li>System properties (reads the keys defined in the properties to do the
+ * specific lookups and does a lookup for properties that have empty values)
+ * </li>
+ * </ol>
+ *
+ * @param resourceName
+ * @param defaultProperties
+ * @return
+ * @throws IOException
+ */
private Properties loadProperties(String resourceName, Properties defaultProperties)
throws IOException {
Properties properties =
@@ -188,6 +204,8 @@
try {
is = ServletFileLoader.loadFileAsStream(getServletContext(), resourceName);
properties.load(is);
+ } catch (FileNotFoundException e) {
+ logger.debug("FileNotFoundException for {}", resourceName);
} finally {
try {
if (is != null) {
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java?rev=909170&r1=909169&r2=909170&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java Thu Feb 11 22:54:34 2010
@@ -41,9 +41,11 @@
if (servletContext != null) {
logger.debug("Searching for {} using servlet context.", fileName);
- InputStream is = servletContext.getResourceAsStream(fileName);
- if (is != null) {
- return is;
+ if(fileName.startsWith("/")) { // protect against MalformedURLException
+ InputStream is = servletContext.getResourceAsStream(fileName);
+ if (is != null) {
+ return is;
+ }
}
}
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethod2Test.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethod2Test.java?rev=909170&r1=909169&r2=909170&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethod2Test.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethod2Test.java Thu Feb 11 22:54:34 2010
@@ -35,7 +35,7 @@
@Override
protected String getPropertiesFile() {
- return TestUtils.packageToPath(FindResourceMethod2Test.class.getPackage().getName()) + "\\FindResourceMethodTest2.properties";
+ return TestUtils.packageToPath(FindResourceMethod2Test.class.getPackage().getName()) + "/FindResourceMethodTest2.properties";
}
public void testContinuedSearch_1_2() throws Exception {