Author: bbrossaud Date: 2010-07-20 13:55:57 +0200 (Tue, 20 Jul 2010) New Revision: 109 Url: http://chorem.org/repositories/revision/bonzoms/109 Log: addition missing files Added: trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/ trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/web.xml trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/zk.xml Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-20 10:08:36 UTC (rev 108) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-20 11:55:57 UTC (rev 109) @@ -39,29 +39,24 @@ @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - createEmployeesPage(); + createEmployeesPage(null); } - public void createEmployeesPage() { + public void createEmployeesPage(String search) { Component newContent = Executions.createComponents("employeePage.zul", null, null); content.appendChild(newContent); } - public void createPersonsPage() { + public void createPersonsPage(String search) { Component newContent = Executions.createComponents("personPage.zul", null, null); content.appendChild(newContent); } - public void createCompaniesPage() { + public void createCompaniesPage(String search) { Component newContent = Executions.createComponents("companyPage.zul", null, null); content.appendChild(newContent); } - public void createResultPage() { - Component newContent = Executions.createComponents("resultPage.zul", null, null); - content.appendChild(newContent); - } - public void removeAllContentPage() { content.getLastChild().detach(); } @@ -70,8 +65,8 @@ * Events */ public void onOK$search() { + removeAllContentPage(); - createResultPage(); } public void onClick$searchButton() { @@ -80,16 +75,16 @@ public void onClick$employees() { removeAllContentPage(); - createEmployeesPage(); + createEmployeesPage(null); } public void onClick$persons() { removeAllContentPage(); - createPersonsPage(); + createPersonsPage(null); } public void onClick$companies() { removeAllContentPage(); - createCompaniesPage(); + createCompaniesPage(null); } } Added: trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/web.xml 2010-07-20 11:55:57 UTC (rev 109) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> + <display-name>MyApp</display-name> + + <listener> + <description>Used to cleanup when a session is destroyed</description> + <display-name>ZK Session Cleaner</display-name> + <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class> + </listener> + + <servlet> + <description>The servlet loads the DSP pages.</description> + <servlet-name>dspLoader</servlet-name> + <servlet-class>org.zkoss.web.servlet.dsp.InterpreterServlet</servlet-class> + </servlet> + + <servlet> + <description>ZK loader for ZUML pages</description> + <servlet-name>zkLoader</servlet-name> + <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class> + <init-param> + <param-name>update-uri</param-name> + <param-value>/zkau</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <description>The asynchronous update engine for ZK</description> + <servlet-name>auEngine</servlet-name> + <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>dspLoader</servlet-name> + <url-pattern>*.dsp</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>zkLoader</servlet-name> + <url-pattern>*.zul</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>zkLoader</servlet-name> + <url-pattern>*.zhtml</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>auEngine</servlet-name> + <url-pattern>/zkau/*</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + <welcome-file>index.zul</welcome-file> + </welcome-file-list> + +</web-app> Added: trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/zk.xml =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/zk.xml (rev 0) +++ trunk/bonzoms-ui-zk/src/main/webapp/WEB-INF/zk.xml 2010-07-20 11:55:57 UTC (rev 109) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Created by ZK Studio +--> +<zk> +</zk> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-07-20 10:08:36 UTC (rev 108) +++ trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-07-20 11:55:57 UTC (rev 109) @@ -1,4 +1,4 @@ -<?page id="company" title="Employee" cacheable="false" language="xul/html" zscriptLanguage="Java"?> +<?page id="company" title="Company" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="company"?>