Author: scottbw
Date: Mon Mar 7 12:24:09 2011
New Revision: 1078757
URL: http://svn.apache.org/viewvc?rev=1078757&view=rev
Log:
Put the flatpack handler and exported files handler on separate paths so that
both Jetty and Tomcat are happy. (See WOOKIE-182)
Modified:
incubator/wookie/trunk/WebContent/WEB-INF/web.xml
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/FlatpackControllerTest.java
Modified: incubator/wookie/trunk/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/WEB-INF/web.xml?rev=1078757&r1=1078756&r2=1078757&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/WEB-INF/web.xml (original)
+++ incubator/wookie/trunk/WebContent/WEB-INF/web.xml Mon Mar 7 12:24:09 2011
@@ -133,7 +133,7 @@
</servlet>
<servlet-mapping>
<servlet-name>Flatpack</servlet-name>
- <url-pattern>/export</url-pattern>
+ <url-pattern>/flatpack</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>default</servlet-name>
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/FlatpackControllerTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/FlatpackControllerTest.java?rev=1078757&r1=1078756&r2=1078757&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/FlatpackControllerTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/FlatpackControllerTest.java
Mon Mar 7 12:24:09 2011
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FlatpackControllerTest extends AbstractControllerTest {
- private static final String TEST_FLATPACK_SERVICE_URL_VALID =
TEST_SERVER_LOCATION+"export";
+ private static final String TEST_FLATPACK_SERVICE_URL_VALID =
TEST_SERVER_LOCATION+"flatpack";
@BeforeClass
public static void setup() throws HttpException, IOException{
