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 19:03:44 UTC
svn commit: r909094 - in /incubator/wink/trunk/wink-server/src:
main/java/org/apache/wink/server/internal/servlet/RestServlet.java
test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
Author: rott
Date: Thu Feb 11 18:03:08 2010
New Revision: 909094
URL: http://svn.apache.org/viewvc?rev=909094&view=rev
Log:
revert RestServlet change until Tomcat issue is resolved - see testcase in this commit
Modified:
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
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=909094&r1=909093&r2=909094&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 18:03:08 2010
@@ -66,7 +66,7 @@
LoggerFactory
.getLogger(RestServlet.class);
private static final String APPLICATION_INIT_PARAM = "javax.ws.rs.Application";
- private static final String PROPERTIES_DEFAULT_FILE = "/META-INF/wink-default.properties";
+ private static final String PROPERTIES_DEFAULT_FILE = "META-INF/wink-default.properties";
private static final String PROPERTIES_INIT_PARAM = "propertiesLocation";
private static final String APP_LOCATION_PARAM = "applicationConfigLocation";
private static final String DEPLYMENT_CONF_PARAM = "deploymentConfiguration";
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java?rev=909094&r1=909093&r2=909094&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java Thu Feb 11 18:03:08 2010
@@ -35,8 +35,14 @@
Field field = servlet.getClass().getDeclaredField("PROPERTIES_DEFAULT_FILE");
field.setAccessible(true);
String value = (String) field.get(String.class);
-
- assertTrue(value.startsWith("/"));
+
+ // TODO: review. Some containers require a '/' on a relative path, some don't.
+ // See WebSphere vs. Geronimo Tomcat
+ //
+ // Tomcat appears to not be honoring its own javadoc:
+ // http://tomcat.apache.org/tomcat-5.5-doc/servletapi/index.html
+ // -- see ServletContext.getResource
+ assertFalse(value.startsWith("/"));
}