- Wikitty-commits - mailman.cloud.codelutin.com

r156 - in trunk/wikitty-ui-zk/src/main: java/org/nuiton/wikitty/ui webapp
by bbrossaud＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: bbrossaud Date: 2010-06-24 17:57:55 +0200 (Thu, 24 Jun 2010) New Revision: 156 Url: http://nuiton.org/repositories/revision/wikitty/156 Log: can add wikittyService properties Added: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/ProxyModel.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul Removed: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java trunk/wikitty-ui-zk/src/main/webapp/index.zul Deleted: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java 2010-06-24 14:13:27 UTC (rev 155) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java 2010-06-24 15:57:55 UTC (rev 156) @@ -1,139 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package org.nuiton.wikitty.ui; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import org.nuiton.wikitty.Wikitty; -import org.nuiton.wikitty.WikittyExtension; -import org.zkoss.zk.ui.util.GenericForwardComposer; -import org.zkoss.zul.ListModel; -import org.zkoss.zul.Listbox; -import org.zkoss.zul.Listitem; -import org.zkoss.zul.ListitemRenderer; - -/** - * - * @author sherkhan - */ -public class Controller extends GenericForwardComposer { - - protected Model _model = new Model(); - protected List<WikittyExtension> _extensions = new ArrayList<WikittyExtension>(); - protected WikittyExtension _selectedExtension; - protected WikittyExtension _selectedNewExtension; - protected Listbox formListBox; - protected WikittyForm _wikittyForm = new WikittyForm(); - protected Listbox wikittiesListBox; - protected WikittyModel _wikittyModel = new WikittyModel(); - - public Controller() { - _extensions = _model.retrieveWikittyExtensions(); - } - - /* - * Events - */ - public void onClick$addNewInput() { - _wikittyForm.addNewInput(formListBox); - } - - public void onClick$deleteInput() { - _wikittyForm.deleteInput(formListBox); - } - - public void onClick$add() { - Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox); - _model.create(newWikitty); - } - - public void onClick$update() { - if (_wikittyForm.isSelected()) { - Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox); - _model.update(newWikitty); - } - } - - public void onClick$delete() { - Set<Listitem> items = wikittiesListBox.getSelectedItems(); - for (Listitem item : items) { - Wikitty wikitty = (Wikitty) item.getValue(); - _model.deleteWikittyById(wikitty.getId()); - _wikittyModel.removeData(wikitty); - } - wikittiesListBox.setSelectedIndex(0); - } - - public void onClick$addNewExtension() { - _wikittyForm.addExtension(_selectedNewExtension); - } - - /* - * Renderers - */ - public ListitemRenderer getWikittyRenderer() { - return new ListitemRenderer() { - - @Override - public void render(Listitem item, Object data) throws Exception { - item.setValue(data); - item.setLabel(((Wikitty) data).getId()); - } - }; - } - - /* - * Getters - */ - public List<WikittyExtension> getExtensions() { - return _extensions; - } - - public WikittyExtension getSelectedExtension() { - return _selectedExtension; - } - - public WikittyExtension getSelectedNewExtension() { - return _selectedNewExtension; - } - - public WikittyForm getWikittyForm() { - return _wikittyForm; - } - - public ListModel getWikittyModel() { - return _wikittyModel; - } - - public Wikitty getSelectedWikitty() { - return _wikittyForm.getWikitty(); - } - - /* - * Setters - */ - public void setSelectedExtension(WikittyExtension current) { - _wikittyForm.setHoldExtensions(current); - List<Wikitty> list = _model.retrieveWikittiesByExtensionName(current.getName()); - _wikittyModel.setWikitties(list); - } - - public void setSelectedNewExtension(WikittyExtension current) { - _selectedNewExtension = current; - } - - public void setSelectedWikitty(Wikitty current) { - _wikittyForm.setWikitty(current); - } - - private void debbug(String debug) { - throw new UnsupportedOperationException(debug); - } - - /* - * Methods - */ -} Added: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java (rev 0) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java 2010-06-24 15:57:55 UTC (rev 156) @@ -0,0 +1,125 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.nuiton.wikitty.ui; + +/** + * + * @author sherkhan + */ +public class Data { + + protected String _path = ""; + protected String _name = ""; + protected String _db = ""; + protected String _driver = ""; + protected String _solr = ""; + protected String _URL = ""; + protected String _login = ""; + protected String _password = ""; + + public Data(String name, String db, String driver, String solr, String url, String login, String password) { + setName(name); + setDb(db); + setDriver(driver); + setSolr(solr); + setURL(url); + setLogin(login); + setPassword(password); + } + + /* + * Setters + */ + public void setPath(String path) { + if (path == null) { + path = ""; + } + _path = path; + } + + public void setName(String name) { + if (name == null) { + name = ""; + } + _name = name; + } + + public void setDb(String db) { + if (db == null) { + db = ""; + } + _db = db; + } + + public void setSolr(String solr) { + if (solr == null) { + solr = ""; + } + _solr = solr; + } + + public void setURL(String URL) { + if (URL == null) { + URL = ""; + } + _URL = URL; + } + + public void setLogin(String login) { + if (login == null) { + login = ""; + } + _login = login; + } + + public void setPassword(String password) { + if (password == null) { + password = ""; + } + _password = password; + } + + public void setDriver(String driver) { + if (driver == null) { + driver = ""; + } + _driver = driver; + } + + /* + * Getters + */ + public String getPath() { + return _path; + } + + public String getName() { + return _name; + } + + public String getDb() { + return _db; + } + + public String getDriver() { + return _driver; + } + + public String getSolr() { + return _solr; + } + + public String getUrl() { + return _URL; + } + + public String getLogin() { + return _login; + } + + public String getPassword() { + return _password; + } +} Added: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java (rev 0) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java 2010-06-24 15:57:55 UTC (rev 156) @@ -0,0 +1,227 @@ +package org.nuiton.wikitty.ui; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import org.apache.commons.lang.UnhandledException; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Listbox; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Textbox; +import org.zkoss.zul.Window; + +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +/** + * + * @author sherkhan + */ +public class LoginController extends GenericForwardComposer { + + protected ProxyModel _proxyModel = new ProxyModel(); + protected Listbox dataList; + protected ApplicationConfig _config = new ApplicationConfig(); + protected Properties _properties = new Properties(); + protected Window win; + + public LoginController() throws IOException { + initConfig(); + loadProperties(); + createProxyDatas(); + } + + public void initConfig() { + _config.setConfigFileName("wikitty-ui-zk.properties"); + try { + _config.parse(new String[]{}); + } catch (ArgumentsParserException ex) { + throw new UnhandledException(ex); + } + } + + protected void saveNewData(Data data) throws FileNotFoundException, IOException { + String name = ""; + String path = ""; + for (int count = 0; name != null; ++count) { + path = "data" + count; + name = _properties.getProperty(path + ".name"); + } + _properties.setProperty(path + ".name", data.getName()); + String db = data.getDb(); + if (!db.isEmpty()) { + _properties.setProperty(path + ".db", db); + } + String driver = data.getDriver(); + if (!driver.isEmpty()) { + _properties.setProperty(path + ".driver", driver); + } + String solr = data.getSolr(); + if (!solr.isEmpty()) { + _properties.setProperty(path + ".solr", solr); + } + String url = data.getUrl(); + if (!url.isEmpty()) { + _properties.setProperty(path + ".url", url); + } + String login = data.getLogin(); + if (!login.isEmpty()) { + _properties.setProperty(path + ".login", login); + } + String password = data.getPassword(); + if (!password.isEmpty()) { + _properties.setProperty(path + ".password", password); + } + data.setPath(path); + saveProperties(); + createProxyDatas(); + } + + protected void loadProperties() throws IOException { + String filePath = _config.getOption("wikitty-ui-zk.filePath"); + File file = new File(filePath); + if (!file.exists()) { + file.createNewFile(); + } + InputStream stream = new FileInputStream(file); + _properties.load(stream); + stream.close(); + } + + protected void saveProperties() throws IOException { + String filePath = _config.getOption("wikitty-ui-zk.filePath"); + File file = new File(filePath); + if (!file.exists()) { + file.createNewFile(); + } + OutputStream stream = new FileOutputStream(file); + _properties.store(stream, null); + stream.close(); + } + + protected void createProxyDatas() { + List<Data> datas = new ArrayList<Data>(); + String name = ""; + for (int count = 0; name != null; ++count) { + String path = "data" + count; + name = _properties.getProperty(path + ".name"); + if (name != null) { + String db = _properties.getProperty(path + ".db"); + String solr = _properties.getProperty(path + ".solr"); + String driver = _properties.getProperty(path + ".driver"); + String url = _properties.getProperty(path + "url"); + String login = _properties.getProperty(path + "login"); + String password = _properties.getProperty(path + "password"); + Data data = new Data(name, db, driver, solr, url, login, password); + data.setPath(path); + datas.add(data); + } + } + _proxyModel.setProxyDatas(datas); + } + + protected void removeDataFromProperties(Data data) { + String path = data.getPath(); + if (_properties.containsKey(path + ".name")) { + _properties.remove(path + ".name"); + } + if (_properties.containsKey(path + ".db")) { + _properties.remove(path + ".db"); + } + if (_properties.containsKey(path + ".driver")) { + _properties.remove(path + ".driver"); + } + if (_properties.containsKey(path + ".solr")) { + _properties.remove(path + ".solr"); + } + if (_properties.containsKey(path + ".url")) { + _properties.remove(path + ".url"); + } + if (_properties.containsKey(path + ".login")) { + _properties.remove(path + ".login"); + } + if (_properties.containsKey(path + ".password")) { + _properties.remove(path + ".password"); + } + } + + /* + * Events + */ + public void onClick$select() { + Listitem item = dataList.getSelectedItem(); + if (item != null) { + Data data = (Data) item.getValue(); + //WikittyZkConfig config = WikittyZkConfig.getInstance(); + } + } + + public void onClick$add() throws FileNotFoundException, IOException { + String name = ((Textbox) win.getFellow("Name")).getValue(); + String db = ((Textbox) win.getFellow("Db")).getValue(); + String solr = ((Textbox) win.getFellow("Solr")).getValue(); + String login = ((Textbox) win.getFellow("Login")).getValue(); + String password = ((Textbox) win.getFellow("Password")).getValue(); + String driver = ""; + Combobox box = (Combobox) win.getFellow("driver"); + Comboitem item = box.getSelectedItem(); + if (item != null) { + driver = item.getLabel(); + } + if (!name.isEmpty() && !db.isEmpty() && !solr.isEmpty() && !driver.isEmpty()) { + Data data = new Data(name, db, driver, solr, null, login, password); + saveNewData(data); + } + } + + public void onClick$delete() throws IOException { + Set<Listitem> set = dataList.getSelectedItems(); + List<Listitem> items = new ArrayList<Listitem>(set); + if (items != null) { + for (Listitem item : items) { + Data data = (Data) item.getValue(); + removeDataFromProperties(data); + _proxyModel.removeData(data); + } + saveProperties(); + } + } + + /* + * Renderers + */ + public ListitemRenderer getDataRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + item.setLabel(((Data) data).getName()); + } + }; + } + /* + * Setters + */ + + /* + * Getters + */ + public ProxyModel getProxyModel() { + return _proxyModel; + } +} Added: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/ProxyModel.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/ProxyModel.java (rev 0) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/ProxyModel.java 2010-06-24 15:57:55 UTC (rev 156) @@ -0,0 +1,55 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.nuiton.wikitty.ui; + +import java.util.ArrayList; +import java.util.List; +import org.zkoss.zkplus.databind.BindingListModel; +import org.zkoss.zul.AbstractListModel; +import org.zkoss.zul.event.ListDataEvent; + +/** + * + * @author sherkhan + */ +public class ProxyModel extends AbstractListModel implements BindingListModel { + + protected List<Data> _proxyDatas = new ArrayList<Data>(); + + @Override + public Object getElementAt(int index) { + return _proxyDatas.get(index); + } + + @Override + public int getSize() { + return _proxyDatas.size(); + } + + @Override + public int indexOf(Object obj) { + return _proxyDatas.indexOf(obj); + } + + public void setProxyDatas(List<Data> fieldExtensions) { + _proxyDatas = fieldExtensions; + fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); + } + + public void addData(Data newData) { + _proxyDatas.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, _proxyDatas.size() - 1, _proxyDatas.size() - 1); + } + + public void removeData(Data data) { + int interval = _proxyDatas.indexOf(data); + _proxyDatas.remove(data); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } + + public void reload() { + fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); + } +} Copied: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java (from rev 146, trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Controller.java) =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java (rev 0) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-24 15:57:55 UTC (rev 156) @@ -0,0 +1,139 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.nuiton.wikitty.ui; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.ListModel; +import org.zkoss.zul.Listbox; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +/** + * + * @author sherkhan + */ +public class WikittyController extends GenericForwardComposer { + + protected Model _model = new Model(); + protected List<WikittyExtension> _extensions = new ArrayList<WikittyExtension>(); + protected WikittyExtension _selectedExtension; + protected WikittyExtension _selectedNewExtension; + protected Listbox formListBox; + protected WikittyForm _wikittyForm = new WikittyForm(); + protected Listbox wikittiesListBox; + protected WikittyModel _wikittyModel = new WikittyModel(); + + public WikittyController() { + _extensions = _model.retrieveWikittyExtensions(); + } + + /* + * Events + */ + public void onClick$addNewInput() { + _wikittyForm.addNewInput(formListBox); + } + + public void onClick$deleteInput() { + _wikittyForm.deleteInput(formListBox); + } + + public void onClick$add() { + Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox); + _model.create(newWikitty); + } + + public void onClick$update() { + if (_wikittyForm.isSelected()) { + Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox); + _model.update(newWikitty); + } + } + + public void onClick$delete() { + Set<Listitem> items = wikittiesListBox.getSelectedItems(); + for (Listitem item : items) { + Wikitty wikitty = (Wikitty) item.getValue(); + _model.deleteWikittyById(wikitty.getId()); + _wikittyModel.removeData(wikitty); + } + wikittiesListBox.setSelectedIndex(0); + } + + public void onClick$addNewExtension() { + _wikittyForm.addExtension(_selectedNewExtension); + } + + /* + * Renderers + */ + public ListitemRenderer getWikittyRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + item.setLabel(((Wikitty) data).getId()); + } + }; + } + + /* + * Getters + */ + public List<WikittyExtension> getExtensions() { + return _extensions; + } + + public WikittyExtension getSelectedExtension() { + return _selectedExtension; + } + + public WikittyExtension getSelectedNewExtension() { + return _selectedNewExtension; + } + + public WikittyForm getWikittyForm() { + return _wikittyForm; + } + + public ListModel getWikittyModel() { + return _wikittyModel; + } + + public Wikitty getSelectedWikitty() { + return _wikittyForm.getWikitty(); + } + + /* + * Setters + */ + public void setSelectedExtension(WikittyExtension current) { + _wikittyForm.setHoldExtensions(current); + List<Wikitty> list = _model.retrieveWikittiesByExtensionName(current.getName()); + _wikittyModel.setWikitties(list); + } + + public void setSelectedNewExtension(WikittyExtension current) { + _selectedNewExtension = current; + } + + public void setSelectedWikitty(Wikitty current) { + _wikittyForm.setWikitty(current); + } + + private void debbug(String debug) { + throw new UnsupportedOperationException(debug); + } + + /* + * Methods + */ +} Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java 2010-06-24 14:13:27 UTC (rev 155) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java 2010-06-24 15:57:55 UTC (rev 156) @@ -46,6 +46,8 @@ for (Option o : Option.values()) { if (o.defaultValue != null) { setDefaultOption(o.key, o.defaultValue); + System.out.println("\nkey =====>" + o.key); + System.out.println("value =====>" + o.defaultValue); } } } @@ -54,8 +56,8 @@ if (instance == null) { try { instance = new WikittyZkConfig(); - instance.parse(new String[]{}); - instance.setDataDirInSystemProps(); + //instance.parse(new String[]{}); + // instance.setDataDirInSystemProps(); } catch (Exception e) { throw new UnhandledException(e); } @@ -100,6 +102,7 @@ } System.setProperty(Option.DATA_DIR.key, value); env.put(Option.DATA_DIR.key, value); + System.out.println(Option.DATA_DIR.key); } } Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-24 14:13:27 UTC (rev 155) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-24 15:57:55 UTC (rev 156) @@ -1,48 +1,53 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit"?> -<window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.Controller"> +<window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.LoginController"> + <groupbox> + <caption label="Database names" /> + <listbox multiple="true" id="dataList" rows="8" model="@{win$composer.proxyModel}" itemRenderer="@{win$composer.dataRenderer}" > - <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions, load-after='add.onClick, update.onClick'}" - selectedItem="@{win$composer.selectedExtension}"> - - <listhead> - <listheader label="Name" /> - <listheader label="Version" /> - </listhead> - - <listitem self="@{each='extension'}"> - <listcell label="@{extension.name}" /> - <listcell label="@{extension.version}" /> - </listitem> - </listbox> - - <groupbox> - <caption label="extensions" /> - <listbox id="formListBox" rows="10" model="@{win$composer.wikittyForm.formModel}" itemRenderer="@{win$composer.wikittyForm.fieldExtensionRenderer}"> <listhead sizable="true"> - <listheader label="Extension" /> - <listheader label="Type" /> - <listheader label="Content" /> + <listheader label="name" /> </listhead> - </listbox> - <button id="add" label="Add" width="36px" height="24px"/> - <button id="update" label="Update" width="46px" height="24px"/> - <button id="addNewInput" label="New input" width="56px" height="24px" /> - <button id="deleteInput" label="Delete input" width="56px" height="24px" /> - <listbox id="newExtension" rows="1" mold="select" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedNewExtension}"> - <listitem self="@{each='newExtension'}"> - <listcell label="@{newExtension.name}"/> - </listitem> </listbox> - <button id="addNewExtension" label="Add extension" width="66px" height="24px"/> + <button id="select" label="Select" width="36px" height="24px" /> + <button id="delete" label="Delete" width="36px" height="24px" /> </groupbox> <groupbox> - <caption label="wikitties" /> - <listbox id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> - </listbox> - <button id="delete" label="Delete" width="46px" height="24px"/> + <vbox> + <label value="Name" /> + <textbox id="Name"/> + <label value="DB" /> + <textbox id="Db" /> + <combobox id="driver"> + <comboitem label="org.h2.Driver" /> + <comboitem label="mySQL" /> + </combobox> + <label value="Solr" /> + <textbox id="Solr" /> + </vbox> + <vbox> + <label value="Login" /> + <textbox id="Login" /> + <label value="Password" /> + <textbox id="Password" /> + </vbox> + <button id="add" label="Add" width="36px" height="24px" /> </groupbox> + <groupbox> + <vbox> + <label value="Name" /> + <textbox id="distantName"/> + <label value="URL" /> + <textbox id="distantURL" /> + <label value="Login" /> + <textbox id="distantLogin"/> + <label value="Password" /> + <textbox id="distantPassword" /> + </vbox> + <button id="distantAdd" label="Add" width="36px" height="24px" /> + </groupbox> + </window> \ No newline at end of file Copied: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul (from rev 146, trunk/wikitty-ui-zk/src/main/webapp/index.zul) =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul (rev 0) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-24 15:57:55 UTC (rev 156) @@ -0,0 +1,48 @@ +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit"?> + +<window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.WikittyController"> + + <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions, load-after='add.onClick, update.onClick'}" + selectedItem="@{win$composer.selectedExtension}"> + + <listhead> + <listheader label="Name" /> + <listheader label="Version" /> + </listhead> + + <listitem self="@{each='extension'}"> + <listcell label="@{extension.name}" /> + <listcell label="@{extension.version}" /> + </listitem> + </listbox> + + <groupbox> + <caption label="wikitties" /> + <listbox id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> + </listbox> + <button id="delete" label="Delete" width="46px" height="24px"/> + </groupbox> + + <groupbox> + <caption label="extensions" /> + <listbox id="formListBox" rows="10" model="@{win$composer.wikittyForm.formModel}" itemRenderer="@{win$composer.wikittyForm.fieldExtensionRenderer}"> + <listhead sizable="true"> + <listheader label="Extension" /> + <listheader label="Type" /> + <listheader label="Content" /> + </listhead> + </listbox> + <button id="add" label="Add" width="36px" height="24px"/> + <button id="update" label="Update" width="46px" height="24px"/> + <button id="addNewInput" label="New input" width="56px" height="24px" /> + <button id="deleteInput" label="Delete input" width="56px" height="24px" /> + + <listbox id="newExtension" rows="1" mold="select" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedNewExtension}"> + <listitem self="@{each='newExtension'}"> + <listcell label="@{newExtension.name}"/> + </listitem> + </listbox> + <button id="addNewExtension" label="Add extension" width="66px" height="24px"/> + </groupbox> + +</window> \ No newline at end of file

