diff --git a/ui/backend/.classpath b/ui/backend/.classpath index 106b4f5e95fde1c5ac1b59bcadf0996d0eb77dca..6acf3eeecaebe2d096ef46a44bf6988db916e316 100644 --- a/ui/backend/.classpath +++ b/ui/backend/.classpath @@ -1,7 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <classpathentry kind="src" output="target/classes" path="src/main/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> diff --git a/ui/backend/.settings/org.eclipse.wst.common.component b/ui/backend/.settings/org.eclipse.wst.common.component index cc321f3a82b8a2d8ae9f860ed7653cd0712cd4e4..cd3494c5379a5e3ea56477d711df13e6afd046f8 100644 --- a/ui/backend/.settings/org.eclipse.wst.common.component +++ b/ui/backend/.settings/org.eclipse.wst.common.component @@ -3,6 +3,9 @@ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/> <property name="context-root" value="backend"/> <property name="java-output-path" value="/backend/target/classes"/> </wb-module> diff --git a/ui/backend/pom.xml b/ui/backend/pom.xml index 4b36e97e856db16b6802e04a62e80879bfc49362..c8b5d4de25d4e5023ceb9f9c7f636b6d3dd7a8fb 100644 --- a/ui/backend/pom.xml +++ b/ui/backend/pom.xml @@ -26,5 +26,10 @@ <artifactId>javax.servlet-api</artifactId> <version>3.1.0</version> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.4.1</version> + </dependency> </dependencies> </project> diff --git a/ui/backend/src/main/java/de/cochu/backend/Application.java b/ui/backend/src/main/java/de/cochu/backend/Application.java index b45ab73adb8fda6251386500aecb60ccd9e18aca..38fc8eb7f6df596aab8ca5e1a6f79fc890229fd9 100644 --- a/ui/backend/src/main/java/de/cochu/backend/Application.java +++ b/ui/backend/src/main/java/de/cochu/backend/Application.java @@ -7,7 +7,7 @@ public class Application extends ResourceConfig { public Application() { packages("de.cochu.backend"); - register(LoggingFilter.class); + //register(LoggingFilter.class); } } diff --git a/ui/backend/src/main/java/de/cochu/backend/CORSFilter.java b/ui/backend/src/main/java/de/cochu/backend/CORSFilter.java new file mode 100644 index 0000000000000000000000000000000000000000..2bdd870e58ca2af961b48a110c444c9093ea0c56 --- /dev/null +++ b/ui/backend/src/main/java/de/cochu/backend/CORSFilter.java @@ -0,0 +1,20 @@ +package de.cochu.backend; + +import java.io.IOException; + +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerResponseContext; +import javax.ws.rs.container.ContainerResponseFilter; +import javax.ws.rs.ext.Provider; + +@Provider +public class CORSFilter implements ContainerResponseFilter { + + @Override + public void filter(ContainerRequestContext request, ContainerResponseContext response) throws IOException { + response.getHeaders().add("Access-Control-Allow-Origin", "*"); + response.getHeaders().add("Access-Control-Allow-Headers", "origin, content-type, accept, authorization"); + response.getHeaders().add("Access-Control-Allow-Credentials", "true"); + response.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS, HEAD"); + } +} \ No newline at end of file diff --git a/ui/backend/src/main/java/de/cochu/backend/Test.java b/ui/backend/src/main/java/de/cochu/backend/Test.java index d961513be949a7734b815b03a21586031a2dc0e9..61988a1189fdf69f53b5c361f2e9a6bffe29295f 100644 --- a/ui/backend/src/main/java/de/cochu/backend/Test.java +++ b/ui/backend/src/main/java/de/cochu/backend/Test.java @@ -5,9 +5,14 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + @Path("/") public class Test { + static Logger log = LogManager.getLogger(Test.class); + @GET @Path("/test") @Produces(MediaType.TEXT_PLAIN) diff --git a/ui/backend/src/main/resources/log4j2.xml b/ui/backend/src/main/resources/log4j2.xml new file mode 100644 index 0000000000000000000000000000000000000000..e43e1b9947b2f185974de3038a845e4434a2603b --- /dev/null +++ b/ui/backend/src/main/resources/log4j2.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="error"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/ui/backend/src/main/webapp/WEB-INF/web.xml b/ui/backend/src/main/webapp/WEB-INF/web.xml index 4ac4dc4a4f5d58e91bfdbab9f05e56c151885e60..043b4d83a844bc3ac9d047b4fe2d5efd639afbf3 100644 --- a/ui/backend/src/main/webapp/WEB-INF/web.xml +++ b/ui/backend/src/main/webapp/WEB-INF/web.xml @@ -17,6 +17,7 @@ <url-pattern>/rest/*</url-pattern> </servlet-mapping> + <!-- <filter> <filter-name>CorsFilter</filter-name> <filter-class>org.apache.catalina.filters.CorsFilter</filter-class> @@ -26,5 +27,6 @@ <filter-name>CorsFilter</filter-name> <url-pattern>/rest/*</url-pattern> </filter-mapping> + --> </web-app> diff --git a/ui/backend/src/main/webapp/index.jsp b/ui/backend/src/main/webapp/index.jsp index c38169bb958579c635a5c09ee2f379cc5956c0c2..d4fb745c4314a31b867be2d5000cbd268f3d0533 100644 --- a/ui/backend/src/main/webapp/index.jsp +++ b/ui/backend/src/main/webapp/index.jsp @@ -1,5 +1 @@ -<html> -<body> -<h2>Hello World!</h2> -</body> -</html> +<jsp:forward page="rest/application.wadl"/> \ No newline at end of file diff --git a/ui/backend/target/classes/log4j2.xml b/ui/backend/target/classes/log4j2.xml new file mode 100644 index 0000000000000000000000000000000000000000..e43e1b9947b2f185974de3038a845e4434a2603b --- /dev/null +++ b/ui/backend/target/classes/log4j2.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="error"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.properties b/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.properties index c48c7ff726c4389386823be49b4c772b2607dddb..02aea9a75f4b3492de4bdccd454c5bdb09ca3e1d 100644 --- a/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.properties +++ b/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Fri Nov 27 02:23:35 CET 2015 +#Fri Nov 27 11:38:17 CET 2015 version=0.0.1-SNAPSHOT groupId=de.cochu m2e.projectName=backend diff --git a/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.xml b/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.xml index 4b36e97e856db16b6802e04a62e80879bfc49362..c8b5d4de25d4e5023ceb9f9c7f636b6d3dd7a8fb 100644 --- a/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.xml +++ b/ui/backend/target/m2e-wtp/web-resources/META-INF/maven/de.cochu/backend/pom.xml @@ -26,5 +26,10 @@ <artifactId>javax.servlet-api</artifactId> <version>3.1.0</version> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.4.1</version> + </dependency> </dependencies> </project>