You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2009/07/21 03:59:17 UTC
svn commit: r796118 - in
/incubator/wink/trunk/wink-integration-test/wink-server-integration-test:
./ wink-jaxrs-test-context/src/main/webapp/WEB-INF/
wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/
wink-jaxrs-test-params/src/main/webapp/WEB-INF/ ...
Author: bluk
Date: Tue Jul 21 01:59:17 2009
New Revision: 796118
URL: http://svn.apache.org/viewvc?rev=796118&view=rev
Log:
Use resource property in case servlet name changes
Modified:
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-targetting/src/main/webapp/WEB-INF/web.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-validation/src/main/webapp/WEB-INF/web.xml
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/pom.xml?rev=796118&r1=796117&r2=796118&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/pom.xml Tue Jul 21 01:59:17 2009
@@ -40,6 +40,7 @@
<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>
</properties>
<dependencies>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/web.xml?rev=796118&r1=796117&r2=796118&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/web.xml Tue Jul 21 01:59:17 2009
@@ -26,7 +26,7 @@
<display-name>Archetype Created Web Application</display-name>
<servlet>
<servlet-name>HTTPHeadersApp</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.context.httpheaders.Application</param-value>
@@ -39,7 +39,7 @@
</servlet>
<servlet>
<servlet-name>WebContainerTests</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.context.environment.servlets.Application</param-value>
@@ -52,7 +52,7 @@
</servlet>
<servlet>
<servlet-name>ProvidersApp</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.context.providers.Application</param-value>
@@ -65,7 +65,7 @@
</servlet>
<servlet>
<servlet-name>RequestApp</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.context.request.Application</param-value>
@@ -78,7 +78,7 @@
</servlet>
<servlet>
<servlet-name>SecurityContextApp</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.context.securitycontext.Application</param-value>
@@ -91,7 +91,7 @@
</servlet>
<servlet>
<servlet-name>URIInfoApp</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.context.uriinfo.Application</param-value>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/web.xml?rev=796118&r1=796117&r2=796118&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/web.xml Tue Jul 21 01:59:17 2009
@@ -26,7 +26,7 @@
<display-name>Archetype Created Web Application</display-name>
<servlet>
<servlet-name>Inheritance</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.inheritance.InheritanceApplication</param-value>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/web.xml?rev=796118&r1=796117&r2=796118&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/web.xml Tue Jul 21 01:59:17 2009
@@ -26,7 +26,7 @@
<display-name>Archetype Created Web Application</display-name>
<servlet>
<servlet-name>Params</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.params.Application</param-value>
@@ -39,7 +39,7 @@
</servlet>
<servlet>
<servlet-name>NewCookies</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.newcookie.Application</param-value>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/webapp/WEB-INF/web.xml?rev=796118&r1=796117&r2=796118&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/webapp/WEB-INF/web.xml Tue Jul 21 01:59:17 2009
@@ -26,7 +26,7 @@
<display-name>Archetype Created Web Application</display-name>
<servlet>
<servlet-name>MessageBodyReaders</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.readers.Application</param-value>
@@ -39,7 +39,7 @@
</servlet>
<servlet>
<servlet-name>MessageBodyReaderExceptions</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.readerexceptions.Application</param-value>
@@ -52,7 +52,7 @@
</servlet>
<servlet>
<servlet-name>MessageBodyWriters</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.writers.Application</param-value>
@@ -65,7 +65,7 @@
</servlet>
<servlet>
<servlet-name>MessageBodyWriterExceptions</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.writerexceptions.Application</param-value>
@@ -74,7 +74,7 @@
</servlet>
<servlet>
<servlet-name>StandardEntityProviders</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.standard.Application</param-value>
@@ -87,7 +87,7 @@
</servlet>
<servlet>
<servlet-name>ExceptionMapperMappedProviders</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped.GuestbookApplication</param-value>
@@ -100,7 +100,7 @@
</servlet>
<servlet>
<servlet-name>ExceptionMapperNoMapper</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.exceptionmappers.nomapper.GuestbookApplication</param-value>
@@ -114,7 +114,7 @@
<servlet>
<servlet-name>ExceptionMapperNull</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.exceptionmappers.nullconditions.Application</param-value>
@@ -127,7 +127,7 @@
</servlet>
<servlet>
<servlet-name>SubresourceExceptions</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.subresource.Application</param-value>
@@ -140,7 +140,7 @@
</servlet>
<servlet>
<servlet-name>SimpleContestResolver</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.providers.contextresolver.Application</param-value>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-targetting/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-targetting/src/main/webapp/WEB-INF/web.xml?rev=796118&r1=796117&r2=796118&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-targetting/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-targetting/src/main/webapp/WEB-INF/web.xml Tue Jul 21 01:59:17 2009
@@ -25,7 +25,7 @@
<display-name>Archetype Created Web Application</display-name>
<servlet>
<servlet-name>CustomHTTPMethodAnnotations</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.methodannotations.Application</param-value>
@@ -38,7 +38,7 @@
</servlet>
<servlet>
<servlet-name>Lifecycles</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.lifecycles.Application</param-value>
@@ -51,7 +51,7 @@
</servlet>
<servlet>
<servlet-name>ReturnTypes</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.returntype.Application</param-value>
@@ -64,7 +64,7 @@
</servlet>
<servlet>
<servlet-name>Exceptional</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.exceptions.Application</param-value>
@@ -77,7 +77,7 @@
</servlet>
<servlet>
<servlet-name>Sequence</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.sequence.Application</param-value>
@@ -90,7 +90,7 @@
</servlet>
<servlet>
<servlet-name>LargeEntity</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.largeentity.Application</param-value>
@@ -103,7 +103,7 @@
</servlet>
<servlet>
<servlet-name>Headers</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.headers.Application</param-value>
@@ -116,7 +116,7 @@
</servlet>
<servlet>
<servlet-name>NoFindMethods</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.nofindmethods.Application</param-value>
@@ -129,7 +129,7 @@
</servlet>
<servlet>
<servlet-name>Cache</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.cache.Application</param-value>
@@ -142,7 +142,7 @@
</servlet>
<servlet>
<servlet-name>ContentNegotiation</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.contentnegotiation.Application</param-value>
@@ -155,7 +155,7 @@
</servlet>
<servlet>
<servlet-name>AddressBook</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.addressbook.AddressApplication</param-value>
@@ -168,7 +168,7 @@
</servlet>
<servlet>
<servlet-name>VersionTests</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.version.Application</param-value>
@@ -181,7 +181,7 @@
</servlet>
<servlet>
<servlet-name>ContentEncoding</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.contentencoding.ContentEncodingApplication</param-value>
@@ -194,7 +194,7 @@
</servlet>
<servlet>
<servlet-name>TransferEncoding</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.transferencoding.TransferEncodingApplication</param-value>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-validation/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-validation/src/main/webapp/WEB-INF/web.xml?rev=796118&r1=796117&r2=796118&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-validation/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-validation/src/main/webapp/WEB-INF/web.xml Tue Jul 21 01:59:17 2009
@@ -25,7 +25,7 @@
<display-name>Archetype Created Web Application</display-name>
<servlet>
<servlet-name>ConstructorValidation</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.constructors.Application</param-value>
@@ -38,7 +38,7 @@
</servlet>
<servlet>
<servlet-name>ParamEntity</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.param.entity.Application</param-value>
@@ -51,7 +51,7 @@
</servlet>
<servlet>
<servlet-name>FormFieldValidation</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.param.formfield.Application</param-value>
@@ -64,7 +64,7 @@
</servlet>
<servlet>
<servlet-name>FormParamValidation</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.param.formparam.Application</param-value>
@@ -77,7 +77,7 @@
</servlet>
<servlet>
<servlet-name>FormPropertyValidation</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.param.formproperty.Application</param-value>
@@ -90,7 +90,7 @@
</servlet>
<servlet>
<servlet-name>PathMethodValidation</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+ <servlet-class>${wink.rest.servlet}</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.wink.jaxrs.test.pathmethods.Application</param-value>