1 0

r155 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: echatellier Date: 2010-06-24 16:13:27 +0200 (Thu, 24 Jun 2010) New Revision: 155 Url: http://nuiton.org/repositories/revision/wikitty/155 Log: Add some debug traces Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-06-24 14:13:02 UTC (rev 154) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-06-24 14:13:27 UTC (rev 155) @@ -22,6 +22,8 @@ import java.util.Map; import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Cette classe sert a introduire du cache dans wikitty. Elle sert a centraliser @@ -36,6 +38,8 @@ */ public class WikittyCache implements WikittyServiceListener { + static private Log log = LogFactory.getLog(WikittyCache.class); + protected Map<String, Wikitty> wikittyCache; /** @@ -86,7 +90,17 @@ if (old == null || WikittyUtil.versionGreaterThan(e.getVersion(), old.getVersion())) { wikittyCache.put(e.getId(), e); + + if (log.isTraceEnabled()) { + log.trace("Replace cached wikitty : new version " + e.getVersion() + + " > old version " + (old == null ? null : old.getVersion())); + } } + else { + if (log.isTraceEnabled()) { + log.trace("Ignoring putWikittyEvent : new version " + e.getVersion() + " < old version " + old.getVersion()); + } + } } /**

1 0

r154 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: echatellier Date: 2010-06-24 16:13:02 +0200 (Thu, 24 Jun 2010) New Revision: 154 Url: http://nuiton.org/repositories/revision/wikitty/154 Log: Take care of update reponse (on remote use, input wikitty parameters are not propagated) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-24 14:09:22 UTC (rev 153) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-24 14:13:02 UTC (rev 154) @@ -200,6 +200,8 @@ @Override public UpdateResponse store(String securityToken, Wikitty wikitty) { UpdateResponse updateResponse = ws.store(securityToken, wikitty); + // update wikitty + updateResponse.update(wikitty); // notify listeners firePutWikitty(wikitty); return updateResponse; @@ -208,6 +210,10 @@ @Override public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties) { UpdateResponse updateResponse = ws.store(securityToken, wikitties); + // update wikitty + for (Wikitty wikitty : wikitties) { + updateResponse.update(wikitty); + } // notify listeners firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()])); return updateResponse; @@ -218,6 +224,10 @@ boolean disableAutoVersionIncrement) { UpdateResponse updateResponse = ws.store( securityToken, wikitties, disableAutoVersionIncrement); + // update wikitty + for (Wikitty wikitty : wikitties) { + updateResponse.update(wikitty); + } // notify listeners firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()])); return updateResponse; @@ -228,6 +238,10 @@ Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { UpdateResponse updateResponse = ws.store(securityToken, transaction, wikitties, disableAutoVersionIncrement); + // update wikitty + for (Wikitty wikitty : wikitties) { + updateResponse.update(wikitty); + } // notify listeners firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()])); return updateResponse;

