geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1143249 - in /geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src: main/webapp/WEB-INF/application main/webapp/WEB-INF/web.xml test/java/org/apache/geronimo/testsuite/restful/TestRestful.java
Date Wed, 06 Jul 2011 03:56:12 GMT
Author: xiaming
Date: Wed Jul  6 03:56:12 2011
New Revision: 1143249

URL: http://svn.apache.org/viewvc?rev=1143249&view=rev
Log:
Revert 1140447 since we need to find out why the current configuration not work in geronimo
jaxrs impl.

Removed:
    geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/main/webapp/WEB-INF/application
Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/test/java/org/apache/geronimo/testsuite/restful/TestRestful.java

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/main/webapp/WEB-INF/web.xml?rev=1143249&r1=1143248&r2=1143249&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/main/webapp/WEB-INF/web.xml
Wed Jul  6 03:56:12 2011
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
id="restful-test">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
id="el2.2-javaee6">
 
     <description>Restful Web Service - javaee6 Servlet Sample</description>
     <session-config>
@@ -28,17 +28,4 @@
             30
         </session-timeout>
     </session-config>
-    <servlet>
-		<servlet-name>restService</servlet-name>
-		<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
-		<init-param>
-			<param-name>applicationConfigLocation</param-name>
-			<param-value>/WEB-INF/application</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>restService</servlet-name>
-		<url-pattern>/resources/*</url-pattern>
-	</servlet-mapping>
 </web-app>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/test/java/org/apache/geronimo/testsuite/restful/TestRestful.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/test/java/org/apache/geronimo/testsuite/restful/TestRestful.java?rev=1143249&r1=1143248&r2=1143249&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/test/java/org/apache/geronimo/testsuite/restful/TestRestful.java
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/restful-test/src/test/java/org/apache/geronimo/testsuite/restful/TestRestful.java
Wed Jul  6 03:56:12 2011
@@ -76,7 +76,7 @@ public class TestRestful extends TestSup
 		}
 		String responseText = response.toString();
 		Assert.assertEquals(responseText, 
-				"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><order id=\"1\"><customer>wgz</customer><price>666.0</price><productname>water</productname><quantity>1</quantity><seller>shop</seller></order>");
+				"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><order id=\"2\"><customer>wgz</customer><price>666.0</price><productname>water</productname><quantity>1</quantity><seller>shop</seller></order>");
 		connection.disconnect();
 		
 	}



Mime
View raw message