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/16 22:03:08 UTC
svn commit: r794818 [1/2] - in /incubator/wink/trunk/wink-integration-test:
wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/
wink-server-integration-test/
wink-server-integration-test/wink-jaxrs-test-context/ wink-se...
Author: bluk
Date: Thu Jul 16 20:03:06 2009
New Revision: 794818
URL: http://svn.apache.org/viewvc?rev=794818&view=rev
Log:
Update for wink-integration-test for JDK issues
Also fixes [WINK-80] but re-uses Providers
context so no need for the CXF classes.
Added:
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/geronimo-web.xml
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/geronimo-web.xml
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Application.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Department.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentDatabase.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentListWrapper.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Departments.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/ObjectFactory.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/User.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserAccount.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserContextProvider.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/jaxb/
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/jaxb/ObjectFactory.java
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/standard/DSResource.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/webapp/WEB-INF/geronimo-web.xml
- copied, changed from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/contextresolver/
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/contextresolver/ContextTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentTest.java
Removed:
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/cxf/helpers/IOUtils.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/cxf/helpers/LoadingByteArrayOutputStream.java
Modified:
incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java
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/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/test/java/org/apache/wink/jaxrs/test/context/httpheaders/JAXRSHttpHeadersTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/Guestbook.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookErrorExceptionMappingProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/NullPointerExceptionMapProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/WebApplicationExceptionMapProvider.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/nomapper/Guestbook.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/Application.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderAnnotationList.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderClassDeque.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericEntityTypeQueue.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericType.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderMediaTypeSet.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderThrowsExceptions.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/standard/Application.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/standard/SourceResource.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/subresource/CommentData.java
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-providers/src/test/java/org/apache/wink/jaxrs/test/providers/standard/JAXRSBytesArrayTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/standard/JAXRSDataSourceTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/standard/JAXRSInputStreamTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/standard/JAXRSReaderTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/standard/JAXRSSourceTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/standard/JAXRSStreamingOutputTest.java
incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/test/java/org/apache/wink/jaxrs/test/providers/writers/JAXRSMessageBodyWritersTest.java
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java Thu Jul 16 20:03:06 2009
@@ -43,4 +43,8 @@
}
return "http://" + getHostname() + ":" + getPort() + "/" + contextRoot;
}
+
+ public static String getWorkDir() {
+ return System.getProperty("wink-test-work-dir");
+ }
}
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=794818&r1=794817&r2=794818&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 Thu Jul 16 20:03:06 2009
@@ -35,6 +35,7 @@
<module>wink-jaxrs-test-providers</module>
<module>wink-jaxrs-test-params</module>
<module>wink-jaxrs-test-inheritance</module>
+ <module>wink-jaxrs-test-targetting</module>
</modules>
<properties>
@@ -167,6 +168,10 @@
<name>wink-test-port</name>
<value>8080</value>
</property>
+ <property>
+ <name>wink-test-work-dir</name>
+ <value>${project.build.directory}</value>
+ </property>
</systemProperties>
</configuration>
</execution>
@@ -259,7 +264,7 @@
<goal>deploy-module</goal>
</goals>
<configuration>
- <moduleArchive>${project.build.directory}/${artifactId}.war
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.war
</moduleArchive>
</configuration>
</execution>
@@ -270,7 +275,7 @@
<goal>undeploy-module</goal>
</goals>
<configuration>
- <moduleId>${groupId}/${artifactId}/${version}/car
+ <moduleId>${groupId}/${artifactId}/${version}/war
</moduleId>
</configuration>
</execution>
@@ -501,4 +506,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml Thu Jul 16 20:03:06 2009
@@ -31,7 +31,4 @@
<name>wink-jaxrs-test-context Maven Webapp</name>
<version>0.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
- <build>
- <finalName>wink-jaxrs-test-context</finalName>
- </build>
</project>
\ No newline at end of file
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/geronimo-web.xml (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.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/geronimo-web.xml?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jul 16 20:03:06 2009
@@ -18,20 +18,18 @@
under the License.
-->
-<project>
- <parent>
- <artifactId>wink-server-integration-test</artifactId>
- <groupId>org.apache.wink</groupId>
- <version>0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-jaxrs-test-providers</artifactId>
- <packaging>war</packaging>
- <name>wink-jaxrs-test-providers Maven Webapp</name>
- <version>0.1-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <build>
- <finalName>wink-jaxrs-test-providers</finalName>
- </build>
-</project>
\ No newline at end of file
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <context-root>${artifactId}</context-root>
+</web-app>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/test/java/org/apache/wink/jaxrs/test/context/httpheaders/JAXRSHttpHeadersTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/test/java/org/apache/wink/jaxrs/test/context/httpheaders/JAXRSHttpHeadersTest.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/test/java/org/apache/wink/jaxrs/test/context/httpheaders/JAXRSHttpHeadersTest.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/src/test/java/org/apache/wink/jaxrs/test/context/httpheaders/JAXRSHttpHeadersTest.java Thu Jul 16 20:03:06 2009
@@ -521,7 +521,8 @@
assertEquals(200, getMethod.getStatusCode());
String responseBody = getMethod.getResponseBodyAsString();
assertTrue(responseBody, responseBody.contains("requestheaders:"));
- assertTrue(responseBody, responseBody.contains(":fOo=[bAr]"));
+ assertTrue(responseBody, responseBody.contains(":fOo=[bAr]") || responseBody
+ .contains(":foo=[bAr]"));
} finally {
getMethod.releaseConnection();
}
@@ -545,7 +546,8 @@
assertEquals(200, getMethod.getStatusCode());
String responseBody = getMethod.getResponseBodyAsString();
assertTrue(responseBody, responseBody.contains("requestheaders:"));
- assertTrue(responseBody, responseBody.contains(":fOo=[2bAr, bAr]"));
+ assertTrue(responseBody, responseBody.contains(":fOo=[2bAr, bAr]") || responseBody
+ .contains(":foo=[2bAr, bAr]"));
assertTrue(responseBody, responseBody.contains(":abc=[xyz]"));
} finally {
getMethod.releaseConnection();
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/pom.xml?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/pom.xml Thu Jul 16 20:03:06 2009
@@ -11,7 +11,4 @@
<name>wink-jaxrs-test-inheritance Maven Webapp</name>
<version>0.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
- <build>
- <finalName>wink-jaxrs-test-inheritance</finalName>
- </build>
</project>
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.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/geronimo-web.xml?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jul 16 20:03:06 2009
@@ -18,20 +18,18 @@
under the License.
-->
-<project>
- <parent>
- <artifactId>wink-server-integration-test</artifactId>
- <groupId>org.apache.wink</groupId>
- <version>0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-jaxrs-test-context</artifactId>
- <packaging>war</packaging>
- <name>wink-jaxrs-test-context Maven Webapp</name>
- <version>0.1-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <build>
- <finalName>wink-jaxrs-test-context</finalName>
- </build>
-</project>
\ No newline at end of file
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <context-root>${artifactId}</context-root>
+</web-app>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/pom.xml?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/pom.xml Thu Jul 16 20:03:06 2009
@@ -11,7 +11,4 @@
<name>wink-jaxrs-test-params Maven Webapp</name>
<version>0.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
- <build>
- <finalName>wink-jaxrs-test-params</finalName>
- </build>
</project>
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/geronimo-web.xml (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.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/geronimo-web.xml?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-context/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-params/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jul 16 20:03:06 2009
@@ -18,20 +18,18 @@
under the License.
-->
-<project>
- <parent>
- <artifactId>wink-server-integration-test</artifactId>
- <groupId>org.apache.wink</groupId>
- <version>0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-jaxrs-test-context</artifactId>
- <packaging>war</packaging>
- <name>wink-jaxrs-test-context Maven Webapp</name>
- <version>0.1-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <build>
- <finalName>wink-jaxrs-test-context</finalName>
- </build>
-</project>
\ No newline at end of file
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <context-root>${artifactId}</context-root>
+</web-app>
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/pom.xml Thu Jul 16 20:03:06 2009
@@ -31,7 +31,4 @@
<name>wink-jaxrs-test-providers Maven Webapp</name>
<version>0.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
- <build>
- <finalName>wink-jaxrs-test-providers</finalName>
- </build>
</project>
\ No newline at end of file
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Application.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Application.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Application.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Application.java Thu Jul 16 20:03:06 2009
@@ -17,19 +17,20 @@
* under the License.
*/
-package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+package org.apache.wink.jaxrs.test.providers.contextresolver;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import java.util.HashSet;
+import java.util.Set;
-@Provider
-public class RuntimeExceptionMappingProvider implements ExceptionMapper<RuntimeException> {
+public class Application extends javax.ws.rs.core.Application {
- public Response toResponse(RuntimeException arg0) {
- CommentError error = new CommentError();
- error.setErrorMessage(arg0.getMessage());
- return Response.status(450).entity(error).build();
+ @Override
+ public Set<Class<?>> getClasses() {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
+ classes.add(UserAccount.class);
+ classes.add(UserContextProvider.class);
+ classes.add(Departments.class);
+ return classes;
}
}
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Department.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Department.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Department.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Department.java Thu Jul 16 20:03:06 2009
@@ -17,19 +17,31 @@
* under the License.
*/
-package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+package org.apache.wink.jaxrs.test.providers.contextresolver;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-@Provider
-public class RuntimeExceptionMappingProvider implements ExceptionMapper<RuntimeException> {
-
- public Response toResponse(RuntimeException arg0) {
- CommentError error = new CommentError();
- error.setErrorMessage(arg0.getMessage());
- return Response.status(450).entity(error).build();
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Department {
+
+ private String departmentId;
+
+ private String departmentName;
+
+ public String getDepartmentId() {
+ return departmentId;
+ }
+
+ public void setDepartmentId(String departmentId) {
+ this.departmentId = departmentId;
+ }
+
+ public String getDepartmentName() {
+ return departmentName;
+ }
+
+ public void setDepartmentName(String departmentName) {
+ this.departmentName = departmentName;
}
}
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentDatabase.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentDatabase.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentDatabase.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentDatabase.java Thu Jul 16 20:03:06 2009
@@ -17,30 +17,34 @@
* under the License.
*/
-package org.apache.wink.test.integration;
+package org.apache.wink.jaxrs.test.providers.contextresolver;
-/**
- * This class provides some basic information for clients about the server.
- */
-final public class ServerEnvironmentInfo {
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class DepartmentDatabase {
+
+ private static Map<String, Department> departmentDB = new HashMap<String, Department>();
- public static String getHostname() {
- return System.getProperty("wink-test-hostname");
+ public static Collection<Department> getDepartments() {
+ return departmentDB.values();
}
- public static String getPort() {
- return System.getProperty("wink-test-port");
+ public static void addDepartment(Department department) {
+ departmentDB.put(department.getDepartmentId(), department);
}
- public static String getContextRoot() {
- return System.getProperty("wink-test-context-root");
+ public static Department getDepartment(String departmentId) {
+ return departmentDB.get(departmentId);
}
- public static String getBaseURI() {
- String contextRoot = getContextRoot();
- if (contextRoot == null) {
- return "http://" + getHostname() + ":" + getPort();
- }
- return "http://" + getHostname() + ":" + getPort() + "/" + contextRoot;
+ public static Department removeDepartment(String departmentId) {
+ return departmentDB.remove(departmentId);
}
+
+ public static void clearEntries() {
+ departmentDB.clear();
+ }
+
}
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentListWrapper.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentListWrapper.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentListWrapper.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test-support/src/main/java/org/apache/wink/test/integration/ServerEnvironmentInfo.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/DepartmentListWrapper.java Thu Jul 16 20:03:06 2009
@@ -17,30 +17,34 @@
* under the License.
*/
-package org.apache.wink.test.integration;
+package org.apache.wink.jaxrs.test.providers.contextresolver;
-/**
- * This class provides some basic information for clients about the server.
- */
-final public class ServerEnvironmentInfo {
+import java.util.LinkedList;
+import java.util.List;
- public static String getHostname() {
- return System.getProperty("wink-test-hostname");
- }
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
- public static String getPort() {
- return System.getProperty("wink-test-port");
- }
+@XmlRootElement
+public class DepartmentListWrapper {
- public static String getContextRoot() {
- return System.getProperty("wink-test-context-root");
+ @XmlElement
+ private List<Department> departmentList = new LinkedList<Department>();
+
+ public List<Department> getDepartmentList() {
+ return departmentList;
}
- public static String getBaseURI() {
- String contextRoot = getContextRoot();
- if (contextRoot == null) {
- return "http://" + getHostname() + ":" + getPort();
+ public String toString() {
+ StringBuffer sb = new StringBuffer();
+ for (Department dept : departmentList) {
+ sb.append("ID: " + dept.getDepartmentId());
+ sb.append("\n");
+ sb.append("NAME: " + dept.getDepartmentName());
+ sb.append("\n");
}
- return "http://" + getHostname() + ":" + getPort() + "/" + contextRoot;
+
+ return sb.toString();
}
+
}
Added: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Departments.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Departments.java?rev=794818&view=auto
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Departments.java (added)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/Departments.java Thu Jul 16 20:03:06 2009
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.wink.jaxrs.test.providers.contextresolver;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.HEAD;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+
+@Path(value = "/departments")
+public class Departments {
+
+ @GET
+ @Produces(value = "text/xml")
+ public DepartmentListWrapper getDepartments() {
+ Iterator<Department> dptIter = DepartmentDatabase.getDepartments()
+ .iterator();
+ DepartmentListWrapper wrapper = new DepartmentListWrapper();
+ List<Department> dptList = wrapper.getDepartmentList();
+ while (dptIter.hasNext()) {
+ dptList.add(dptIter.next());
+ }
+ return wrapper;
+ }
+
+ @GET
+ @Path(value = "/{departmentId}")
+ @Produces(value = { "text/xml" })
+ public Response getDepartment(@PathParam(value = "departmentId") String departmentId, @QueryParam(value = "type") String type, @Context Request req) {
+ Department dept = DepartmentDatabase.getDepartment(departmentId);
+ return Response.ok(dept).build();
+ }
+
+ @DELETE
+ @Path(value = "/{departmentId}")
+ public Response deleteDepartment(@PathParam(value = "departmentId") String departmentId) {
+ Department dept = DepartmentDatabase.removeDepartment(departmentId);
+ if (dept == null) {
+ return Response.status(404).build();
+ }
+ return Response.status(204).build();
+ }
+
+ @POST
+ @Consumes(value = "text/xml")
+ public void addDepartment(Department department) {
+ DepartmentDatabase.addDepartment(department);
+ }
+
+ @HEAD
+ @Produces(value = "text/xml")
+ @Path(value = "/{departmentId}")
+ public Response exists(@PathParam(value = "departmentId") String departmentId) {
+ Department dpt = DepartmentDatabase.getDepartment(departmentId);
+ Response resp = null;
+ if (dpt != null) {
+ ResponseBuilder rb = Response.ok();
+ rb.entity(dpt);
+ resp = rb.build();
+ resp.getMetadata().add("resolved-id", departmentId);
+ } else {
+ ResponseBuilder rb = Response.noContent();
+ rb.entity(null);
+ resp = rb.build();
+ resp.getMetadata().add("unresolved-id", departmentId);
+ }
+ return resp;
+ }
+
+}
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/ObjectFactory.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/ObjectFactory.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/ObjectFactory.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/ObjectFactory.java Thu Jul 16 20:03:06 2009
@@ -17,19 +17,23 @@
* under the License.
*/
-package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+package org.apache.wink.jaxrs.test.providers.contextresolver;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-@Provider
-public class RuntimeExceptionMappingProvider implements ExceptionMapper<RuntimeException> {
-
- public Response toResponse(RuntimeException arg0) {
- CommentError error = new CommentError();
- error.setErrorMessage(arg0.getMessage());
- return Response.status(450).entity(error).build();
+import javax.xml.bind.annotation.XmlRegistry;
+
+@XmlRegistry
+public class ObjectFactory {
+
+ public ObjectFactory() {
+
+ }
+
+ public Department createDepartment() {
+ return new Department();
+ }
+
+ public DepartmentListWrapper createDepartmentListWrapper() {
+ return new DepartmentListWrapper();
}
}
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/User.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/User.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/User.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/User.java Thu Jul 16 20:03:06 2009
@@ -17,19 +17,18 @@
* under the License.
*/
-package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+package org.apache.wink.jaxrs.test.providers.contextresolver;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-@Provider
-public class RuntimeExceptionMappingProvider implements ExceptionMapper<RuntimeException> {
-
- public Response toResponse(RuntimeException arg0) {
- CommentError error = new CommentError();
- error.setErrorMessage(arg0.getMessage());
- return Response.status(450).entity(error).build();
+public class User {
+
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
}
}
Added: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserAccount.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserAccount.java?rev=794818&view=auto
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserAccount.java (added)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserAccount.java Thu Jul 16 20:03:06 2009
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.wink.jaxrs.test.providers.contextresolver;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
+
+@Path(value = "/user")
+public class UserAccount {
+
+ private static Map<String, User> users = new HashMap<String, User>();
+
+ @POST
+ @Consumes(value = "text/xml")
+ public void createUser(JAXBElement<User> element) {
+ User user = element.getValue();
+ users.put(user.getUserName(), user);
+ }
+
+ @GET
+ @Path(value = "/{userName}")
+ @Produces(value = "text/xml")
+ public JAXBElement<User> getUser(@PathParam(value = "userName") String userName) {
+ User user = users.get(userName);
+ return new JAXBElement<User>(new QName("http://jaxb.context.tests",
+ "user"), User.class, user);
+ }
+
+}
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserContextProvider.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserContextProvider.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserContextProvider.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/UserContextProvider.java Thu Jul 16 20:03:06 2009
@@ -17,19 +17,26 @@
* under the License.
*/
-package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+package org.apache.wink.jaxrs.test.providers.contextresolver;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
+import javax.xml.bind.JAXBContext;
+
+import org.apache.wink.jaxrs.test.providers.contextresolver.jaxb.ObjectFactory;
@Provider
-public class GuestbookExceptionMapProvider implements ExceptionMapper<GuestbookException> {
+public class UserContextProvider implements ContextResolver<JAXBContext> {
- public Response toResponse(GuestbookException arg0) {
- CommentError error = new CommentError();
- error.setErrorMessage(arg0.getMessage());
- return Response.status(454).entity(error).build();
+ public JAXBContext getContext(Class<?> clazz) {
+ if (clazz == User.class) {
+ try {
+ return JAXBContext.newInstance(ObjectFactory.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
}
}
Copied: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/jaxb/ObjectFactory.java (from r794817, incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/jaxb/ObjectFactory.java?p2=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/jaxb/ObjectFactory.java&p1=incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java&r1=794817&r2=794818&rev=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/contextresolver/jaxb/ObjectFactory.java Thu Jul 16 20:03:06 2009
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+package org.apache.wink.jaxrs.test.providers.contextresolver.jaxb;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-@Provider
-public class RuntimeExceptionMappingProvider implements ExceptionMapper<RuntimeException> {
-
- public Response toResponse(RuntimeException arg0) {
- CommentError error = new CommentError();
- error.setErrorMessage(arg0.getMessage());
- return Response.status(450).entity(error).build();
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRegistry;
+
+import org.apache.wink.jaxrs.test.providers.contextresolver.User;
+
+@XmlRegistry
+public class ObjectFactory {
+
+ @XmlElement(name = "user", namespace = "http://jaxb.context.tests")
+ public User createUser() {
+ return new User();
}
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/Guestbook.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/Guestbook.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/Guestbook.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/Guestbook.java Thu Jul 16 20:03:06 2009
@@ -51,7 +51,7 @@
public MyWebAppException(int status) {
CommentError error = new CommentError();
error.setErrorMessage("Cannot post an invalid message.");
- resp = Response.status(status).entity(error).build();
+ resp = Response.status(status).entity(error).type("text/xml").build();
}
@Override
@@ -83,7 +83,7 @@
CommentError error = new CommentError();
error.setErrorMessage("Missing the message in the comment.");
Response malformedCommentResponse =
- Response.status(Status.BAD_REQUEST).entity(error).build();
+ Response.status(Status.BAD_REQUEST).entity(error).type("text/xml").build();
WebApplicationException webAppException =
new WebApplicationException(malformedCommentResponse);
throw webAppException;
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookErrorExceptionMappingProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookErrorExceptionMappingProvider.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookErrorExceptionMappingProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookErrorExceptionMappingProvider.java Thu Jul 16 20:03:06 2009
@@ -19,6 +19,7 @@
package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
@@ -29,7 +30,7 @@
public Response toResponse(GuestbookError arg0) {
CommentError error = new CommentError();
error.setErrorMessage(arg0.getMessage());
- return Response.status(453).entity(error).build();
+ return Response.status(453).entity(error).type(MediaType.APPLICATION_XML_TYPE).build();
}
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/GuestbookExceptionMapProvider.java Thu Jul 16 20:03:06 2009
@@ -29,7 +29,7 @@
public Response toResponse(GuestbookException arg0) {
CommentError error = new CommentError();
error.setErrorMessage(arg0.getMessage());
- return Response.status(454).entity(error).build();
+ return Response.status(454).entity(error).type("application/xml").build();
}
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/NullPointerExceptionMapProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/NullPointerExceptionMapProvider.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/NullPointerExceptionMapProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/NullPointerExceptionMapProvider.java Thu Jul 16 20:03:06 2009
@@ -19,6 +19,7 @@
package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
@@ -29,7 +30,7 @@
public Response toResponse(NullPointerException arg0) {
CommentError error = new CommentError();
error.setErrorMessage(arg0.getMessage());
- return Response.status(451).entity(error).build();
+ return Response.status(451).entity(error).type(MediaType.APPLICATION_XML_TYPE).build();
}
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/RuntimeExceptionMappingProvider.java Thu Jul 16 20:03:06 2009
@@ -19,6 +19,7 @@
package org.apache.wink.jaxrs.test.providers.exceptionmappers.mapped;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
@@ -29,7 +30,7 @@
public Response toResponse(RuntimeException arg0) {
CommentError error = new CommentError();
error.setErrorMessage(arg0.getMessage());
- return Response.status(450).entity(error).build();
+ return Response.status(450).entity(error).type(MediaType.APPLICATION_XML_TYPE).build();
}
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/WebApplicationExceptionMapProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/WebApplicationExceptionMapProvider.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/WebApplicationExceptionMapProvider.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/mapped/WebApplicationExceptionMapProvider.java Thu Jul 16 20:03:06 2009
@@ -21,6 +21,7 @@
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.ExceptionMapper;
@@ -47,7 +48,7 @@
builder.status(491);
CommentError error = new CommentError();
error.setErrorMessage("WebApplicationExceptionMapProvider set message");
- builder.entity(error);
+ builder.entity(error).type(MediaType.APPLICATION_XML_TYPE);
}
return builder.build();
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/nomapper/Guestbook.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/nomapper/Guestbook.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/nomapper/Guestbook.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/exceptionmappers/nomapper/Guestbook.java Thu Jul 16 20:03:06 2009
@@ -32,6 +32,7 @@
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.core.Response.Status;
@@ -46,12 +47,12 @@
private static final long serialVersionUID = -2022185988670037226L;
- final private Response resp;
+ final private Response resp;
public MyWebAppException(int status) {
CommentError error = new CommentError();
error.setErrorMessage("Cannot post an invalid message.");
- resp = Response.status(status).entity(error).build();
+ resp = Response.status(status).type("text/xml").entity(error).build();
}
@Override
@@ -62,16 +63,16 @@
/**
* Adds a new message to the database.
- *
+ *
* @return HTTP status 200
*/
@POST
- @Consumes( { "text/xml" })
- @Produces( { "text/xml" })
+ @Consumes( {"text/xml"})
+ @Produces( {"text/xml"})
public Response createMessage(Comment aMessage, @Context UriInfo uriInfo) {
if (aMessage == null) {
- WebApplicationException webAppException = new WebApplicationException(
- Status.BAD_REQUEST);
+ WebApplicationException webAppException =
+ new WebApplicationException(Status.BAD_REQUEST);
throw webAppException;
}
@@ -82,16 +83,15 @@
if (aMessage.getMessage() == null) {
CommentError error = new CommentError();
error.setErrorMessage("Missing the message in the comment.");
- Response malformedCommentResponse = Response.status(
- Status.BAD_REQUEST).entity(error).build();
- WebApplicationException webAppException = new WebApplicationException(
- malformedCommentResponse);
+ Response malformedCommentResponse =
+ Response.status(Status.BAD_REQUEST).entity(error).type("text/xml").build();
+ WebApplicationException webAppException =
+ new WebApplicationException(malformedCommentResponse);
throw webAppException;
}
if (aMessage.getAuthor() == null) {
- WebApplicationException webAppException = new WebApplicationException(
- 499);
+ WebApplicationException webAppException = new WebApplicationException(499);
throw webAppException;
}
@@ -108,11 +108,8 @@
GuestbookDatabase.getGuestbook().storeComment(aMessage);
try {
- return Response
- .created(
- new URI(uriInfo.getAbsolutePath() + "/"
- + aMessage.getId())).entity(aMessage)
- .build();
+ return Response.created(new URI(uriInfo.getAbsolutePath() + "/" + aMessage.getId()))
+ .entity(aMessage).type(MediaType.TEXT_XML).build();
} catch (URISyntaxException e) {
e.printStackTrace();
throw new RuntimeException(e);
@@ -122,7 +119,7 @@
@PUT
@Path("{id}")
public Response updateMessage(Comment aMessage, @PathParam("id") String msgId)
- throws GuestbookException {
+ throws GuestbookException {
/*
* If no message data was sent, then return the null request.
*/
@@ -134,11 +131,10 @@
throw new GuestbookException("Unexpected ID.");
}
- Comment existingComment = GuestbookDatabase.getGuestbook().getComment(
- Integer.valueOf(msgId));
+ Comment existingComment =
+ GuestbookDatabase.getGuestbook().getComment(Integer.valueOf(msgId));
if (existingComment == null) {
- throw new GuestbookException(
- "Cannot find existing comment to update.");
+ throw new GuestbookException("Cannot find existing comment to update.");
}
GuestbookDatabase.getGuestbook().storeComment(aMessage);
return Response.ok(aMessage).build();
@@ -146,10 +142,9 @@
@GET
@Path("/{id}")
- @Produces( { "text/xml" })
+ @Produces( {"text/xml"})
public Response readMessage(@PathParam("id") String msgId) {
- Comment msg = GuestbookDatabase.getGuestbook().getComment(
- Integer.valueOf(msgId));
+ Comment msg = GuestbookDatabase.getGuestbook().getComment(Integer.valueOf(msgId));
if (msg == null) {
return Response.status(404).build();
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/Application.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/Application.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/Application.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/Application.java Thu Jul 16 20:03:06 2009
@@ -28,6 +28,15 @@
public Set<Class<?>> getClasses() {
Set<Class<?>> clazzes = new HashSet<Class<?>>();
clazzes.add(ReaderResource.class);
+ // clazzes.add(MessageBodyReaderAnnotationList.class);
+ // clazzes.add(MessageBodyReaderMediaTypeSet.class);
+ // clazzes.add(MessageBodyReaderGenericEntityTypeQueue.class);
+ // clazzes.add(MessageBodyReaderClassDeque.class);
+ // clazzes.add(MessageBodyReaderThrowsExceptions.class);
+ // clazzes.add(MessageBodyReaderIsReadableThrowsRuntimeException.class);
+ // clazzes.add(MessageBodyReaderIsReadableThrowsWebAppException.class);
+ // clazzes.add(MessageBodyReaderReadFromDifferent.class);
+ // clazzes.add(MessageBodyReaderGenericType.class);
return clazzes;
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderAnnotationList.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderAnnotationList.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderAnnotationList.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderAnnotationList.java Thu Jul 16 20:03:06 2009
@@ -28,17 +28,20 @@
import javax.ws.rs.Consumes;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
-
-import org.apache.cxf.helpers.IOUtils;
+import javax.ws.rs.ext.Providers;
@Provider
@Consumes("text/plain")
public class MessageBodyReaderAnnotationList implements MessageBodyReader<List> {
+ @Context
+ Providers providers;
+
public boolean isReadable(Class<?> arg0, Type arg1, Annotation[] arg2, MediaType arg3) {
for (Annotation ann : arg2) {
if (MyReaderAnnotation.class.equals(ann.annotationType())) {
@@ -48,11 +51,20 @@
return false;
}
- public List readFrom(Class<List> arg0, Type arg1, Annotation[] arg2, MediaType arg3, MultivaluedMap<String, String> arg4, InputStream arg5)
- throws IOException, WebApplicationException {
+ public List readFrom(Class<List> arg0,
+ Type arg1,
+ Annotation[] arg2,
+ MediaType arg3,
+ MultivaluedMap<String, String> arg4,
+ InputStream arg5) throws IOException, WebApplicationException {
String str = null;
try {
- str = IOUtils.toString(arg5);
+ MessageBodyReader<String> strReader =
+ providers.getMessageBodyReader(String.class,
+ String.class,
+ arg2,
+ MediaType.TEXT_PLAIN_TYPE);
+ str = strReader.readFrom(String.class, String.class, arg2, arg3, arg4, arg5);
} catch (IOException e) {
throw new WebApplicationException(e);
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderClassDeque.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderClassDeque.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderClassDeque.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderClassDeque.java Thu Jul 16 20:03:06 2009
@@ -26,16 +26,19 @@
import java.util.Arrays;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
-
-import org.apache.cxf.helpers.IOUtils;
+import javax.ws.rs.ext.Providers;
@Provider
public class MessageBodyReaderClassDeque implements MessageBodyReader<Object> {
+ @Context
+ private Providers providers;
+
public boolean isReadable(Class<?> arg0, Type arg1, Annotation[] arg2, MediaType arg3) {
if (arg0.equals(Deque.class)) {
return true;
@@ -47,7 +50,9 @@
throws IOException, WebApplicationException {
String str = null;
try {
- str = IOUtils.toString(arg5);
+ MessageBodyReader<String> strReader =
+ providers.getMessageBodyReader(String.class, String.class, arg2, arg3);
+ str = strReader.readFrom(String.class, String.class, arg2, arg3, arg4, arg5);
} catch (IOException e) {
throw new WebApplicationException(e);
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericEntityTypeQueue.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericEntityTypeQueue.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericEntityTypeQueue.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericEntityTypeQueue.java Thu Jul 16 20:03:06 2009
@@ -27,32 +27,43 @@
import java.util.Arrays;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
-
-import org.apache.cxf.helpers.IOUtils;
+import javax.ws.rs.ext.Providers;
@Provider
public class MessageBodyReaderGenericEntityTypeQueue implements MessageBodyReader<Queue> {
+ @Context
+ private Providers providers;
+
public boolean isReadable(Class<?> arg0, Type arg1, Annotation[] arg2, MediaType arg3) {
if (arg1 instanceof ParameterizedType) {
- ParameterizedType pt = (ParameterizedType) arg1;
+ ParameterizedType pt = (ParameterizedType)arg1;
Type[] actualArgumentTypes = pt.getActualTypeArguments();
- return actualArgumentTypes != null
- && actualArgumentTypes.length == 1
- && String.class.equals(actualArgumentTypes[0]);
+ return actualArgumentTypes != null && actualArgumentTypes.length == 1
+ && String.class.equals(actualArgumentTypes[0]);
}
return false;
}
- public Queue readFrom(Class<Queue> arg0, Type arg1, Annotation[] arg2, MediaType arg3, MultivaluedMap<String, String> arg4, InputStream arg5)
- throws IOException, WebApplicationException {
+ public Queue readFrom(Class<Queue> arg0,
+ Type arg1,
+ Annotation[] arg2,
+ MediaType arg3,
+ MultivaluedMap<String, String> arg4,
+ InputStream arg5) throws IOException, WebApplicationException {
String str = null;
try {
- str = IOUtils.toString(arg5);
+ MessageBodyReader<String> strReader =
+ providers.getMessageBodyReader(String.class,
+ String.class,
+ arg2,
+ MediaType.TEXT_PLAIN_TYPE);
+ str = strReader.readFrom(String.class, String.class, arg2, arg3, arg4, arg5);
} catch (IOException e) {
throw new WebApplicationException(e);
}
Modified: incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericType.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericType.java?rev=794818&r1=794817&r2=794818&view=diff
==============================================================================
--- incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericType.java (original)
+++ incubator/wink/trunk/wink-integration-test/wink-server-integration-test/wink-jaxrs-test-providers/src/main/java/org/apache/wink/jaxrs/test/providers/readers/MessageBodyReaderGenericType.java Thu Jul 16 20:03:06 2009
@@ -29,17 +29,20 @@
import javax.ws.rs.Consumes;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
-
-import org.apache.cxf.helpers.IOUtils;
+import javax.ws.rs.ext.Providers;
@Provider
@Consumes("custom/generic")
public class MessageBodyReaderGenericType implements MessageBodyReader<Object> {
+ @Context
+ Providers providers;
+
public boolean isReadable(Class<?> arg0, Type arg1, Annotation[] arg2, MediaType arg3) {
if (List.class.isAssignableFrom(arg0)) {
if (arg1 instanceof ParameterizedType) {
@@ -81,7 +84,12 @@
if (genericTypeArguments.length == 1) {
Class argType = (Class) genericTypeArguments[0];
if (Integer.class.isAssignableFrom(argType)) {
- String str = IOUtils.toString(arg5);
+ MessageBodyReader<String> strReader =
+ providers.getMessageBodyReader(String.class,
+ String.class,
+ arg2,
+ MediaType.TEXT_PLAIN_TYPE);
+ String str = strReader.readFrom(String.class, String.class, arg2, arg3, arg4, arg5);
String[] splitlines = str.split("\r\n");
List<Integer> ret = new ArrayList<Integer>();
for (String s : splitlines) {
@@ -89,7 +97,12 @@
}
return ret;
} else if (String.class.isAssignableFrom(argType)) {
- String str = IOUtils.toString(arg5);
+ MessageBodyReader<String> strReader =
+ providers.getMessageBodyReader(String.class,
+ String.class,
+ arg2,
+ MediaType.TEXT_PLAIN_TYPE);
+ String str = strReader.readFrom(String.class, String.class, arg2, arg3, arg4, arg5);
String[] splitlines = str.split("\r\n");
List<String> ret = new ArrayList<String>();
for (String s : splitlines) {
@@ -100,7 +113,12 @@
}
}
} else if (arg1 instanceof Class) {
- String str = IOUtils.toString(arg5);
+ MessageBodyReader<String> strReader =
+ providers.getMessageBodyReader(String.class,
+ String.class,
+ arg2,
+ MediaType.TEXT_PLAIN_TYPE);
+ String str = strReader.readFrom(String.class, String.class, arg2, arg3, arg4, arg5);
String[] splitlines = str.split("\r\n");
List<Object> ret = new ArrayList<Object>();
for (String s : splitlines) {
@@ -112,7 +130,12 @@
if (arg1 instanceof Class) {
if (Integer.class.isAssignableFrom((Class) arg1)) {
- String str = IOUtils.toString(arg5);
+ MessageBodyReader<String> strReader =
+ providers.getMessageBodyReader(String.class,
+ String.class,
+ arg2,
+ MediaType.TEXT_PLAIN_TYPE);
+ String str = strReader.readFrom(String.class, String.class, arg2, arg3, arg4, arg5);
String[] splitlines = str.split("\r\n");
int sum = 0;
for (String s : splitlines) {