wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r811668 [1/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
Author: bluk
Date: Sat Sep  5 16:29:30 2009
New Revision: 811668

URL: http://svn.apache.org/viewvc?rev=811668&view=rev
Log:
Support servlet and filter in integration tests

Added:
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.filter.xml
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.servlet.xml   (contents, props changed)
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.filter.xml
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.servlet.xml   (contents, props changed)
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.filter.xml
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.servlet.xml   (contents, props changed)
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.filter.xml
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.servlet.xml   (contents, props changed)
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.filter.xml
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.servlet.xml   (contents, props changed)
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.filter.xml
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.servlet.xml   (contents, props changed)
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.filter.xml
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.servlet.xml   (contents, props changed)
      - copied, changed from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml
Removed:
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/web.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/web.xml
Modified:
    incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerContainerAssertions.java
    incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java
    incubator/wink/trunk/wink-itests/wink-itest/pom.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/environment/servlets/JAXRSWebContainerTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/httpheaders/JAXRSHttpHeadersTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/providers/ProvidersMethodsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/request/RequestMethodsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/securitycontext/SecurityContextTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/uriinfo/URIInfoDetailedMethodTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/uriinfo/URIInfoInjectionTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/uriinfo/URIInfoNormalizationTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/test/java/org/apache/wink/jaxrs/test/AtomTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/test/java/org/apache/wink/itest/InheritanceTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieFieldsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/DefaultValueParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/EncodingParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/FormParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/HeaderParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/MatrixParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/ParamQueryNotSetTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/PathSegmentTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/QueryParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/mapped/Guestbook.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/nomapper/Guestbook.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/ContextTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/DepartmentTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsMappedProvidersTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNoMapperTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/exceptionmappers/JAXRSExceptionsNullConditionsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readerexceptions/JAXRSMessageBodyReaderExceptionsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readers/JAXRSMessageBodyReadersTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSBytesArrayTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSDataSourceTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSFileTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSInputStreamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSMultivaluedMapTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSReaderTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSSourceTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSStreamingOutputTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/subresources/JAXRSExceptionsSubresourcesTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writerexceptions/JAXRSMessageBodyWriterExceptionThrownTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writers/JAXRSMessageBodyWritersTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/addressbook/StringTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/cachetest/ClientTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentencoding/ContentEncodingTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/contentnegotiation/ContentNegotiationClientTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ExceptionsWhileTargettingTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/NullValuesDuringTargettingTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/exceptions/ValidationDuringTargettingTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/headers/HeadersTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/largeentity/LargeEntityTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/lifecycles/LifeCycleTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/methodannotations/HttpMethodWarningsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/nofindmethods/DoNotUseMethodNamesForHTTPVerbsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/returntypes/ReturnTypeStatusTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/sequence/SequenceTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/transferencoding/TransferEncodingTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/version/VersioningTests.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/constructors/ConstructorTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/entity/EntityValidationTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formfield/FormFieldValidationTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formparam/FormParamValidationTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/param/formproperty/FormPropertyValidationTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/pathmethods/PathMethodTest.java

Modified: incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerContainerAssertions.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerContainerAssertions.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerContainerAssertions.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerContainerAssertions.java Sat Sep  5 16:29:30 2009
@@ -39,6 +39,7 @@
             Assert.assertTrue(responseBody, responseBody.contains(Integer.toString(statusCode)));
             return;
         }
-        Assert.assertTrue(responseBody, (responseBody == null) || ("".equals(responseBody)));
+        Assert.assertTrue(responseBody, (responseBody == null) || ("".equals(responseBody))
+            || responseBody.contains(Integer.toString(statusCode)));
     }
 }

Modified: incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java Sat Sep  5 16:29:30 2009
@@ -36,6 +36,11 @@
         return System.getProperty("wink-test-context-root");
     }
 
