From 53833321821bb11c7030eacebd8e97e7eb86af97 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 28 Mar 2013 19:41:40 +0100
Subject: [PATCH] fix deployment

---
 pom.xml                                         |  2 +-
 .../frontend/rest/RESTApplication.java          | 17 +++++++++++++++++
 .../frontend/rest/resources/AbstractREST.java   |  8 ++++++--
 src/main/webapp/WEB-INF/beans.xml               |  3 +--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 231dc431..04944154 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
 				<artifactId>tomee-maven-plugin</artifactId>
 				<version>1.6.0-SNAPSHOT</version>
 				<configuration>
-					<tomeeVersion>1.6.0-SNAPSHOT</tomeeVersion>
+					<tomeeVersion>1.5.2-SNAPSHOT</tomeeVersion>
 					<tomeeClassifier>plus</tomeeClassifier>
 					<tomeeHttpPort>8082</tomeeHttpPort>
 					<args>-Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled</args>
diff --git a/src/main/java/com/commafeed/frontend/rest/RESTApplication.java b/src/main/java/com/commafeed/frontend/rest/RESTApplication.java
index d3b6d66a..e5774201 100644
--- a/src/main/java/com/commafeed/frontend/rest/RESTApplication.java
+++ b/src/main/java/com/commafeed/frontend/rest/RESTApplication.java
@@ -1,9 +1,26 @@
 package com.commafeed.frontend.rest;
 
+import java.util.Set;
+
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
+import com.commafeed.frontend.rest.resources.EntriesREST;
+import com.commafeed.frontend.rest.resources.SettingsREST;
+import com.commafeed.frontend.rest.resources.SubscriptionsREST;
+import com.google.common.collect.Sets;
+
 @ApplicationPath("/rest")
 public class RESTApplication extends Application {
 
+	@Override
+	public Set<Class<?>> getClasses() {
+		Set<Class<?>> set = Sets.newHashSet();
+		set.add(JSONMessageBodyReaderWriter.class);
+
+		set.add(SubscriptionsREST.class);
+		set.add(EntriesREST.class);
+		set.add(SettingsREST.class);
+		return set;
+	}
 }
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
index 025a4c97..945419aa 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
@@ -14,6 +14,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.Response.Status;
 
 import org.apache.wicket.ThreadContext;
@@ -102,7 +103,9 @@ public abstract class AbstractREST {
 	public Object checkSecurity(InvocationContext context) throws Exception {
 		User user = getUser();
 		if (user == null) {
-			throw new WebApplicationException(Status.UNAUTHORIZED);
+			throw new WebApplicationException(Response
+					.status(Status.UNAUTHORIZED)
+					.entity("You need to be authenticated to do this.").build());
 		}
 
 		boolean allowed = false;
@@ -118,7 +121,8 @@ public abstract class AbstractREST {
 							SecurityCheck.class));
 		}
 		if (!allowed) {
-			throw new WebApplicationException(Status.FORBIDDEN);
+			throw new WebApplicationException(Response.status(Status.FORBIDDEN)
+					.entity("You are not authorized to do this.").build());
 		}
 
 		return context.proceed();
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
index cb8aa009..ca7cef2c 100644
--- a/src/main/webapp/WEB-INF/beans.xml
+++ b/src/main/webapp/WEB-INF/beans.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-          http://java.sun.com/xml/ns/javaee http://docs.jboss.org/cdi/beans_1_0.xsd
-          http://jboss.org/schema/weld/beans http://jboss.org/schema/weld/beans_1_1.xsd">
+          http://java.sun.com/xml/ns/javaee http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/beans_1_0.xsd">
 
 </beans>
\ No newline at end of file