wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r811668 [2/2] - in /incubator/wink/trunk/wink-itests: wink-itest-support/src/main/java/org/apache/wink/test/integration/ wink-itest/ wink-itest/wink-itest-context/src/main/webapp/WEB-INF/ wink-itest/wink-itest-context/src/test/java/org/apac...
Date Sat, 05 Sep 2009 16:29:33 GMT
Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.filter.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.filter.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.filter.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.filter.xml Sat Sep  5 16:29:30 2009
@@ -18,15 +18,16 @@
     under the License.
 -->
 
+
 <!DOCTYPE web-app PUBLIC
  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
  "http://java.sun.com/dtd/web-app_2_3.dtd" >
 
 <web-app>
     <display-name>Archetype Created Web Application</display-name>
-    <servlet>
-        <servlet-name>MessageBodyReaders</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    <filter>
+        <filter-name>MessageBodyReaders</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.readers.Application</param-value>
@@ -35,11 +36,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_3</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>MessageBodyReaderExceptions</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>MessageBodyReaderExceptions</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.readerexceptions.Application</param-value>
@@ -48,11 +48,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_2</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>MessageBodyWriters</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>MessageBodyWriters</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.writers.Application</param-value>
@@ -61,20 +60,18 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_4</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>MessageBodyWriterExceptions</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>MessageBodyWriterExceptions</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.writerexceptions.Application</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>StandardEntityProviders</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>StandardEntityProviders</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.standard.Application</param-value>
@@ -83,11 +80,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_standard</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ExceptionMapperMappedProviders</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ExceptionMapperMappedProviders</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.exceptionmappers.mapped.GuestbookApplication</param-value>
@@ -96,11 +92,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_exceptionmappers</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ExceptionMapperNoMapper</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ExceptionMapperNoMapper</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.exceptionmappers.nomapper.GuestbookApplication</param-value>
@@ -109,12 +104,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_noexceptionmappers</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-        
-    <servlet>
-        <servlet-name>ExceptionMapperNull</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ExceptionMapperNull</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.exceptionmappers.nullconditions.Application</param-value>
@@ -123,11 +116,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_nullconditions</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>SubresourceExceptions</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>SubresourceExceptions</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.subresource.Application</param-value>
@@ -136,11 +128,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_subresourceexceptions</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>SimpleContestResolver</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>SimpleContestResolver</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.contextresolver.Application</param-value>
@@ -149,47 +140,45 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_simplecontextresolver</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>MessageBodyReaders</servlet-name>
-        <url-pattern>/readers/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>MessageBodyReaderExceptions</servlet-name>
-        <url-pattern>/readerexceptions/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>MessageBodyWriters</servlet-name>
-        <url-pattern>/writers/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>MessageBodyWriterExceptions</servlet-name>
-        <url-pattern>/writerexceptions/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>StandardEntityProviders</servlet-name>
-        <url-pattern>/standard/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ExceptionMapperMappedProviders</servlet-name>
-        <url-pattern>/exceptionsmapped/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ExceptionMapperNoMapper</servlet-name>
-        <url-pattern>/exceptionsnomapper/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ExceptionMapperNull</servlet-name>
-        <url-pattern>/exceptionsnull/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SubresourceExceptions</servlet-name>
-        <url-pattern>/subresourceexceptions/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SimpleContestResolver</servlet-name>
-        <url-pattern>/simplecontextresolver/*</url-pattern>
-    </servlet-mapping>
-    
+    </filter>
+    <filter-mapping>
+        <filter-name>MessageBodyReaders</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>MessageBodyReaderExceptions</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>MessageBodyWriters</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>MessageBodyWriterExceptions</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>StandardEntityProviders</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ExceptionMapperMappedProviders</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ExceptionMapperNoMapper</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ExceptionMapperNull</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>SubresourceExceptions</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>SimpleContestResolver</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.servlet.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.servlet.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.servlet.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.servlet.xml Sat Sep  5 16:29:30 2009
@@ -111,7 +111,6 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-        
     <servlet>
         <servlet-name>ExceptionMapperNull</servlet-name>
         <servlet-class>${wink.rest.servlet}</servlet-class>
@@ -191,5 +190,4 @@
         <servlet-name>SimpleContestResolver</servlet-name>
         <url-pattern>/simplecontextresolver/*</url-pattern>
     </servlet-mapping>
-    
 </web-app>

Propchange: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/ContextTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/ContextTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/ContextTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/ContextTest.java Sat Sep  5 16:29:30 2009
@@ -40,10 +40,11 @@
 
 public class ContextTest extends TestCase {
 
-    final private static String USER_URI = getBaseURI() + "/simplecontextresolver/user";
-
     public static String getBaseURI() {
-        return ServerEnvironmentInfo.getBaseURI();
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/user";
+        }
+        return ServerEnvironmentInfo.getBaseURI() + "/simplecontextresolver/user";
     }
 
     public void testUserContextProvider() throws Exception {
@@ -57,7 +58,7 @@
         StringWriter sw = new StringWriter();
         Marshaller m = context.createMarshaller();
         m.marshal(element, sw);
-        PostMethod postMethod = new PostMethod(USER_URI);
+        PostMethod postMethod = new PostMethod(getBaseURI());
         try {
             postMethod.setRequestEntity(new ByteArrayRequestEntity(sw.toString().getBytes(),
                                                                    "text/xml"));
@@ -67,7 +68,7 @@
             postMethod.releaseConnection();
         }
 
-        GetMethod getMethod = new GetMethod(USER_URI + "/joedoe@example.com");
+        GetMethod getMethod = new GetMethod(getBaseURI() + "/joedoe@example.com");
         try {
             httpClient.executeMethod(getMethod);
             assertEquals(200, getMethod.getStatusCode());

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/DepartmentTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/DepartmentTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/DepartmentTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/DepartmentTest.java Sat Sep  5 16:29:30 2009
@@ -46,6 +46,9 @@
 public class DepartmentTest extends TestCase {
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/departments";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/simplecontextresolver/departments";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsMappedProvidersTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsMappedProvidersTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsMappedProvidersTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsMappedProvidersTest.java Sat Sep  5 16:29:30 2009
@@ -34,6 +34,9 @@
 public class JAXRSExceptionsMappedProvidersTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/guestbookmapped";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/exceptionsmapped" + "/guestbookmapped";
     }
 
@@ -46,7 +49,11 @@
     public void testRegularWorkflow() throws Exception {
         HttpClient client = new HttpClient();
 
-        PostMethod postMethod = new PostMethod(getBaseURI());
+        PostMethod postMethod = new PostMethod(getBaseURI() + "/clear");
+        client.executeMethod(postMethod);
+        assertEquals(204, postMethod.getStatusCode());
+
+        postMethod = new PostMethod(getBaseURI());
         postMethod
             .setRequestEntity(new StringRequestEntity(
                                                       "<comment><message>Hello World!</message><author>Anonymous</author></comment>",

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNoMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNoMapperTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNoMapperTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNoMapperTest.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
 public class JAXRSExceptionsNoMapperTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/guestbooknomap";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/exceptionsnomapper" + "/guestbooknomap";
     }
 
@@ -51,7 +54,11 @@
         /* FIXME: this is not a repeatable test */
         HttpClient client = new HttpClient();
 
