Author: owulff
Date: Tue Jan 28 21:49:39 2014
New Revision: 1562247
URL: http://svn.apache.org/r1562247
Log:
Support json/xml only and add namespace to collection classes
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Applications.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Claims.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Idps.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/RootService.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdps.java
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java
Tue Jan 28 21:49:39 2014
@@ -21,6 +21,7 @@ package org.apache.cxf.fediz.service.idp
import java.util.List;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
@@ -40,6 +41,7 @@ import org.apache.cxf.fediz.service.idp.
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Path("applications")
public interface ApplicationService {
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Applications.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Applications.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Applications.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Applications.java
Tue Jan 28 21:49:39 2014
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.cxf.fediz.service.idp.domain.Application;
-@XmlRootElement(name = "applications")
+@XmlRootElement(name = "applications", namespace =
"http://org.apache.cxf.fediz/";)
public class Applications {
private Collection<Application> applications;
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java
Tue Jan 28 21:49:39 2014
@@ -19,6 +19,7 @@
package org.apache.cxf.fediz.service.idp.rest;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
@@ -37,6 +38,7 @@ import org.apache.cxf.fediz.service.idp.
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Path("claims")
public interface ClaimService {
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Claims.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Claims.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Claims.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Claims.java
Tue Jan 28 21:49:39 2014
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.cxf.fediz.service.idp.domain.Claim;
-@XmlRootElement(name = "claims")
+@XmlRootElement(name = "claims", namespace = "http://org.apache.cxf.fediz/";)
public class Claims {
private Collection<Claim> claims;
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java
Tue Jan 28 21:49:39 2014
@@ -21,6 +21,7 @@ package org.apache.cxf.fediz.service.idp
import java.util.List;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
@@ -41,6 +42,7 @@ import org.apache.cxf.fediz.service.idp.
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Path("idps")
public interface IdpService {
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Idps.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Idps.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Idps.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/Idps.java
Tue Jan 28 21:49:39 2014
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.cxf.fediz.service.idp.domain.Idp;
-@XmlRootElement(name = "idps")
+@XmlRootElement(name = "idps", namespace = "http://org.apache.cxf.fediz/";)
public class Idps {
private Collection<Idp> idps;
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/RootService.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/RootService.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/RootService.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/RootService.java
Tue Jan 28 21:49:39 2014
@@ -20,6 +20,7 @@
package org.apache.cxf.fediz.service.idp.rest;
+import javax.ws.rs.Consumes;
import javax.ws.rs.HEAD;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
@@ -29,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public interface RootService {
@HEAD
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java
Tue Jan 28 21:49:39 2014
@@ -19,6 +19,7 @@
package org.apache.cxf.fediz.service.idp.rest;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
@@ -37,6 +38,7 @@ import org.apache.cxf.fediz.service.idp.
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Path("trusted-idps")
public interface TrustedIdpService {
Modified:
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdps.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdps.java?rev=1562247&r1=1562246&r2=1562247&view=diff
==============================================================================
---
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdps.java
(original)
+++
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdps.java
Tue Jan 28 21:49:39 2014
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
-@XmlRootElement(name = "trustedIdps")
+@XmlRootElement(name = "trustedIdps", namespace =
"http://org.apache.cxf.fediz/";)
public class TrustedIdps {
private Collection<TrustedIdp> trustedIDPs;
