You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ro...@apache.org on 2010/11/01 23:00:54 UTC
svn commit: r1029866 - in /incubator/wink/trunk: wink-assembly/apache-wink/
wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/
Author: rott
Date: Mon Nov 1 22:00:54 2010
New Revision: 1029866
URL: http://svn.apache.org/viewvc?rev=1029866&view=rev
Log:
configure @Produces on resources for java5 support. The order of providers might be different in each JVM due to the unordered set in which they are stored. Configuring a specific @Produces helps Wink choose the right provider. Incomplete test code, in other words.
Modified:
incubator/wink/trunk/wink-assembly/apache-wink/ (props changed)
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextBeanResource.java
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextConstructorResource.java
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextFieldResource.java
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextNotBeanMethodResource.java
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextParamResource.java
Propchange: incubator/wink/trunk/wink-assembly/apache-wink/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 1 22:00:54 2010
@@ -1,2 +1,3 @@
.settings
.project
+target
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextBeanResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextBeanResource.java?rev=1029866&r1=1029865&r2=1029866&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextBeanResource.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextBeanResource.java Mon Nov 1 22:00:54 2010
@@ -21,12 +21,15 @@ package org.apache.wink.itest.securityco
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.SecurityContext;
import org.apache.wink.itest.securitycontext.xml.SecurityContextInfo;
@Path("/context/securitycontext/bean")
+@Produces(MediaType.APPLICATION_XML)
public class SecurityContextBeanResource {
private SecurityContext s = null;
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextConstructorResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextConstructorResource.java?rev=1029866&r1=1029865&r2=1029866&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextConstructorResource.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextConstructorResource.java Mon Nov 1 22:00:54 2010
@@ -21,12 +21,15 @@ package org.apache.wink.itest.securityco
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.SecurityContext;
import org.apache.wink.itest.securitycontext.xml.SecurityContextInfo;
@Path("/context/securitycontext/constructor")
+@Produces(MediaType.APPLICATION_XML)
public class SecurityContextConstructorResource {
final private SecurityContext secContext;
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextFieldResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextFieldResource.java?rev=1029866&r1=1029865&r2=1029866&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextFieldResource.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextFieldResource.java Mon Nov 1 22:00:54 2010
@@ -21,12 +21,15 @@ package org.apache.wink.itest.securityco
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.SecurityContext;
import org.apache.wink.itest.securitycontext.xml.SecurityContextInfo;
@Path("/context/securitycontext/field")
+@Produces(MediaType.APPLICATION_XML)
public class SecurityContextFieldResource {
@Context
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextNotBeanMethodResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextNotBeanMethodResource.java?rev=1029866&r1=1029865&r2=1029866&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextNotBeanMethodResource.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextNotBeanMethodResource.java Mon Nov 1 22:00:54 2010
@@ -21,11 +21,14 @@ package org.apache.wink.itest.securityco
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@Path("/context/securitycontext/notbeanmethod")
+@Produces(MediaType.APPLICATION_XML)
public class SecurityContextNotBeanMethodResource {
private SecurityContext s = null;
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextParamResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextParamResource.java?rev=1029866&r1=1029865&r2=1029866&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextParamResource.java (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/securitycontext/SecurityContextParamResource.java Mon Nov 1 22:00:54 2010
@@ -21,12 +21,15 @@ package org.apache.wink.itest.securityco
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.SecurityContext;
import org.apache.wink.itest.securitycontext.xml.SecurityContextInfo;
@Path("/context/securitycontext/param")
+@Produces(MediaType.APPLICATION_XML)
public class SecurityContextParamResource {
public SecurityContextParamResource() {