diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml index 21530be83d266f63422cabed19df59581e4d106a..c7654be5dfba94e7a3170d4ecc9002583bd57104 100644 --- a/Kieker.WebGUI/pom.xml +++ b/Kieker.WebGUI/pom.xml @@ -21,12 +21,12 @@ <artifactId>jetty-maven-plugin</artifactId> <version>8.1.0.RC1</version> </dependency> - <dependency> + <dependency> <groupId>com.ocpsoft</groupId> <artifactId>prettyfaces-jsf2</artifactId> <version>3.3.2</version> </dependency> - <dependency> + <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> <version>2.1.6</version> diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/DependencyUploadController.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/DependencyUploadController.java index cb8756bed87c027be6ec14e125816663842b7ba3..4fd3b6fdf6b95f318f627c7103416beb266b832f 100644 --- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/DependencyUploadController.java +++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/DependencyUploadController.java @@ -1,7 +1,9 @@ package kieker.webgui.beans; +import javax.faces.application.FacesMessage; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; +import javax.faces.context.FacesContext; import kieker.webgui.common.FileManager; @@ -14,20 +16,20 @@ import org.primefaces.model.UploadedFile; @ManagedBean @SessionScoped public class DependencyUploadController { + private UploadedFile file; public UploadedFile getFile() { - System.out.println(file); return file; } public void setFile(UploadedFile file) { - System.out.println(file); this.file = file; } public void upload() { - System.out.println(file); + FacesMessage msg = new FacesMessage("Succesful", file.getFileName() + " is uploaded."); + FacesContext.getCurrentInstance().addMessage(null, msg); FileManager.getInstance().uploadDependency(file); } } diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml index 8d8de18609654be76c22f63e03cdb9bc7998a2d8..d8878dbb663ccc5dd24936ec61a3594cec714025 100644 --- a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml +++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml @@ -1,10 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app version="3.0" 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://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - <context-param> - <param-name>javax.faces.PROJECT_STAGE</param-name> - <param-value>Development</param-value> - </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + + <filter> + <filter-name>PrimeFaces FileUpload Filter</filter-name> + <filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class> + <init-param> + <param-name>thresholdSize</param-name> + <param-value>51200</param-value> + </init-param> + <init-param> + <param-name>uploadDirectory</param-name> + <param-value>C:\Temp</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>PrimeFaces FileUpload Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> <context-param> <param-name>primefaces.THEME</param-name> @@ -36,7 +57,7 @@ <listener-class>com.sun.faces.config.ConfigureListener</listener-class> </listener> - <filter> + <filter> <filter-name>Pretty Filter</filter-name> <filter-class>com.ocpsoft.pretty.PrettyFilter</filter-class> </filter> @@ -49,13 +70,4 @@ <dispatcher>ERROR</dispatcher> </filter-mapping> - <filter> - <filter-name>PrimeFaces FileUpload Filter</filter-name> - <filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>PrimeFaces FileUpload Filter</filter-name> - <servlet-name>Faces Servlet</servlet-name> - </filter-mapping> </web-app> diff --git a/Kieker.WebGUI/src/main/webapp/main.xhtml b/Kieker.WebGUI/src/main/webapp/main.xhtml index cf47bba61bef7bda577c040007e1586c6553bd19..4e7aa1777dfb3c7965bed8aaecd81a7f9af37fe6 100644 --- a/Kieker.WebGUI/src/main/webapp/main.xhtml +++ b/Kieker.WebGUI/src/main/webapp/main.xhtml @@ -204,10 +204,15 @@ resizable="false" modal="true" widgetVar="DependenciesUploadDialog"> <h:form enctype="multipart/form-data"> - <p:fileUpload value="#{dependencyUploadController.file}" mode="simple" /> + + <p:messages showDetail="true" /> + + <p:fileUpload value="#{dependencyUploadController.file}" + mode="simple" /> <p:commandButton value="Submit" ajax="false" actionListener="#{dependencyUploadController.upload}" /> + </h:form> </p:dialog> diff --git a/Read.me b/Read.me index d687ecb43025c5f3daab189df070ba7c1532bb2d..3456550799d78f216682a8b90a9214f08d2503eb 100644 --- a/Read.me +++ b/Read.me @@ -1,7 +1,7 @@ -The project "Kieker.WebGUI" can be started via Maven. Just use the command +The project "Kieker.WebGUI" can be started via Maven (3). Just use the command mvn jetty:run to pack the war-file, deploy it on jetty and start jetty. The web tool is then available at -http://localhost:8080/faces/main.xhtml \ No newline at end of file +http://localhost:8080/Kieker.WebGUI \ No newline at end of file