Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix deployment

Browse Source
This commit is contained in:
Athou
2013-03-28 19:41:40 +01:00
parent b4d4015f4b
commit 5383332182
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -54,7 +54,7 @@
<artifactId>tomee-maven-plugin</artifactId> <artifactId>tomee-maven-plugin</artifactId>
<version>1.6.0-SNAPSHOT</version> <version>1.6.0-SNAPSHOT</version>
<configuration> <configuration>
<tomeeVersion>1.6.0-SNAPSHOT</tomeeVersion> <tomeeVersion>1.5.2-SNAPSHOT</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier> <tomeeClassifier>plus</tomeeClassifier>
<tomeeHttpPort>8082</tomeeHttpPort> <tomeeHttpPort>8082</tomeeHttpPort>
<args>-Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled</args> <args>-Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled</args>

17
src/main/java/com/commafeed/frontend/rest/RESTApplication.java
View File

@@ -1,9 +1,26 @@
package com.commafeed.frontend.rest; package com.commafeed.frontend.rest;
import java.util.Set;
import javax.ws.rs.ApplicationPath; import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application; 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") @ApplicationPath("/rest")
public class RESTApplication extends Application { 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;
}
} }

8
src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
View File

@@ -14,6 +14,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException; import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import org.apache.wicket.ThreadContext; import org.apache.wicket.ThreadContext;
@@ -102,7 +103,9 @@ public abstract class AbstractREST {
public Object checkSecurity(InvocationContext context) throws Exception { public Object checkSecurity(InvocationContext context) throws Exception {
User user = getUser(); User user = getUser();
if (user == null) { 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; boolean allowed = false;
@@ -118,7 +121,8 @@ public abstract class AbstractREST {
SecurityCheck.class)); SecurityCheck.class));
} }
if (!allowed) { 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(); return context.proceed();

3
src/main/webapp/WEB-INF/beans.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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" <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=" xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee http://docs.jboss.org/cdi/beans_1_0.xsd http://java.sun.com/xml/ns/javaee http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/beans_1_0.xsd">
http://jboss.org/schema/weld/beans http://jboss.org/schema/weld/beans_1_1.xsd">
</beans> </beans>