Added variable wrapping for reader rests

code/MoyaWeb/src/fi/codecrew/moya/rest/ReaderRestView.java

 package fi.codecrew.moya.rest;
 package fi.codecrew.moya.rest;
 
 
-import java.util.List;
-
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Consumes;
@@ -12,7 +10,9 @@ import javax.ws.rs.core.MediaType;
 
 
 import fi.codecrew.moya.beans.ReaderBeanLocal;
 import fi.codecrew.moya.beans.ReaderBeanLocal;
 import fi.codecrew.moya.rest.pojo.ReaderEventRestPojo;
 import fi.codecrew.moya.rest.pojo.ReaderEventRestPojo;
+import fi.codecrew.moya.rest.pojo.ReaderEventRestRoot;
 import fi.codecrew.moya.rest.pojo.ReaderRestPojo;
 import fi.codecrew.moya.rest.pojo.ReaderRestPojo;
+import fi.codecrew.moya.rest.pojo.ReaderRestRoot;
 
 
 @RequestScoped
 @RequestScoped
 @Path("/reader")
 @Path("/reader")
@@ -25,15 +25,15 @@ public class ReaderRestView {
 
 
 	@GET
 	@GET
 	@Path("/List")
 	@Path("/List")
-	public List<ReaderRestPojo> getReaderList()
+	public ReaderRestRoot getReaderList()
 	{
 	{
-		return ReaderRestPojo.parse(readerbean.getReaders());
+		return new ReaderRestRoot(ReaderRestPojo.parse(readerbean.getReaders()));
 	}
 	}
 
 
 	@GET
 	@GET
 	@Path("/LastEventusers")
 	@Path("/LastEventusers")
-	public List<ReaderEventRestPojo> getLastEventusers()
+	public ReaderEventRestRoot getLastEventusers()
 	{
 	{
-		return ReaderEventRestPojo.parse(readerbean.getLastReaderEvents());
+		return new ReaderEventRestRoot(ReaderEventRestPojo.parse(readerbean.getLastReaderEvents()));
 	}
 	}
 }
 }

code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/ReaderEventRestRoot.java

+package fi.codecrew.moya.rest.pojo;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ReaderEventRestRoot {
+	@XmlElementWrapper(name = "readerEvents")
+	private List<ReaderEventRestPojo> readers;
+
+	public ReaderEventRestRoot() {
+	}
+
+	public ReaderEventRestRoot(List<ReaderEventRestPojo> parsed) {
+		readers = parsed;
+	}
+
+	public List<ReaderEventRestPojo> getReaders() {
+		return readers;
+	}
+
+	public void setReaders(List<ReaderEventRestPojo> readers) {
+		this.readers = readers;
+	}
+
+}

code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/ReaderRestRoot.java

+package fi.codecrew.moya.rest.pojo;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ReaderRestRoot {
+	@XmlElementWrapper(name = "readers")
+	private List<ReaderRestPojo> readers;
+
+	public ReaderRestRoot() {
+	}
+
+	public ReaderRestRoot(List<ReaderRestPojo> parsed) {
+		readers = parsed;
+	}
+
+	public List<ReaderRestPojo> getReaders() {
+		return readers;
+	}
+
+	public void setReaders(List<ReaderRestPojo> readers) {
+		this.readers = readers;
+	}
+
+}