+    public static boolean isRestFilterUsed() {
+        String winkRestFilterUsed = System.getProperty("wink-rest-filter-used");
+        return winkRestFilterUsed != null && Boolean.valueOf(winkRestFilterUsed).booleanValue();
+    }
+
     public static String getBaseURI() {
         String contextRoot = getContextRoot();
         if (contextRoot == null) {
@@ -48,10 +53,7 @@
         return System.getProperty("wink-test-work-dir");
     }
 
-    static String getContainerName() {
-        /*
-         * tests should not use this
-         */
+    public static String getContainerName() {
         return System.getProperty("wink-test-container");
     }
 }

Modified: incubator/wink/trunk/wink-itests/wink-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/pom.xml?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/pom.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/pom.xml Sat Sep  5 16:29:30 2009
@@ -35,12 +35,14 @@
         <module>wink-itest-inheritance</module>
         <module>wink-itest-targeting</module>
         <module>wink-itest-validation</module>
+        <module>wink-itest-extra-providers</module>
     </modules>
 
     <properties>
         <wink.server.hostname>localhost</wink.server.hostname>
         <wink.server.port>8080</wink.server.port>
         <wink.rest.servlet>org.apache.wink.server.internal.servlet.RestServlet</wink.rest.servlet>
+        <wink.rest.filter>org.apache.wink.server.internal.servlet.RestFilter</wink.rest.filter>
     </properties>
 
     <dependencies>
@@ -118,8 +120,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <configuration>
-                        <webXml>${project.basedir}/src/main/webapp/WEB-INF/web.xml
-                        </webXml>
+                        <webXml>${project.build.directory}/${artifactId}-${version}/WEB-INF/web.servlet.xml</webXml>
                         <webResources>
                             <resource>
                                 <directory>${project.basedir}/src/main/webapp
@@ -186,6 +187,10 @@
                                         <name>wink-test-container</name>
                                         <value>${assemblyId}</value>
                                     </property>
+                                    <property>
+                                        <name>wink-rest-filter-used</name>
+                                        <value>${wink.rest.filter.used}</value>
+                                    </property>
                                 </systemProperties>
                             </configuration>
                         </execution>
@@ -465,6 +470,29 @@
         </profile>
 
         <profile>
+            <id>wink-rest-filter-used</id>
+            <activation>
+                <property>
+                    <name>wink.rest.filter.used</name>
+                    <value>true</value>
+                </property>
+            </activation>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webXml>${project.build.directory}/${artifactId}-${version}/WEB-INF/web.filter.xml</webXml>
+                        </configuration>
+                        </plugin>
+                </plugins>
+            </build>
+
+        </profile>
+
+        <profile>
             <id>testsuite-with-cargo-jetty-embedded</id>
             <activation>
                 <property>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.filter.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.filter.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.filter.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.filter.xml Sat Sep  5 16:29:30 2009
@@ -24,9 +24,9 @@
 
 <web-app>
     <display-name>Archetype Created Web Application</display-name>
-    <servlet>
-        <servlet-name>HTTPHeadersApp</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    <filter>
+        <filter-name>HTTPHeadersApp</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.httpheaders.Application</param-value>
@@ -35,11 +35,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_httpheaders</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>WebContainerTests</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>WebContainerTests</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.environment.servlets.Application</param-value>
@@ -48,11 +47,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_webcontainer</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ProvidersApp</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>ProvidersApp</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.providers.Application</param-value>
@@ -61,11 +59,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_1</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>RequestApp</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>RequestApp</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.request.Application</param-value>
@@ -74,11 +71,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>SecurityContextApp</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>SecurityContextApp</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.securitycontext.Application</param-value>
@@ -87,11 +83,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>URIInfoApp</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>URIInfoApp</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.uriinfo.Application</param-value>
@@ -100,30 +95,29 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_4</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>HTTPHeadersApp</servlet-name>
-        <url-pattern>/httpheaders/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>WebContainerTests</servlet-name>
-        <url-pattern>/webcontainer/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ProvidersApp</servlet-name>
-        <url-pattern>/providers/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>RequestApp</servlet-name>
-        <url-pattern>/request/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SecurityContextApp</servlet-name>
-        <url-pattern>/securitycontext/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>URIInfoApp</servlet-name>
-        <url-pattern>/uriinfo/*</url-pattern>
-    </servlet-mapping>
+    </filter>
+    <filter-mapping>
+        <filter-name>HTTPHeadersApp</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>WebContainerTests</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ProvidersApp</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>RequestApp</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>SecurityContextApp</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>URIInfoApp</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.servlet.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.servlet.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/web.servlet.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/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-context/src/main/webapp/WEB-INF/web.servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/environment/servlets/JAXRSWebContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/environment/servlets/JAXRSWebContainerTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/environment/servlets/JAXRSWebContainerTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/environment/servlets/JAXRSWebContainerTest.java Sat Sep  5 16:29:30 2009
@@ -31,9 +31,12 @@
  */
 public class JAXRSWebContainerTest extends TestCase {
 
-    private static String getBaseURI() {
+    public String getBaseURI() {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI() + "/environment/webcontainer/context";
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/webcontainer"
-            + "/environment/webcontainer/context/";
+            + "/environment/webcontainer/context";
     }
 
     /**
@@ -47,8 +50,12 @@
         GetMethod getMethod = new GetMethod(getBaseURI());
         try {
             client.executeMethod(getMethod);
-            assertEquals(200, getMethod.getStatusCode());
-            assertTrue(getBaseURI().endsWith(getMethod.getResponseBodyAsString()));
+            if (ServerEnvironmentInfo.isRestFilterUsed()) {
+                assertEquals(204, getMethod.getStatusCode());
+            } else {
+                assertEquals(200, getMethod.getStatusCode());
+                assertTrue(getBaseURI().endsWith(getMethod.getResponseBodyAsString()));
+            }
         } finally {
             getMethod.releaseConnection();
         }

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

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/providers/ProvidersMethodsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/providers/ProvidersMethodsTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/providers/ProvidersMethodsTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/providers/ProvidersMethodsTest.java Sat Sep  5 16:29:30 2009
@@ -36,9 +36,13 @@
 public class ProvidersMethodsTest extends TestCase {
 
     public String getBaseURI() {
+        if(ServerEnvironmentInfo.isRestFilterUsed()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
         return ServerEnvironmentInfo.getBaseURI() + "/providers";
     }
 
+
     /**
      * Tests that
      * {@link Providers#getContextResolver(Class, javax.ws.rs.core.MediaType)}

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

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

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

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

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

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.filter.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.filter.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.filter.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-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-extra-providers/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.filter.xml Sat Sep  5 16:29:30 2009
@@ -24,17 +24,16 @@
 
 <web-app>
     <display-name>Archetype Created Web Application</display-name>
-    <servlet>
-        <servlet-name>OptionalProviders</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    <filter>
+        <filter-name>OptionalProviders</filter-name>
+        <filter-class>${wink.rest.filter}</filter-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.apache.wink.jaxrs.test.Application</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>OptionalProviders</servlet-name>
-        <url-pattern>/optionalproviders/*</url-pattern>
-    </servlet-mapping>
+    </filter>
+    <filter-mapping>
+        <filter-name>OptionalProviders</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.servlet.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.servlet.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/web.servlet.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/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-extra-providers/src/main/webapp/WEB-INF/web.servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/test/java/org/apache/wink/jaxrs/test/AtomTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/test/java/org/apache/wink/jaxrs/test/AtomTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/test/java/org/apache/wink/jaxrs/test/AtomTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/test/java/org/apache/wink/jaxrs/test/AtomTest.java Sat Sep  5 16:29:30 2009
@@ -38,8 +38,15 @@
 import org.apache.wink.test.integration.ServerEnvironmentInfo;
 
 public class AtomTest extends TestCase {
-    
-    final private static String BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/optionalproviders/blogservice";
+
+    private static String BASE_URI =
+                                       ServerEnvironmentInfo.getBaseURI() + "/optionalproviders/blogservice";
+
+    static {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/blogservice";
+        }
+    }
 
     public void testAtomGETBlogs() throws Exception {
         RestClient client = new RestClient();
@@ -47,58 +54,58 @@
         AtomFeed feed = resource.accept("application/atom+xml").get(AtomFeed.class);
         assertEquals(BlogService.ID, feed.getId());
         assertEquals(BlogService.ID, feed.getTitle().getValue());
-        
+
         List<AtomLink> expectedLinks = new ArrayList<AtomLink>();
         AtomLink link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0");
+        link.setHref(BASE_URI + "/blogs/0");
         expectedLinks.add(link);
         link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/1");
+        link.setHref(BASE_URI + "/blogs/1");
         expectedLinks.add(link);
         List<AtomLink> actual = feed.getLinks();
         assertEquals(expectedLinks.size(), actual.size());
-        for(int i = 0; i < actual.size(); ++i)
+        for (int i = 0; i < actual.size(); ++i)
             assertEquals(expectedLinks.get(i).getHref(), actual.get(i).getHref());
     }
-    
+
     public void testAtomGETBlog() throws Exception {
         RestClient client = new RestClient();
-        Resource resource = client.resource(BASE_URI+"/blogs/0");
+        Resource resource = client.resource(BASE_URI + "/blogs/0");
         AtomFeed feed = resource.accept("application/atom+xml").get(AtomFeed.class);
         assertEquals("0", feed.getId());
         assertEquals("wink-developer-blog", feed.getTitle().getValue());
-        
+
         List<AtomLink> expectedLinks = new ArrayList<AtomLink>();
         AtomLink link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0/entries/0");
+        link.setHref(BASE_URI + "/blogs/0/entries/0");
         expectedLinks.add(link);
         link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0/entries/1");
+        link.setHref(BASE_URI + "/blogs/0/entries/1");
         expectedLinks.add(link);
         List<AtomLink> actual = feed.getLinks();
         assertEquals(expectedLinks.size(), actual.size());
-        for(int i = 0; i < actual.size(); ++i)
+        for (int i = 0; i < actual.size(); ++i)
             assertEquals(expectedLinks.get(i).getHref(), actual.get(i).getHref());
-        
+
         client = new RestClient();
-        resource = client.resource(BASE_URI+"/blogs/1");
+        resource = client.resource(BASE_URI + "/blogs/1");
         feed = resource.accept("application/atom+xml").get(AtomFeed.class);
         assertEquals("1", feed.getId());
         assertEquals("wink-user-blog", feed.getTitle().getValue());
-        
+
         expectedLinks = new ArrayList<AtomLink>();
         link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/1/entries/2");
+        link.setHref(BASE_URI + "/blogs/1/entries/2");
         expectedLinks.add(link);
         actual = feed.getLinks();
         assertEquals(expectedLinks.size(), actual.size());
-        for(int i = 0; i < actual.size(); ++i)
+        for (int i = 0; i < actual.size(); ++i)
             assertEquals(expectedLinks.get(i).getHref(), actual.get(i).getHref());
     }
-    
+
     public void testAtomGETBlogEntry() throws Exception {
         RestClient client = new RestClient();
-        Resource resource = client.resource(BASE_URI+"/blogs/0/entries/0");
+        Resource resource = client.resource(BASE_URI + "/blogs/0/entries/0");
         AtomEntry entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         assertNotNull(entry.getAuthors());
         assertEquals(1, entry.getAuthors().size());
@@ -110,8 +117,8 @@
         assertEquals("Welcome to the wink developer blog!!", entry.getContent().getValue());
         assertEquals("welcomePosting", entry.getTitle().getValue());
         assertEquals(0, entry.getLinks().size());
-        
-        resource = client.resource(BASE_URI+"/blogs/0/entries/1");
+
+        resource = client.resource(BASE_URI + "/blogs/0/entries/1");
         entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         assertNotNull(entry.getAuthors());
         assertEquals(1, entry.getAuthors().size());
@@ -120,13 +127,14 @@
         assertEquals("Blog Admin", author.getName());
         assertEquals("winkblogadmin@wink.blog.com", author.getEmail());
         assertEquals("1", entry.getId());
-        assertEquals("Wink developers,\n\nInstructions on how to set up the wink development have been posted to the wink wiki. Happy wink development!\n\nw--inkblogadmin", entry.getContent().getValue());
+        assertEquals("Wink developers,\n\nInstructions on how to set up the wink development have been posted to the wink wiki. Happy wink development!\n\nw--inkblogadmin",
+                     entry.getContent().getValue());
         assertEquals("Wink Development Env", entry.getTitle().getValue());
         assertEquals(1, entry.getLinks().size());
         List<AtomLink> comments = entry.getLinks();
-        assertEquals(BASE_URI+"/blogs/0/entries/1/comments/0", comments.get(0).getHref());
-        
-        resource = client.resource(BASE_URI+"/blogs/1/entries/2");
+        assertEquals(BASE_URI + "/blogs/0/entries/1/comments/0", comments.get(0).getHref());
+
+        resource = client.resource(BASE_URI + "/blogs/1/entries/2");
         entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         assertNotNull(entry.getAuthors());
         assertEquals(1, entry.getAuthors().size());
@@ -135,16 +143,17 @@
         assertEquals("Eager User", author.getName());
         assertEquals("winkuser@wink.blog.com", author.getEmail());
         assertEquals("2", entry.getId());
-        assertEquals("I hear that the 0.1 SNAPSHOT will be available soon! I can't wait!!!", entry.getContent().getValue());
+        assertEquals("I hear that the 0.1 SNAPSHOT will be available soon! I can't wait!!!", entry
+            .getContent().getValue());
         assertEquals("0.1 SNAPSHOT", entry.getTitle().getValue());
         comments = entry.getLinks();
         assertEquals(1, entry.getLinks().size());
-        assertEquals(BASE_URI+"/blogs/1/entries/2/comments/0", comments.get(0).getHref());
+        assertEquals(BASE_URI + "/blogs/1/entries/2/comments/0", comments.get(0).getHref());
     }
-    
+
     public void testAtomGETBlogComments() throws Exception {
         RestClient client = new RestClient();
-        Resource resource = client.resource(BASE_URI+"/blogs/0/entries/1/comments/0");
+        Resource resource = client.resource(BASE_URI + "/blogs/0/entries/1/comments/0");
         AtomEntry entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         assertNotNull(entry.getAuthors());
         assertEquals(1, entry.getAuthors().size());
@@ -153,9 +162,10 @@
         assertEquals("Wink Coder", author.getName());
         assertEquals("winkcoder@mybusiness.com", author.getEmail());
         assertEquals("Great!", entry.getTitle().getValue());
-        assertEquals("Instructions look great! Now I can begin Wink development!", entry.getContent().getValue());
-        
-        resource = client.resource(BASE_URI+"/blogs/1/entries/2/comments/0");
+        assertEquals("Instructions look great! Now I can begin Wink development!", entry
+            .getContent().getValue());
+
+        resource = client.resource(BASE_URI + "/blogs/1/entries/2/comments/0");
         entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         assertNotNull(entry.getAuthors());
         assertEquals(1, entry.getAuthors().size());
@@ -164,12 +174,13 @@
         assertEquals("Blog Reader", author.getName());
         assertEquals("blogreader@blogreaders.org", author.getEmail());
         assertEquals("Good news", entry.getTitle().getValue());
-        assertEquals("This is good news. I'll be sure to try it out.", entry.getContent().getValue());
+        assertEquals("This is good news. I'll be sure to try it out.", entry.getContent()
+            .getValue());
     }
-    
+
     public void testAtomPOSTBlogEntry() throws Exception {
         RestClient client = new RestClient();
-        Resource resource = client.resource(BASE_URI+"/blogs/0/entries");
+        Resource resource = client.resource(BASE_URI + "/blogs/0/entries");
         AtomEntry entry = new AtomEntry();
         AtomPerson author = new AtomPerson();
         author.setName("Blog Admin");
@@ -180,11 +191,12 @@
         content.setValue("This is a new entry in the blog");
         entry.setContent(content);
         entry.setTitle(new AtomText(("New blog entry")));
-        
-        ClientResponse uri = resource.accept("application/atom+xml").contentType("application/atom+xml").post(entry);
+
+        ClientResponse uri =
+            resource.accept("application/atom+xml").contentType("application/atom+xml").post(entry);
         String location = uri.getHeaders().getFirst("Location");
-        assertEquals(BASE_URI+"/blogs/0/entries/3", location);
-        
+        assertEquals(BASE_URI + "/blogs/0/entries/3", location);
+
         resource = client.resource(location);
         AtomEntry postedEntry = resource.accept("application/atom+xml").get(AtomEntry.class);
         author = postedEntry.getAuthors().get(0);
@@ -195,28 +207,28 @@
         assertEquals("This is a new entry in the blog", entry.getContent().getValue());
         assertEquals("New blog entry", entry.getTitle().getValue());
         assertEquals(0, entry.getLinks().size());
-        
-        resource = client.resource(BASE_URI+"/blogs/0");
+
+        resource = client.resource(BASE_URI + "/blogs/0");
         AtomFeed feed = resource.accept("application/atom+xml").get(AtomFeed.class);
         List<AtomLink> expectedLinks = new ArrayList<AtomLink>();
         AtomLink link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0/entries/0");
+        link.setHref(BASE_URI + "/blogs/0/entries/0");
         expectedLinks.add(link);
         link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0/entries/1");
+        link.setHref(BASE_URI + "/blogs/0/entries/1");
         expectedLinks.add(link);
         link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0/entries/3");
+        link.setHref(BASE_URI + "/blogs/0/entries/3");
         expectedLinks.add(link);
         List<AtomLink> actual = feed.getLinks();
         assertEquals(expectedLinks.size(), actual.size());
-        for(int i = 0; i < actual.size(); ++i)
+        for (int i = 0; i < actual.size(); ++i)
             assertEquals(expectedLinks.get(i).getHref(), actual.get(i).getHref());
     }
-    
+
     public void testAtomPostBlogComment() throws Exception {
         RestClient client = new RestClient();
-        Resource resource = client.resource(BASE_URI+"/blogs/0/entries/1/comments");
+        Resource resource = client.resource(BASE_URI + "/blogs/0/entries/1/comments");
         AtomEntry entry = new AtomEntry();
         AtomPerson author = new AtomPerson();
         author.setName("Wink Coder");
@@ -227,49 +239,53 @@
         content.setValue("I was able to set up the Wink development environment!");
         entry.setContent(content);
         entry.setTitle(new AtomText(("Success")));
-        
-        ClientResponse uri = resource.accept("application/atom+xml").contentType("application/atom+xml").post(entry);
+
+        ClientResponse uri =
+            resource.accept("application/atom+xml").contentType("application/atom+xml").post(entry);
         String location = uri.getHeaders().getFirst("Location");
-        assertEquals(BASE_URI+"/blogs/0/entries/1/comments/1", location);
-        
+        assertEquals(BASE_URI + "/blogs/0/entries/1/comments/1", location);
+
         resource = client.resource(location);
         AtomEntry postedEntry = resource.accept("application/atom+xml").get(AtomEntry.class);
         author = postedEntry.getAuthors().get(0);
         assertNotNull(author);
         assertEquals("Wink Coder", author.getName());
         assertEquals("winkcoder@mybusiness.com", author.getEmail());
-        assertEquals("I was able to set up the Wink development environment!", entry.getContent().getValue());
+        assertEquals("I was able to set up the Wink development environment!", entry.getContent()
+            .getValue());
         assertEquals("Success", entry.getTitle().getValue());
-        
-        resource = client.resource(BASE_URI+"/blogs/0/entries/1");
+
+        resource = client.resource(BASE_URI + "/blogs/0/entries/1");
         entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         List<AtomLink> expectedLinks = new ArrayList<AtomLink>();
         AtomLink link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0/entries/1/comments/0");
+        link.setHref(BASE_URI + "/blogs/0/entries/1/comments/0");
         expectedLinks.add(link);
         link = new AtomLink();
-        link.setHref(BASE_URI+"/blogs/0/entries/1/comments/1");
+        link.setHref(BASE_URI + "/blogs/0/entries/1/comments/1");
         expectedLinks.add(link);
         List<AtomLink> actual = entry.getLinks();
         assertEquals(expectedLinks.size(), actual.size());
-        for(int i = 0; i < actual.size(); ++i)
+        for (int i = 0; i < actual.size(); ++i)
             assertEquals(expectedLinks.get(i).getHref(), actual.get(i).getHref());
     }
-    
+
     public void testAtomPUTBlogEntry() throws Exception {
         RestClient client = new RestClient();
-        Resource resource = client.resource(BASE_URI+"/blogs/0/entries/0");
+        Resource resource = client.resource(BASE_URI + "/blogs/0/entries/0");
         AtomEntry entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         AtomPerson author = entry.getAuthors().get(0);
-        author.setName(author.getName()+"Updated");
-        author.setEmail(author.getEmail()+"Updated");
+        author.setName(author.getName() + "Updated");
+        author.setEmail(author.getEmail() + "Updated");
         AtomText title = entry.getTitle();
-        title.setValue(title.getValue()+"Updated");
+        title.setValue(title.getValue() + "Updated");
         AtomContent content = entry.getContent();
-        content.setValue(content.getValue()+"Updated");
-        
-        resource = client.resource(BASE_URI+"/blogs/0/entries/0");
-        AtomEntry updated = resource.accept("application/atom+xml").contentType("application/atom+xml").put(AtomEntry.class, entry);
+        content.setValue(content.getValue() + "Updated");
+
+        resource = client.resource(BASE_URI + "/blogs/0/entries/0");
+        AtomEntry updated =
+            resource.accept("application/atom+xml").contentType("application/atom+xml")
+                .put(AtomEntry.class, entry);
         assertNotNull(updated.getAuthors());
         assertEquals(1, updated.getAuthors().size());
         author = updated.getAuthors().get(0);
@@ -280,21 +296,23 @@
         assertEquals("Welcome to the wink developer blog!!Updated", updated.getContent().getValue());
         assertEquals("welcomePostingUpdated", updated.getTitle().getValue());
     }
-    
+
     public void testAtomPUTBlogComment() throws Exception {
         RestClient client = new RestClient();
-        Resource resource = client.resource(BASE_URI+"/blogs/0/entries/1/comments/0");
+        Resource resource = client.resource(BASE_URI + "/blogs/0/entries/1/comments/0");
         AtomEntry entry = resource.accept("application/atom+xml").get(AtomEntry.class);
         AtomPerson author = entry.getAuthors().get(0);
-        author.setName(author.getName()+"Updated");
-        author.setEmail(author.getEmail()+"Updated");
+        author.setName(author.getName() + "Updated");
+        author.setEmail(author.getEmail() + "Updated");
         AtomText title = entry.getTitle();
-        title.setValue(title.getValue()+"Updated");
+        title.setValue(title.getValue() + "Updated");
         AtomContent content = entry.getContent();
-        content.setValue(content.getValue()+"Updated");
-        
-        resource = client.resource(BASE_URI+"/blogs/0/entries/1/comments/0");
-        AtomEntry updated = resource.accept("application/atom+xml").contentType("application/atom+xml").put(AtomEntry.class, entry);
+        content.setValue(content.getValue() + "Updated");
+
+        resource = client.resource(BASE_URI + "/blogs/0/entries/1/comments/0");
+        AtomEntry updated =
+            resource.accept("application/atom+xml").contentType("application/atom+xml")
+                .put(AtomEntry.class, entry);
         assertNotNull(updated.getAuthors());
         assertEquals(1, updated.getAuthors().size());
         author = updated.getAuthors().get(0);
@@ -303,6 +321,7 @@
         assertEquals("Wink CoderUpdated", author.getName());
         assertEquals("winkcoder@mybusiness.comUpdated", author.getEmail());
         assertEquals("Great!Updated", entry.getTitle().getValue());
-        assertEquals("Instructions look great! Now I can begin Wink development!Updated", entry.getContent().getValue());
+        assertEquals("Instructions look great! Now I can begin Wink development!Updated", entry
+            .getContent().getValue());
     }
 }

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.filter.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.filter.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.filter.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.filter.xml Sat Sep  5 16:29:30 2009
@@ -24,17 +24,16 @@
 
 <web-app>
     <display-name>Archetype Created Web Application</display-name>
-    <servlet>
-        <servlet-name>Inheritance</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    <filter>
+        <filter-name>Inheritance</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.InheritanceApplication</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Inheritance</servlet-name>
-        <url-pattern>/inheritance/*</url-pattern>
-    </servlet-mapping>
+    </filter>
+    <filter-mapping>
+        <filter-name>Inheritance</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.servlet.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.servlet.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/web.servlet.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/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-inheritance/src/main/webapp/WEB-INF/web.servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/test/java/org/apache/wink/itest/InheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/test/java/org/apache/wink/itest/InheritanceTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/test/java/org/apache/wink/itest/InheritanceTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/test/java/org/apache/wink/itest/InheritanceTest.java Sat Sep  5 16:29:30 2009
@@ -31,25 +31,27 @@
 
 public class InheritanceTest extends TestCase {
 
-    protected HttpClient        httpClient         = new HttpClient();
+    protected HttpClient httpClient = new HttpClient();
 
-    final private static String PARKING_LOT_URI    =
-                                                       ServerEnvironmentInfo.getBaseURI() + "/inheritance/parkinglot";
+    private static String getBaseURI() {
+        String isFilterUsed = System.getProperty("wink-rest-filter-used");
+        if (isFilterUsed != null && Boolean.valueOf(isFilterUsed).booleanValue()) {
+            return ServerEnvironmentInfo.getBaseURI();
+        }
+        return ServerEnvironmentInfo.getBaseURI() + "/inheritance";
+    }
+
+    final private static String PARKING_LOT_URI    = getBaseURI() + "/parkinglot";
 
-    final private static String PARKING_GARAGE_URI =
-                                                       ServerEnvironmentInfo.getBaseURI() + "/inheritance/parkinggarage";
+    final private static String PARKING_GARAGE_URI = getBaseURI() + "/parkinggarage";
 
-    final private static String CARPORT_URI        =
-                                                       ServerEnvironmentInfo.getBaseURI() + "/inheritance/carport";
+    final private static String CARPORT_URI        = getBaseURI() + "/carport";
 
-    final private static String CARFERRY_URI       =
-                                                       ServerEnvironmentInfo.getBaseURI() + "/inheritance/carferry";
+    final private static String CARFERRY_URI       = getBaseURI() + "/carferry";
 
-    final private static String CLASS_C_URI        =
-                                                       ServerEnvironmentInfo.getBaseURI() + "/inheritance/classc";
+    final private static String CLASS_C_URI        = getBaseURI() + "/classc";
 
-    final private static String FRUIT_URI          =
-                                                       ServerEnvironmentInfo.getBaseURI() + "/inheritance/fruit";
+    final private static String FRUIT_URI          = getBaseURI() + "/fruit";
 
     public void testOverrideInterfaceAnnotations() throws Exception {
         PostMethod postMethod = new PostMethod(PARKING_LOT_URI + "/cars");
@@ -213,18 +215,17 @@
             // resources
             httpClient.executeMethod(getMethod);
             String response = getMethod.getResponseBodyAsString();
-            assertEquals("org.apache.wink.itest.fruits.Fruit;fruit%20suffix",
-                         response);
+            assertEquals("org.apache.wink.itest.fruits.Fruit;fruit%20suffix", response);
             getMethod.releaseConnection();
             getMethod = new GetMethod(FRUIT_URI + "/apple%20suffix");
             httpClient.executeMethod(getMethod);
             response = getMethod.getResponseBodyAsString();
             assertEquals("org.apache.wink.itest.fruits.Apple;apple suffix", // parameters
-                                                                                             // on
-                                                                                             // class
-                                                                                             // are
-                                                                                             // not
-                                                                                             // inherited
+                         // on
+                         // class
+                         // are
+                         // not
+                         // inherited
                          response);
             getMethod.releaseConnection();
             getMethod = new GetMethod(FRUIT_URI + "/orange%20suffix");
@@ -232,8 +233,7 @@
             assertEquals(405, getMethod.getStatusCode());
             httpClient.executeMethod(postMethod);
             response = postMethod.getResponseBodyAsString();
-            assertEquals("org.apache.wink.itest.fruits.Orange;orange suffix",
-                         response);
+            assertEquals("org.apache.wink.itest.fruits.Orange;orange suffix", response);
             assertEquals(200, postMethod.getStatusCode());
         } catch (Exception e) {
             e.printStackTrace();

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.filter.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.filter.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.filter.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.xml&r1=810587&r2=811668&rev=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.filter.xml Sat Sep  5 16:29:30 2009
@@ -24,9 +24,9 @@
 
 <web-app>
     <display-name>Archetype Created Web Application</display-name>
-    <servlet>
-        <servlet-name>Params</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    <filter>
+        <filter-name>Params</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.Application</param-value>
@@ -35,11 +35,10 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_param</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>NewCookies</servlet-name>
-        <servlet-class>${wink.rest.servlet}</servlet-class>
+    </filter>
+    <filter>
+        <filter-name>NewCookies</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.newcookie.Application</param-value>
@@ -48,14 +47,13 @@
             <param-name>requestProcessorAttribute</param-name>
             <param-value>requestProcessorAttribute_newcookie</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Params</servlet-name>
-        <url-pattern>/params/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>NewCookies</servlet-name>
-        <url-pattern>/newcookies/*</url-pattern>
-    </servlet-mapping>
+    </filter>
+    <filter-mapping>
+        <filter-name>Params</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>NewCookies</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Copied: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.servlet.xml (from r810587, incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.servlet.xml?p2=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/web.servlet.xml&p1=incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/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-params/src/main/webapp/WEB-INF/web.servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieFieldsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieFieldsTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieFieldsTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieFieldsTest.java Sat Sep  5 16:29:30 2009
@@ -38,10 +38,16 @@
  */
 public class CookieFieldsTest extends TestCase {
 
-    protected HttpClient        httpclient = new HttpClient();
+    protected HttpClient  httpclient = new HttpClient();
 
-    final private static String BASE_URI   =
-                                               ServerEnvironmentInfo.getBaseURI() + "/newcookies/cookiestests";
+    private static String BASE_URI   =
+                                         ServerEnvironmentInfo.getBaseURI() + "/newcookies/cookiestests";
+
+    static {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/cookiestests";
+        }
+    }
 
     /**
      * Test that the HttpHeaders.getCookies() method returns correct cookies and
@@ -78,21 +84,25 @@
             if (!"".equals(contextRoot)) {
                 contextRoot = "/" + contextRoot;
             }
+            String servletPath = (ServerEnvironmentInfo.isRestFilterUsed()) ? "" : "/newcookies";
             while (t.hasMoreTokens()) {
                 next = t.nextToken();
                 if (next.startsWith("name3")) {
                     assertEquals("name3,value3," + contextRoot
-                        + "/newcookies/cookiestests,"
+                        + servletPath
+                        + "/cookiestests,"
                         + ServerEnvironmentInfo.getHostname(), next);
                     name3Found = true;
                 } else if (next.startsWith("name2")) {
                     assertEquals("name2,value2," + contextRoot
-                        + "/newcookies/cookiestests,"
+                        + servletPath
+                        + "/cookiestests,"
                         + ServerEnvironmentInfo.getHostname(), next);
                     name2Found = true;
                 } else if (next.startsWith("name")) {
                     assertEquals("name,value," + contextRoot
-                        + "/newcookies/cookiestests,"
+                        + servletPath
+                        + "/cookiestests,"
                         + ServerEnvironmentInfo.getHostname(), next);
                     nameFound = true;
                 } else

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieParamTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieParamTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieParamTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/CookieParamTest.java Sat Sep  5 16:29:30 2009
@@ -38,8 +38,14 @@
 
     protected HttpClient        httpclient = new HttpClient();
 
-    final private static String BASE_URI   =
+    private static String BASE_URI   =
                                                ServerEnvironmentInfo.getBaseURI() + "/params/cookiemonster";
+    
+    static {
+        if(ServerEnvironmentInfo.isRestFilterUsed()) {
+            BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/cookiemonster";
+        }
+    }
 
     /**
      * Tests that a cookie parameter is retrieved.

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/DefaultValueParamTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/DefaultValueParamTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/DefaultValueParamTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/DefaultValueParamTest.java Sat Sep  5 16:29:30 2009
@@ -35,10 +35,15 @@
  */
 public class DefaultValueParamTest extends TestCase {
 
-    protected HttpClient        httpclient = new HttpClient();
+    protected HttpClient  httpclient = new HttpClient();
 
-    final private static String BASE_URI   =
-                                               ServerEnvironmentInfo.getBaseURI() + "/params/defaultvalue";
+    private static String BASE_URI   = ServerEnvironmentInfo.getBaseURI() + "/params/defaultvalue";
+
+    static {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/defaultvalue";
+        }
+    }
 
     /**
      * Test that if no parameters are passed, the default values are used.

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/EncodingParamTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/EncodingParamTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/EncodingParamTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/EncodingParamTest.java Sat Sep  5 16:29:30 2009
@@ -38,12 +38,19 @@
 
     protected HttpClient        httpclient      = new HttpClient();
 
-    final private static String BASE_URI_DECODE =
+    private static String BASE_URI_DECODE =
                                                     ServerEnvironmentInfo.getBaseURI() + "/params/decodedparams";
 
-    final private static String BASE_URI_ENCODE =
+    private static String BASE_URI_ENCODE =
                                                     ServerEnvironmentInfo.getBaseURI() + "/params/encodingparam";
 
+    static {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            BASE_URI_DECODE = ServerEnvironmentInfo.getBaseURI() + "/decodedparams";
+            BASE_URI_ENCODE = ServerEnvironmentInfo.getBaseURI() + "/encodingparam";
+        }
+    }
+
     // /**
     // * Test that if regular parameters are passed, the parameters are correct.
     // */

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

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

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/MatrixParamTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/MatrixParamTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/MatrixParamTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/MatrixParamTest.java Sat Sep  5 16:29:30 2009
@@ -38,9 +38,15 @@
  */
 public class MatrixParamTest extends TestCase {
 
-    protected HttpClient        httpclient = new HttpClient();
+    protected HttpClient  httpclient = new HttpClient();
 
-    final private static String BASE_URI   = ServerEnvironmentInfo.getBaseURI() + "/params/";
+    private static String BASE_URI   = ServerEnvironmentInfo.getBaseURI() + "/params/";
+
+    static {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/";
+        }
+    }
 
     protected String sendGoodRequestAndGetResponse(String aPartialRequestURL,
                                                    Class<? extends HttpMethod> aClass) {

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

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

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/QueryParamTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/QueryParamTest.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/QueryParamTest.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/QueryParamTest.java Sat Sep  5 16:29:30 2009
@@ -42,9 +42,15 @@
  */
 public class QueryParamTest extends TestCase {
 
-    protected HttpClient        httpclient = new HttpClient();
+    protected HttpClient  httpclient = new HttpClient();
 
-    final private static String BASE_URI   = ServerEnvironmentInfo.getBaseURI() + "/params/";
+    private static String BASE_URI   = ServerEnvironmentInfo.getBaseURI() + "/params/";
+
+    static {
+        if (ServerEnvironmentInfo.isRestFilterUsed()) {
+            BASE_URI = ServerEnvironmentInfo.getBaseURI() + "/";
+        }
+    }
 
     protected String sendGoodRequestAndGetResponse(String aPartialRequestURL,
                                                    Class<? extends HttpMethod> aClass) {

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/mapped/Guestbook.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/mapped/Guestbook.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/mapped/Guestbook.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/mapped/Guestbook.java Sat Sep  5 16:29:30 2009
@@ -21,6 +21,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Collection;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -164,4 +165,13 @@
         GuestbookDatabase.getGuestbook().deleteComment(Integer.valueOf(msgId));
         return Response.noContent().build();
     }
+
+    @POST
+    @Path("/clear")
+    public void clearMessages() {
+        Collection<Integer> keys = GuestbookDatabase.getGuestbook().getCommentKeys();
+        for (Integer k : keys) {
+            GuestbookDatabase.getGuestbook().deleteComment(k);
+        }
+    }
 }

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/nomapper/Guestbook.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/nomapper/Guestbook.java?rev=811668&r1=811667&r2=811668&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/nomapper/Guestbook.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/nomapper/Guestbook.java Sat Sep  5 16:29:30 2009
@@ -21,6 +21,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Collection;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -37,6 +38,8 @@
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.core.Response.Status;
 
+import org.apache.wink.itest.exceptionmappers.nomapper.GuestbookDatabase;
+
 /**
  * The main JAX-RS resource.
  */
@@ -158,4 +161,13 @@
         GuestbookDatabase.getGuestbook().deleteComment(Integer.valueOf(msgId));
         return Response.noContent().build();
     }
+
+    @POST
+    @Path("/clear")
+    public void clearMessages() {
+        Collection<Integer> keys = GuestbookDatabase.getGuestbook().getCommentKeys();
+        for (Integer k : keys) {
+            GuestbookDatabase.getGuestbook().deleteComment(k);
+        }
+    }
 }



Mime
View raw message