1 0

r153 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: echatellier Date: 2010-06-24 16:09:22 +0200 (Thu, 24 Jun 2010) New Revision: 153 Url: http://nuiton.org/repositories/revision/wikitty/153 Log: Restore old field type definition parsing (unique, not null). Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-23 16:17:59 UTC (rev 152) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-24 14:09:22 UTC (rev 153) @@ -96,13 +96,15 @@ * <li>group 1: type (string) * <li>group 2: name (string) * <li>group 3: lower bound (number) can be null - * <li>group 4: upper bound (number) can be null, mutualy exclusif with group 5 + * <li>group 4: upper bound (number) can be null, mutually exclusive with group 5 * <li>group 5: upper bound (n or *) can be null - * <li>group 6: all tag/value (toto=titi tutu=tata;lala tata="truc bidulle") + * <li>group 6: unique can be null (legacy configuration, prefer use of {@code unique="true"} + * <li>group 7: not null can be null (legacy configuration, prefer use of {@code notNull="true"} + * <li>group 8: all tag/value (toto=titi tutu=tata;lala tata="truc bidulle") */ static protected Pattern fieldPattern = Pattern .compile( - "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?((?:\\s+" + "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?(?:\\s+(unique))?(?:\\s+(not null))?((?:\\s+" + tagValuesPatternString + ")*)", Pattern.DOTALL); /** @@ -133,8 +135,22 @@ fieldType.upperBound = FieldType.NOLIMIT; } - String tagValues = match.group(6); + // parse group 8 before + String tagValues = match.group(8); Map<String, String> tagValuesMap = tagValuesToMap(tagValues); + + // legacy field definition : unique + String uniqueString = match.group(6); + if (uniqueString != null) { + tagValuesMap.put(FieldType.UNIQUE, "true"); + } + + // legacy field definition : not null + String notNullString = match.group(7); + if (notNullString != null) { + tagValuesMap.put(FieldType.NOT_NULL, "true"); + } + fieldType.setTagValues(tagValuesMap); return name;

