diff --git a/pom.xml b/pom.xml index 1b49488..d9f38fa 100644 --- a/pom.xml +++ b/pom.xml @@ -45,181 +45,40 @@ - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - https://tomcat.joethei.space/manager/text - TomcatServer - /itech - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - - default-war - prepare-package - - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M1 - + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + https://tomcat.joethei.space/manager/text + TomcatServer + /itech + + + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 + + false + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + + - - org.apache.maven.plugins - maven-site-plugin - 3.7.1 - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - com.puppycrawl.tools - checkstyle - 8.17 - - - - ${project.build.sourceEncoding} - true - true - ${checkstyle.file} - - - - verify-style - process-classes - - check - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.11.0 - - ${java.version} - 100 - ${project.build.sourceEncoding} - true - false - - - - verify-optimization - process-classes - - check - cpd-check - - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.9 - - Max - Low - false - - - com.h3xstream.findsecbugs - findsecbugs-plugin - 1.8.0 - - - com.mebigfatguy.fb-contrib - fb-contrib - 7.4.3.sb - - - - - - verify-errors - verify - - check - - - - - + + - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ${checkstyle.file} - - 3.0.0 - - - - checkstyle - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.9 - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - @@ -229,12 +88,6 @@ 4.0.1 provided - - javax.faces - jsf-api - 2.1 - provided - org.apache.myfaces.core myfaces-api @@ -245,13 +98,6 @@ myfaces-impl 2.3.3 - - org.apache.myfaces.tomahawk - tomahawk20 - 1.1.14 - - - diff --git a/src/main/java/de/hsel/itech/jsf/CategoryBean.java b/src/main/java/de/hsel/itech/jsf/CategoryBean.java index bb211ed..d97c985 100644 --- a/src/main/java/de/hsel/itech/jsf/CategoryBean.java +++ b/src/main/java/de/hsel/itech/jsf/CategoryBean.java @@ -12,7 +12,6 @@ import java.util.List; @ApplicationScoped public class CategoryBean implements Serializable { - private String hello = "Hallo Welt"; public String getHello() { @@ -23,4 +22,8 @@ public class CategoryBean implements Serializable { return Database.getInstance().getCategories(); } + public String test() { + return ""; + } + } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index a974cdf..0000000 --- a/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - Amazon light - - - - javax.faces.PROJECT_STAGE - Development - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - - Faces Servlet - *.jsf - - - \ No newline at end of file diff --git a/src/main/webapp/category.xhtml b/src/main/webapp/category.xhtml index 751a8f4..2fe7543 100644 --- a/src/main/webapp/category.xhtml +++ b/src/main/webapp/category.xhtml @@ -5,26 +5,16 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core"> - -ha - + +Amazon light + - - - - - - - - - - - + - +
- +
\ No newline at end of file diff --git a/src/main/webapp/version.jsp b/src/main/webapp/version.jsp new file mode 100644 index 0000000..25247f2 --- /dev/null +++ b/src/main/webapp/version.jsp @@ -0,0 +1,6 @@ +<%@ page import="javax.faces.context.FacesContext" %> +Server info: <%= application.getServerInfo() %>
+Servlet version: <%= application.getMajorVersion() %>.<%= application.getMinorVersion() %>
+JSP version: <%= JspFactory.getDefaultFactory().getEngineInfo().getSpecificationVersion() %>
+JSF version: <%= FacesContext.class.getPackage().getImplementationVersion()%> +Java version: <%= System.getProperty("java.version") %>