-        PostMethod postMethod = new PostMethod(getBaseURI());
+        PostMethod postMethod = new PostMethod(getBaseURI() + "/clear");
+        client.executeMethod(postMethod);
+        assertEquals(204, postMethod.getStatusCode());
+
+        postMethod = new PostMethod(getBaseURI());
         postMethod
             .setRequestEntity(new StringRequestEntity(
                                                       "<comment><message>Hello World!</message><author>Anonymous</author></comment>",

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNullConditionsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNullConditionsTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNullConditionsTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNullConditionsTest.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
 public class JAXRSExceptionsNullConditionsTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/guestbooknullconditions";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/exceptionsnull" + "/guestbooknullconditions";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readerexceptions/JAXRSMessageBodyReaderExceptionsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readerexceptions/JAXRSMessageBodyReaderExceptionsTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readerexceptions/JAXRSMessageBodyReaderExceptionsTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readerexceptions/JAXRSMessageBodyReaderExceptionsTest.java Sat Sep  5 16:29:30 2009
@@ -37,6 +37,9 @@
 public class JAXRSMessageBodyReaderExceptionsTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/readerexceptions";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readers/JAXRSMessageBodyReadersTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readers/JAXRSMessageBodyReadersTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readers/JAXRSMessageBodyReadersTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readers/JAXRSMessageBodyReadersTest.java Sat Sep  5 16:29:30 2009
@@ -37,6 +37,9 @@
 public class JAXRSMessageBodyReadersTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/readers";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSBytesArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSBytesArrayTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSBytesArrayTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSBytesArrayTest.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
 public class JAXRSBytesArrayTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSDataSourceTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSDataSourceTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSDataSourceTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSDataSourceTest.java Sat Sep  5 16:29:30 2009
@@ -44,6 +44,9 @@
 public class JAXRSDataSourceTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSFileTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSFileTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSFileTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSFileTest.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
 public class JAXRSFileTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSInputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSInputStreamTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSInputStreamTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSInputStreamTest.java Sat Sep  5 16:29:30 2009
@@ -39,6 +39,9 @@
 public class JAXRSInputStreamTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSMultivaluedMapTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSMultivaluedMapTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSMultivaluedMapTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSMultivaluedMapTest.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
 public class JAXRSMultivaluedMapTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSReaderTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSReaderTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSReaderTest.java Sat Sep  5 16:29:30 2009
@@ -41,6 +41,9 @@
 public class JAXRSReaderTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSSourceTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSSourceTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSSourceTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSSourceTest.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
 public class JAXRSSourceTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 
@@ -186,8 +189,7 @@
             String str = getMethod.getResponseBodyAsString();
             assertEquals(str, 200, getMethod.getStatusCode());
 
-            assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><message><user>user1</user><password>user1pwd</password></message>",
-                         str);
+            assertTrue(str, str.contains("<message><user>user1</user><password>user1pwd</password></message>"));
 
             String contentType =
                 (getMethod.getResponseHeader("Content-Type") == null) ? null : getMethod

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSStreamingOutputTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSStreamingOutputTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSStreamingOutputTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSStreamingOutputTest.java Sat Sep  5 16:29:30 2009
@@ -39,6 +39,9 @@
 public class JAXRSStreamingOutputTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/standard";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/subresources/JAXRSExceptionsSubresourcesTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/subresources/JAXRSExceptionsSubresourcesTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/subresources/JAXRSExceptionsSubresourcesTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/subresources/JAXRSExceptionsSubresourcesTest.java Sat Sep  5 16:29:30 2009
@@ -34,6 +34,9 @@
 public class JAXRSExceptionsSubresourcesTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/guestbooksubresources";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/subresourceexceptions/guestbooksubresources";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writerexceptions/JAXRSMessageBodyWriterExceptionThrownTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writerexceptions/JAXRSMessageBodyWriterExceptionThrownTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writerexceptions/JAXRSMessageBodyWriterExceptionThrownTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writerexceptions/JAXRSMessageBodyWriterExceptionThrownTest.java Sat Sep  5 16:29:30 2009
@@ -39,6 +39,9 @@
 public class JAXRSMessageBodyWriterExceptionThrownTest extends TestCase {
 
     public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/writerexceptions";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writers/JAXRSMessageBodyWritersTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writers/JAXRSMessageBodyWritersTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writers/JAXRSMessageBodyWritersTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writers/JAXRSMessageBodyWritersTest.java Sat Sep  5 16:29:30 2009
@@ -35,7 +35,10 @@
 
 public class JAXRSMessageBodyWritersTest extends TestCase {
 
-    public String getBaseURI() {
+    public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/writers";
     }
 
@@ -71,8 +74,8 @@
             client.executeMethod(getMethod);
 
             assertEquals(200, getMethod.getStatusCode());
-            assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", getMethod
-                .getResponseBodyAsString());
+            assertTrue(getMethod.getResponseBodyAsString(), getMethod.getResponseBodyAsString()
+                .startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\""));
             assertEquals("text/xml", getMethod.getResponseHeader("Content-Type").getValue());
         } finally {
             getMethod.releaseConnection();

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.filter.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.filter.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.filter.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.filter.xml Sat Sep  5 16:29:30 2009
@@ -23,9 +23,9 @@
 
 <web-app>
     <display-name>Archetype Created Web Application</display-name>
-    <servlet>
-        <servlet-name>CustomHTTPMethodAnnotations</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    <filter>
+        <filter-name>CustomHTTPMethodAnnotations</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.methodannotations.Application</param-value>
@@ -34,11 +34,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_customannotations</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>Lifecycles</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>Lifecycles</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.lifecycles.Application</param-value>
@@ -47,11 +46,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_lifecycles</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ReturnTypes</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ReturnTypes</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.returntype.Application</param-value>
@@ -60,11 +58,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_returntypes</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>Exceptional</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>Exceptional</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.exceptions.Application</param-value>
@@ -73,11 +70,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_exceptions</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>Sequence</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>Sequence</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.sequence.Application</param-value>
@@ -86,11 +82,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_sequence</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>LargeEntity</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>LargeEntity</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.largeentity.Application</param-value>
@@ -99,11 +94,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_largeentity</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>Headers</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>Headers</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.headers.Application</param-value>
@@ -112,11 +106,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_headers</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>NoFindMethods</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>NoFindMethods</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.nofindmethods.Application</param-value>
@@ -125,11 +118,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_nofindmethods</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>Cache</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>Cache</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.cache.Application</param-value>
@@ -138,11 +130,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_cache</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ContentNegotiation</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ContentNegotiation</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.contentnegotiation.Application</param-value>
@@ -151,11 +142,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_negotiation</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>AddressBook</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>AddressBook</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.addressbook.AddressApplication</param-value>
@@ -164,11 +154,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_addressbook</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>VersionTests</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>VersionTests</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.version.Application</param-value>
@@ -177,11 +166,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_version</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ContentEncoding</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ContentEncoding</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.contentencoding.ContentEncodingApplication</param-value>
@@ -190,11 +178,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_contentencoding</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>TransferEncoding</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>TransferEncoding</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.transferencoding.TransferEncodingApplication</param-value>
@@ -203,62 +190,61 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_transferencoding</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>CustomHTTPMethodAnnotations</servlet-name>
-        <url-pattern>/customannotations/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Lifecycles</servlet-name>
-        <url-pattern>/lifecycles/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ReturnTypes</servlet-name>
-        <url-pattern>/returntypes/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Exceptional</servlet-name>
-        <url-pattern>/exceptional/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Sequence</servlet-name>
-        <url-pattern>/sequence/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>LargeEntity</servlet-name>
-        <url-pattern>/largeentity/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Headers</servlet-name>
-        <url-pattern>/headers/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>NoFindMethods</servlet-name>
-        <url-pattern>/nofindmethods/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Cache</servlet-name>
-        <url-pattern>/cache/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ContentNegotiation</servlet-name>
-        <url-pattern>/contentNegotiation/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>AddressBook</servlet-name>
-        <url-pattern>/addressBook/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>VersionTests</servlet-name>
-        <url-pattern>/version/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ContentEncoding</servlet-name>
-        <url-pattern>/contentencoding/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>TransferEncoding</servlet-name>
-        <url-pattern>/transferencoding/*</url-pattern>
-    </servlet-mapping>
+    </filter>
+    <filter-mapping>
+        <filter-name>CustomHTTPMethodAnnotations</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>Lifecycles</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ReturnTypes</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>Exceptional</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>Sequence</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>LargeEntity</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>Headers</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>NoFindMethods</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>Cache</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ContentNegotiation</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>AddressBook</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>VersionTests</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ContentEncoding</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>TransferEncoding</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.servlet.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.servlet.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.servlet.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
    (empty)

Propchange: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/addressbook/StringTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/addressbook/StringTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/addressbook/StringTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/addressbook/StringTest.java Sat Sep  5 16:29:30 2009
@@ -42,7 +42,8 @@
 public class StringTest extends TestCase {
 
     final private static String BASE_URI =
-                                             ServerEnvironmentInfo.getBaseURI() + "/addressBook/"
+                                             ServerEnvironmentInfo.getBaseURI() + (ServerEnvironmentInfo
+                                                 .isRestFilterUsed() ? "" : "/addressBook/")
                                                  + "/unittests/addresses";
 
     @Override

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/cachetest/ClientTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/cachetest/ClientTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/cachetest/ClientTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/cachetest/ClientTest.java Sat Sep  5 16:29:30 2009
@@ -41,7 +41,9 @@
 public class ClientTest extends TestCase {
 
     final private static String     NEWS_BASE_URI =
-                                                      ServerEnvironmentInfo.getBaseURI() + "/cache/news";
+                                                      ServerEnvironmentInfo.getBaseURI() + ((ServerEnvironmentInfo
+                                                          .isRestFilterUsed()) ? "" : "/cache")
+                                                          + "/news";
 
     private static final DateFormat formatter     =
                                                       new SimpleDateFormat(

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentencoding/ContentEncodingTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentencoding/ContentEncodingTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentencoding/ContentEncodingTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentencoding/ContentEncodingTest.java Sat Sep  5 16:29:30 2009
@@ -38,7 +38,9 @@
 
     private HttpClient          client;
 
-    final private static String BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/contentencoding";
+    final private static String BASE_URI =
+                                             ServerEnvironmentInfo.getBaseURI() + ((ServerEnvironmentInfo
+                                                 .isRestFilterUsed()) ? "" : "/contentencoding");
 
     @Override
     public void setUp() {

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentnegotiation/ContentNegotiationClientTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentnegotiation/ContentNegotiationClientTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentnegotiation/ContentNegotiationClientTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentnegotiation/ContentNegotiationClientTest.java Sat Sep  5 16:29:30 2009
@@ -40,7 +40,10 @@
     HttpClient                  httpclient = new HttpClient();
 
     final private static String BASE_URI   =
-                                               ServerEnvironmentInfo.getBaseURI() + "/contentNegotiation/customerservice";
+                                               ServerEnvironmentInfo.getBaseURI() + ((ServerEnvironmentInfo
+                                                   .isRestFilterUsed()) ? ""
+                                                   : "/contentNegotiation")
+                                                   + "/customerservice";
 
     public void testGetReturningXML() {
         // Sent HTTP GET request to query customer info, expect XML

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ExceptionsWhileTargettingTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ExceptionsWhileTargettingTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ExceptionsWhileTargettingTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ExceptionsWhileTargettingTest.java Sat Sep  5 16:29:30 2009
@@ -33,6 +33,9 @@
 public class ExceptionsWhileTargettingTest extends TestCase {
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/exceptional";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/NullValuesDuringTargettingTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/NullValuesDuringTargettingTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/NullValuesDuringTargettingTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/NullValuesDuringTargettingTest.java Sat Sep  5 16:29:30 2009
@@ -35,6 +35,9 @@
 public class NullValuesDuringTargettingTest extends TestCase {
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/exceptional";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ValidationDuringTargettingTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ValidationDuringTargettingTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ValidationDuringTargettingTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ValidationDuringTargettingTest.java Sat Sep  5 16:29:30 2009
@@ -32,6 +32,9 @@
 public class ValidationDuringTargettingTest extends TestCase {
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/exceptional";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/headers/HeadersTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/headers/HeadersTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/headers/HeadersTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/headers/HeadersTest.java Sat Sep  5 16:29:30 2009
@@ -39,6 +39,9 @@
     final private static String BASE_URI = getBaseURI() + "/headers";
 
     public static String getBaseURI() {
+        if(ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/headers";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/largeentity/LargeEntityTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/largeentity/LargeEntityTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/largeentity/LargeEntityTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/largeentity/LargeEntityTest.java Sat Sep  5 16:29:30 2009
@@ -35,6 +35,9 @@
 public class LargeEntityTest extends TestCase {
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/largeentity";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/lifecycles/LifeCycleTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/lifecycles/LifeCycleTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/lifecycles/LifeCycleTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/lifecycles/LifeCycleTest.java Sat Sep  5 16:29:30 2009
@@ -34,6 +34,9 @@
 public class LifeCycleTest extends TestCase {
 
     public static String getBaseURI() {
+        if(ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/lifecycles";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodTest.java Sat Sep  5 16:29:30 2009
@@ -43,6 +43,9 @@
     protected HttpClient httpclient = new HttpClient();
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/customannotations";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodWarningsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodWarningsTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodWarningsTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodWarningsTest.java Sat Sep  5 16:29:30 2009
@@ -40,6 +40,9 @@
     protected HttpClient httpclient = new HttpClient();
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/customannotations";
     }
 
@@ -80,7 +83,8 @@
 
         try {
             PutMethod putMethod = new PutMethod();
-            putMethod.setURI(new URI(BASE_URI, false));
+            System.out.println(BASE_URI);
+            putMethod.setURI(new URI(BASE_URI, true));
             httpclient = new HttpClient();
 
             try {
@@ -89,7 +93,11 @@
                 System.out.println("Response body: ");
                 String responseBody = putMethod.getResponseBodyAsString();
                 System.out.println(responseBody);
-                assertEquals(404, result);
+                /*
+                 * if a filter is used, then the 404 will fall through to the
+                 * container
+                 */
+                assertTrue("The result is " + result, (result == 403 && "tomcat".equals(ServerEnvironmentInfo.getContainerName())) || result == 405 || result == 404);
             } catch (IOException ioe) {
                 ioe.printStackTrace();
                 fail(ioe.getMessage());
@@ -140,7 +148,11 @@
                 System.out.println("Response body: ");
                 String responseBody = httpMethod.getResponseBodyAsString();
                 System.out.println(responseBody);
-                assertEquals(404, result);
+                /*
+                 * if a filter is used, then the 404 will fall through to the
+                 * container
+                 */
+                assertTrue("The result is " + result, (result == 403 && "tomcat".equals(ServerEnvironmentInfo.getContainerName())) || result == 405 || result == 404);
             } catch (IOException ioe) {
                 ioe.printStackTrace();
                 fail(ioe.getMessage());

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/nofindmethods/DoNotUseMethodNamesForHTTPVerbsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/nofindmethods/DoNotUseMethodNamesForHTTPVerbsTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/nofindmethods/DoNotUseMethodNamesForHTTPVerbsTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/nofindmethods/DoNotUseMethodNamesForHTTPVerbsTest.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
 public class DoNotUseMethodNamesForHTTPVerbsTest extends TestCase {
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/nofindmethods";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/returntypes/ReturnTypeStatusTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/returntypes/ReturnTypeStatusTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/returntypes/ReturnTypeStatusTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/returntypes/ReturnTypeStatusTest.java Sat Sep  5 16:29:30 2009
@@ -39,6 +39,9 @@
     protected HttpClient httpclient = new HttpClient();
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/returntypes";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/sequence/SequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/sequence/SequenceTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/sequence/SequenceTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/sequence/SequenceTest.java Sat Sep  5 16:29:30 2009
@@ -39,6 +39,9 @@
     private HttpClient client = new HttpClient();
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/sequence";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/transferencoding/TransferEncodingTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/transferencoding/TransferEncodingTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/transferencoding/TransferEncodingTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/transferencoding/TransferEncodingTest.java Sat Sep  5 16:29:30 2009
@@ -34,7 +34,9 @@
 
     private HttpClient          client;
 
-    final private static String BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/transferencoding";
+    final private static String BASE_URI =
+                                             ServerEnvironmentInfo.getBaseURI() + ((ServerEnvironmentInfo
+                                                 .isRestFilterUsed()) ? "" : "/transferencoding");
 
     @Override
     public void setUp() {

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/version/VersioningTests.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/version/VersioningTests.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/version/VersioningTests.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/version/VersioningTests.java Sat Sep  5 16:29:30 2009
@@ -38,6 +38,9 @@
     protected HttpClient httpclient = new HttpClient();
 
     public static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/version";
     }
 

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.filter.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.filter.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.filter.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.filter.xml Sat Sep  5 16:29:30 2009
@@ -23,9 +23,9 @@
 
 <web-app>
     <display-name>Archetype Created Web Application</display-name>
-    <servlet>
-        <servlet-name>ConstructorValidation</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    <filter>
+        <filter-name>ConstructorValidation</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.constructors.Application</param-value>
@@ -34,11 +34,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_constructors</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ParamEntity</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ParamEntity</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.param.entity.Application</param-value>
@@ -47,11 +46,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_paramentity</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>FormFieldValidation</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>FormFieldValidation</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.param.formfield.Application</param-value>
@@ -60,11 +58,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_paramformfield</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>FormParamValidation</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>FormParamValidation</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.param.formparam.Application</param-value>
@@ -73,11 +70,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_paramformparam</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>FormPropertyValidation</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>FormPropertyValidation</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.param.formproperty.Application</param-value>
@@ -86,11 +82,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_paramformproperty</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>PathMethodValidation</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>PathMethodValidation</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.itest.pathmethods.Application</param-value>
@@ -99,30 +94,29 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_pathmethods</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>ConstructorValidation</servlet-name>
-        <url-pattern>/constructors/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ParamEntity</servlet-name>
-        <url-pattern>/param/entity/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>FormFieldValidation</servlet-name>
-        <url-pattern>/param/formfield/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>FormParamValidation</servlet-name>
-        <url-pattern>/param/formparam/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>FormPropertyValidation</servlet-name>
-        <url-pattern>/param/formproperty/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PathMethodValidation</servlet-name>
-        <url-pattern>/pathmethod/*</url-pattern>
-    </servlet-mapping>
+    </filter>
+    <filter-mapping>
+        <filter-name>ConstructorValidation</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ParamEntity</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>FormFieldValidation</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>FormParamValidation</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>FormPropertyValidation</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>PathMethodValidation</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.servlet.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.servlet.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.servlet.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
    (empty)

Propchange: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/constructors/ConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/constructors/ConstructorTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/constructors/ConstructorTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/constructors/ConstructorTest.java Sat Sep  5 16:29:30 2009
@@ -33,6 +33,9 @@
 public class ConstructorTest extends TestCase {
 
     private static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/constructors/";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/entity/EntityValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/entity/EntityValidationTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/entity/EntityValidationTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/entity/EntityValidationTest.java Sat Sep  5 16:29:30 2009
@@ -28,6 +28,9 @@
 public class EntityValidationTest extends TestCase {
 
     private static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/param/entity/";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formfield/FormFieldValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formfield/FormFieldValidationTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formfield/FormFieldValidationTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formfield/FormFieldValidationTest.java Sat Sep  5 16:29:30 2009
@@ -31,6 +31,9 @@
 public class FormFieldValidationTest extends TestCase {
 
     private static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/param/formfield";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formparam/FormParamValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formparam/FormParamValidationTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formparam/FormParamValidationTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formparam/FormParamValidationTest.java Sat Sep  5 16:29:30 2009
@@ -31,7 +31,10 @@
 public class FormParamValidationTest extends TestCase {
 
     private static String getBaseURI() {
-        return ServerEnvironmentInfo.getBaseURI() + "/param/formparam/";
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
+        return ServerEnvironmentInfo.getBaseURI() + "/param/formparam";
     }
 
     /**

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formproperty/FormPropertyValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formproperty/FormPropertyValidationTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formproperty/FormPropertyValidationTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formproperty/FormPropertyValidationTest.java Sat Sep  5 16:29:30 2009
@@ -31,6 +31,9 @@
 public class FormPropertyValidationTest extends TestCase {
 
     private static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/param/formproperty";
     }
 

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/pathmethods/PathMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/pathmethods/PathMethodTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/pathmethods/PathMethodTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/pathmethods/PathMethodTest.java Sat Sep  5 16:29:30 2009
@@ -34,6 +34,9 @@
     protected HttpClient httpclient = new HttpClient();
 
     private static String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/pathmethod/pathwarnings";
     }
 



Mime
View raw message