1 0

r152 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 18:17:59 +0200 (Wed, 23 Jun 2010) New Revision: 152 Url: http://nuiton.org/repositories/revision/wikitty/152 Log: Fix unique contraints collection type used Set/List Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-23 15:55:51 UTC (rev 151) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-23 16:17:59 UTC (rev 152) @@ -448,7 +448,8 @@ } /** - * Create Wikitty from h2 tables + * Create Wikitty from jdbc tables. + * * @param id the id of the wikitty to restore * @param version the version of the wikitty to restore * @param extensionList the list of the extensions of the wikitty to restore @@ -531,8 +532,17 @@ // add fieldList in wikitty for (String fieldName : listFieldMap.keySet()) { Object[] array = listFieldMap.get(fieldName); - List list = new ArrayList(Arrays.asList(array)); - result.setFqField(fieldName, list ); + FieldType type = result.getFieldType(fieldName); + + // EC20100623 check this Set/List depending on unique constraints + if (type.isUnique()) { + Set set = new HashSet(Arrays.asList(array)); + result.setFqField(fieldName, set); + } + else { + List list = new ArrayList(Arrays.asList(array)); + result.setFqField(fieldName, list); + } } return result;

1 0

r151 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/conform
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 17:55:51 +0200 (Wed, 23 Jun 2010) New Revision: 151 Url: http://nuiton.org/repositories/revision/wikitty/151 Log: Fix notNull check and tests Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-23 14:59:56 UTC (rev 150) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-23 15:55:51 UTC (rev 151) @@ -136,7 +136,7 @@ for (String fieldName : ext.getFieldNames()) { FieldType type = ext.getFieldType(fieldName); if (type.isNotNull()) { - if (null == w.getFqField(fieldName)) { + if (null == w.getFieldAsObject(ext.getName(), fieldName)) { throw new WikittyException(String.format( "Field %s must not be null", fieldName)); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-23 14:59:56 UTC (rev 150) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-23 15:55:51 UTC (rev 151) @@ -158,9 +158,9 @@ public void testFieldConstraint() throws Exception { WikittyExtension ext = new WikittyExtension("TestConstraint", "1", null, WikittyUtil.buildFieldMapExtension( - "String id not null", - "String ext[0-n] unique", - "String other[0-n] unique not null" + "String id notNull=true", + "String ext[0-n] unique=true", + "String other[0-n] unique=true notNull=true" )); ws.storeExtension(null, Arrays.asList(ext));

1 0

r150 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: bpoussin Date: 2010-06-23 16:59:56 +0200 (Wed, 23 Jun 2010) New Revision: 150 Url: http://nuiton.org/repositories/revision/wikitty/150 Log: ajout de la methode notNull pour ajouter la contrainte Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-06-23 08:19:43 UTC (rev 149) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-06-23 14:59:56 UTC (rev 150) @@ -55,6 +55,11 @@ return this; } + public FieldFactory notNull() { + addTagValue(FieldType.NOT_NULL, "true"); + return this; + } + public FieldFactory addTagValue(String tag, String value) { tagValues.put(tag, value); return this;

1 0

r149 - trunk/wikitty-hessian-client
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 10:19:43 +0200 (Wed, 23 Jun 2010) New Revision: 149 Url: http://nuiton.org/repositories/revision/wikitty/149 Log: Set svn:ignore Modified: trunk/wikitty-hessian-client/ Property changes on: trunk/wikitty-hessian-client ___________________________________________________________________ Added: svn:ignore + .settings target .classpath .project

1 0

r148 - in trunk: . wikitty-hessian-client wikitty-hessian-client/src wikitty-hessian-client/src/main wikitty-hessian-client/src/main/java wikitty-hessian-client/src/main/java/org wikitty-hessian-client/src/main/java/org/wikitty wikitty-hessian-client/src/main/java/org/wikitty/hessian wikitty-hessian-client/src/test
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 10:13:18 +0200 (Wed, 23 Jun 2010) New Revision: 148 Url: http://nuiton.org/repositories/revision/wikitty/148 Log: Link wikitty-ui-zk to build. Add wikitty-hessian-client module and hessian dependency Added: trunk/wikitty-hessian-client/ trunk/wikitty-hessian-client/LICENSE.txt trunk/wikitty-hessian-client/README.txt trunk/wikitty-hessian-client/changelog.txt trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-client/src/ trunk/wikitty-hessian-client/src/main/ trunk/wikitty-hessian-client/src/main/java/ trunk/wikitty-hessian-client/src/main/java/org/ trunk/wikitty-hessian-client/src/main/java/org/wikitty/ trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/ trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java trunk/wikitty-hessian-client/src/test/ trunk/wikitty-hessian-client/src/test/java/ Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-23 08:11:37 UTC (rev 147) +++ trunk/pom.xml 2010-06-23 08:13:18 UTC (rev 148) @@ -26,7 +26,9 @@ <module>wikitty-jdbc-impl</module> <module>wikitty-multistorage-impl</module> <module>wikitty-jms-impl</module> -  + <module>wikitty-ui-zk</module> + <module>wikitty-hessian-client</module> +  </modules> <dependencyManagement> @@ -93,6 +95,13 @@ <version>1.6.0</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>3.1.5</version> + <scope>compile</scope> + </dependency>  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hessian-client</artifactId> + + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>3.1.5</version> + <scope>compile</scope> + </dependency> + </dependencies> + +  +  +  + + <name>Wikitty :: hessian client</name> + + <description>Wikitty hessian client</description> + <inceptionYear>2010</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + </properties> + + <build> + + </build> + +  +  +  + +</project> Added: trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java (rev 0) +++ trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java 2010-06-23 08:13:18 UTC (rev 148) @@ -0,0 +1,65 @@ +/* *##% + * Copyright (C) 2010 Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.wikitty.hessian; + +import java.net.MalformedURLException; + +import org.nuiton.wikitty.WikittyException; + +import com.caucho.hessian.client.HessianProxyFactory; + +/** + * Wikitty hessian client factory. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyHessianFactory { + + /** + * Get hessian service proxy on remove endpoint. + * + * @param <S> service type + * @param serviceInterface service interface + * @param serviceEndpoint service endpoint (full url) + * @return hessian proxy implementing {@code S} + * @throws WikittyException if hessian proxy can't be created + */ + public <S> S getService(Class<S> serviceInterface, String serviceEndpoint) throws WikittyException { + + HessianProxyFactory factory = new HessianProxyFactory(); + // Fix : com.caucho.hessian.io.HessianProtocolException: '��' is an unknown code + factory.setHessian2Request(true); + // pour que les méthodes aux noms dupliquées fonctionnent (arguments different) + factory.setOverloadEnabled(true); + + // service proxy + S hessianProxy; + try { + hessianProxy = (S)factory.create(serviceInterface, serviceEndpoint); + } catch (MalformedURLException eee) { + throw new WikittyException("Can't create hessian proxy", eee); + } + + return hessianProxy; + } +} Property changes on: trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r147 - trunk/wikitty-ui-zk
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 10:11:37 +0200 (Wed, 23 Jun 2010) New Revision: 147 Url: http://nuiton.org/repositories/revision/wikitty/147 Log: Set svn:ignore Modified: trunk/wikitty-ui-zk/ Property changes on: trunk/wikitty-ui-zk ___________________________________________________________________ Modified: svn:ignore - target + target .settings .classpath .project

1 0