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

r176 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 14:32:04 +0200 (Thu, 01 Jul 2010) New Revision: 176 Url: http://nuiton.org/repositories/revision/wikitty/176 Log: Utilisation de mavenpom4redmine 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-30 10:19:12 UTC (rev 175) +++ trunk/pom.xml 2010-07-01 12:32:04 UTC (rev 176) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2</version> </parent>

1 0

r175 - trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui
by bbrossaud＠users.nuiton.org 30 Jun '10

30 Jun '10

Author: bbrossaud Date: 2010-06-30 12:19:12 +0200 (Wed, 30 Jun 2010) New Revision: 175 Url: http://nuiton.org/repositories/revision/wikitty/175 Log: remove unused imports... Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-30 10:03:45 UTC (rev 174) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-30 10:19:12 UTC (rev 175) @@ -24,7 +24,6 @@ import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; -import org.zkoss.zul.Popup; import org.zkoss.zul.Textbox; import org.zkoss.zul.Window;

1 0

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

30 Jun '10

Author: bbrossaud Date: 2010-06-30 12:03:45 +0200 (Wed, 30 Jun 2010) New Revision: 174 Url: http://nuiton.org/repositories/revision/wikitty/174 Log: addition paging to the wikitty list Modified: trunk/wikitty-ui-zk/pom.xml trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java trunk/wikitty-ui-zk/src/main/webapp/index.zul trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/pom.xml 2010-06-30 10:03:45 UTC (rev 174) @@ -93,57 +93,21 @@ <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zk</artifactId> - <version>3.6.3</version> + <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> - <artifactId>zhtml</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zkex</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zkmax</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> <artifactId>zkplus</artifactId> - <version>3.6.3</version> + <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> - <artifactId>zml</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> <artifactId>zul</artifactId> - <version>3.6.3</version> + <version>5.0.2</version> </dependency> - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zuljsf</artifactId> - <version>0.8.1</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zuljsp</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies>  Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-30 10:03:45 UTC (rev 174) @@ -24,6 +24,7 @@ import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Popup; import org.zkoss.zul.Textbox; import org.zkoss.zul.Window; Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-30 10:03:45 UTC (rev 174) @@ -16,9 +16,9 @@ <label value="Password" /> <textbox id="selectPassword" /> </groupbox> - <button id="select" label="Select" width="36px" height="24px" /> - <button id="delete" label="Delete" width="36px" height="24px" /> - <button id="modify" label="Modify" width="36px" height="24px" /> + <button id="select" label="Select" height="24px" /> + <button id="delete" label="Delete" height="24px" /> + <button id="modify" label="Modify" height="24px" /> </groupbox> <groupbox> @@ -40,8 +40,8 @@ <label value="Password" /> <textbox id="password" /> </vbox> - <button id="add" label="Add" width="36px" height="24px" /> - <button id="update" label="Update" width="36px" height="24px" /> + <button id="add" label="Add" height="24px" /> + <button id="update" label="Update" height="24px" /> </groupbox> <groupbox> @@ -55,8 +55,8 @@ <label value="Password" /> <textbox id="distantPassword" /> </vbox> - <button id="distantAdd" label="Add" width="36px" height="24px" /> - <button id="distantUpdate" label="Update" width="36px" height="24px" /> + <button id="distantAdd" label="Add" height="24px" /> + <button id="distantUpdate" label="Update" height="24px" /> </groupbox> </window> \ No newline at end of file Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-30 10:03:45 UTC (rev 174) @@ -4,7 +4,7 @@ Search: <textbox id="Search" /> <toolbarbutton id="home" label="Select another proxy"/> - <listbox id="extensionListBox" rows="8" model="@{win$composer.extensions}" + <listbox autopaging="true" mold="paging" id="extensionListBox" rows="5" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedExtension}"> <listhead> @@ -20,36 +20,35 @@ </listbox> <groupbox> - <caption label="wikitties" /> - <listbox multiple="true" id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> + <listbox autopaging="true" mold="paging" id="wikittiesListBox" multiple="true" rows="10" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> <listhead sizable="true"> <listheader label="ID" /> <listheader label="Extensions" /> </listhead> </listbox> - <button id="delete" label="Delete" width="46px" height="24px"/> + <button id="delete" label="Delete" height="24px"/> </groupbox> <groupbox> <caption label="extensions" /> - <listbox id="formListBox" rows="10" model="@{win$composer.wikittyForm.formModel}" itemRenderer="@{win$composer.wikittyForm.fieldExtensionRenderer}"> + <listbox id="formListBox" model="@{win$composer.wikittyForm.formModel}" rows="7" 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" /> + <button id="add" label="Add" height="24px"/> + <button id="update" label="Update" height="24px"/> + <button id="addNewInput" label="New input" height="24px" /> + <button id="deleteInput" label="Delete input" 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="addNewExtension" label="Add extension" height="24px" /> </groupbox> </window> \ No newline at end of file

1 0

29 Jun '10

Author: echatellier Date: 2010-06-29 18:47:37 +0200 (Tue, 29 Jun 2010) New Revision: 173 Url: http://nuiton.org/repositories/revision/wikitty/173 Log: Add hessian server webapp (first draft) Added: trunk/src/site/rst/hessian.rst trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java trunk/wikitty-hessian-server/ trunk/wikitty-hessian-server/LICENSE.txt trunk/wikitty-hessian-server/README.txt trunk/wikitty-hessian-server/changelog.txt trunk/wikitty-hessian-server/pom.xml trunk/wikitty-hessian-server/src/ trunk/wikitty-hessian-server/src/main/ trunk/wikitty-hessian-server/src/main/java/ trunk/wikitty-hessian-server/src/main/java/org/ trunk/wikitty-hessian-server/src/main/java/org/nuiton/ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java trunk/wikitty-hessian-server/src/main/webapp/ trunk/wikitty-hessian-server/src/main/webapp/WEB-INF/ trunk/wikitty-hessian-server/src/main/webapp/WEB-INF/web.xml trunk/wikitty-hessian-server/src/main/webapp/index.jsp trunk/wikitty-hessian-server/src/test/ trunk/wikitty-hessian-server/src/test/java/ Modified: trunk/pom.xml trunk/src/site/site.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-29 15:03:14 UTC (rev 172) +++ trunk/pom.xml 2010-06-29 16:47:37 UTC (rev 173) @@ -28,7 +28,7 @@ <module>wikitty-jms-impl</module> <module>wikitty-ui-zk</module> <module>wikitty-hessian-client</module> -  + <module>wikitty-hessian-server</module> </modules> <dependencyManagement> Added: trunk/src/site/rst/hessian.rst =================================================================== --- trunk/src/site/rst/hessian.rst (rev 0) +++ trunk/src/site/rst/hessian.rst 2010-06-29 16:47:37 UTC (rev 173) @@ -0,0 +1,69 @@ +Hessian +======= + +Wikitty fournit de base les modules nécéssaires à une utilisation de type +client serveur basé sur hessian. + +Il est composé : + * d'une application war qui, en lisant une configuration, est capable de + fournir un service sur n'importe quel type de stockage wikitty + * d'une factory revoyant un proxy sur un service distant + +Serveur +------- + +Le serveur est disponible sous forme d'une application web (war) prete à +l'emploi. Vous pouvez la télécharger à l'adresse suivante : +http://www.nuiton.org/projects/list_files/wikitty + +Par défaut, cette application web se base sur le fichier de configuration +``/etc/wikitty-hessian.properties`` (sous linux). Ce fichier de configuration +contient 3 options de configuration spécifique à hessian: + + * wikitty.hessian.usecache : ajout du cache + * wikitty.hessian.usenotification : ajout de la notification + * wikitty.hessian.usesecurity : ajout de la securité + +Ensuite, le fichier de configuration contient la configuration specifique +à l'implementation du stockage à utiliser. + +Voici un exemple de configuration:: + + # security + wikitty.hessian.usesecurity=true + wikitty.service.login=xxxx + wikitty.service.password=zzzz + + # notification + wikitty.hessian.usenotification=true + wikitty.service.event.jgroupschannelname=myjgroupchannel + wikitty.service.event.propagateEvent=false + + # cache + wikitty.hessian.usecache=true + wikitty.service.cache.listenevents=true + + # jdbc configuration + jdbc.con.driver=org.h2.Driver + jdbc.con.host=jdbc:h2:file:/var/lib/myapp/h2db + jdbc.con.userName=sa + jdbc.con.password= + + # solr configuration + solr.data.dir=/var/lib/myapp/solr + +L'application est ensuite accessible sur l'uri "/wikitty" suivant le contexte +de déploiement. +Par exemple : http://localhost:8080/myapp/wikitty + +Client +------ + +L'interface sur le service s'obtient en utilisant la factory disponible +dans le modules ``wikitty-hessian-client``. + +Example:: + + WikittyService service = getWikittyService("http://localhost/wikitty"); + +Le ``service`` s'utilise ensuite comme un service local. \ No newline at end of file Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-06-29 15:03:14 UTC (rev 172) +++ trunk/src/site/site.xml 2010-06-29 16:47:37 UTC (rev 173) @@ -12,6 +12,7 @@ <menu name="Overview"> <item name="Accueil" href="index.html"/> <item name="Migration" href="migration.html"/> + <item name="Hessian" href="hessian.html"/> <item name="GWT problem" href="gwt.html"/> <item name="TODO" href="todo.html"/> </menu> Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-06-29 16:47:37 UTC (rev 173) @@ -0,0 +1,283 @@ +/* *##% + * 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.nuiton.wikitty; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.Tree; +import org.nuiton.wikitty.TreeNode; +import org.nuiton.wikitty.UpdateResponse; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceListener; +import org.nuiton.wikitty.WikittyTransaction; + +/** + * Wikitty service delegator. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyServiceDelegator implements WikittyService { + + /** Delegated wikitty service. */ + protected WikittyService delegate; + + /** + * Get delegated service. + * + * @return delegate service + */ + public WikittyService getDelegate() { + return delegate; + } + + /** + * Set delegated service. + * + * @param delegate delegate + */ + public void setDelegate(WikittyService delegate) { + this.delegate = delegate; + } + + @Override + public void addWikittyServiceListener(WikittyServiceListener listener, + ServiceListenerType type) { + delegate.addWikittyServiceListener(listener, type); + } + + @Override + public void removeWikittyServiceListener(WikittyServiceListener listener, + ServiceListenerType type) { + delegate.removeWikittyServiceListener(listener, type); + } + + @Override + public String login(String login, String password) { + return delegate.login(login, password); + } + + @Override + public void logout(String securityToken) { + delegate.logout(securityToken); + } + + @Override + public void clear(String securityToken) { + delegate.clear(securityToken); + } + + @Override + public UpdateResponse store(String securityToken, Wikitty wikitty) { + return delegate.store(securityToken, wikitty); + } + + @Override + public UpdateResponse store(String securityToken, + Collection<Wikitty> wikitties) { + return delegate.store(securityToken, wikitties); + } + + @Override + public UpdateResponse store(String securityToken, + Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + return delegate.store(securityToken, wikitties, + disableAutoVersionIncrement); + } + + @Override + public UpdateResponse store(String securityToken, + WikittyTransaction transaction, Collection<Wikitty> wikitties, + boolean disableAutoVersionIncrement) { + return delegate.store(securityToken, transaction, wikitties, + disableAutoVersionIncrement); + } + + @Override + public List<String> getAllExtensionIds(String securityToken) { + return delegate.getAllExtensionIds(securityToken); + } + + @Override + public List<String> getAllExtensionsRequires(String securityToken, + String extensionName) { + return delegate.getAllExtensionsRequires(securityToken, extensionName); + } + + @Override + public UpdateResponse storeExtension(String securityToken, + WikittyExtension ext) { + return delegate.storeExtension(securityToken, ext); + } + + @Override + public UpdateResponse storeExtension(String securityToken, + Collection<WikittyExtension> exts) { + return delegate.storeExtension(securityToken, exts); + } + + @Override + public UpdateResponse storeExtension(String securityToken, + WikittyTransaction transaction, Collection<WikittyExtension> exts) { + return delegate.storeExtension(securityToken, transaction, exts); + } + + @Override + public WikittyExtension restoreExtension(String securityToken, String id) { + return delegate.restoreExtension(securityToken, id); + } + + @Override + public WikittyExtension restoreExtension(String securityToken, + WikittyTransaction transaction, String id) { + return delegate.restoreExtension(securityToken, transaction, id); + } + + @Override + public WikittyExtension restoreExtensionLastVersion(String securityToken, + String name) { + return delegate.restoreExtensionLastVersion(securityToken, name); + } + + @Override + public WikittyExtension restoreExtensionLastVersion(String securityToken, + WikittyTransaction transaction, String name) { + return delegate.restoreExtensionLastVersion(securityToken, transaction, + name); + } + + @Override + public Wikitty restore(String securityToken, String id) { + return delegate.restore(securityToken, id); + } + + @Override + public List<Wikitty> restore(String securityToken, List<String> id) { + return delegate.restore(securityToken, id); + } + + @Override + public List<Wikitty> restore(String securityToken, WikittyTransaction transaction, List<String> id) { + return delegate.restore(securityToken, transaction, id); + } + + @Override + public void delete(String securityToken, String id) { + delegate.delete(securityToken, id); + } + + @Override + public void delete(String securityToken, Collection<String> ids) { + delegate.delete(securityToken, ids); + } + + @Override + public PagedResult<String> findAllByCriteria(String securityToken, + Criteria criteria) { + return delegate.findAllByCriteria(securityToken, criteria); + } + + @Override + public PagedResult<String> findAllByCriteria(String securityToken, + WikittyTransaction transaction, Criteria criteria) { + return delegate.findAllByCriteria(securityToken, transaction, criteria); + } + + @Override + public Wikitty findByCriteria(String securityToken, Criteria criteria) { + return delegate.findByCriteria(securityToken, criteria); + } + + @Override + public void addLabel(String securityToken, String wikittyId, String label) { + delegate.addLabel(securityToken, wikittyId, label); + } + + @Override + public PagedResult<String> findAllByLabel(String securityToken, + String label, int firstIndex, int endIndex) { + return delegate.findAllByLabel(securityToken, label, firstIndex, + endIndex); + } + + @Override + public Wikitty findByLabel(String securityToken, String label) { + return delegate.findByLabel(securityToken, label); + } + + @Override + public Set<String> findAllAppliedLabels(String securityToken, + String wikittyId) { + return delegate.findAllAppliedLabels(securityToken, wikittyId); + } + + @Override + public Tree restoreTree(String securityToken, String wikittyId) { + return delegate.restoreTree(securityToken, wikittyId); + } + + @Override + public Entry<TreeNode, Integer> restoreNode(String securityToken, + String wikittyId, Criteria filter) { + return delegate.restoreNode(securityToken, wikittyId, filter); + } + + @Override + public Map<TreeNode, Integer> restoreChildren(String securityToken, + String wikittyId, Criteria filter) { + return delegate.restoreChildren(securityToken, wikittyId, filter); + } + + @Override + public Wikitty restoreVersion(String securityToken, String wikittyId, + String version) { + return delegate.restoreVersion(securityToken, wikittyId, version); + } + + @Override + public UpdateResponse syncEngin(String securityToken) { + return delegate.syncEngin(securityToken); + } + + @Override + public boolean canWrite(String securityToken, Wikitty wikitty) { + return delegate.canWrite(securityToken, wikitty); + } + + @Override + public boolean canDelete(String securityToken, String wikittyId) { + return delegate.canDelete(securityToken, wikittyId); + } + + @Override + public boolean canRead(String securityToken, String wikittyId) { + return delegate.canRead(securityToken, wikittyId); + } +} Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml (rev 0) +++ trunk/wikitty-hessian-server/pom.xml 2010-06-29 16:47:37 UTC (rev 173) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hessian-server</artifactId> + + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-multistorage-impl</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</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 server</name> + + <description>Wikitty hessian server</description> + <inceptionYear>2010</inceptionYear> + +  +  +  + + <packaging>war</packaging> + + <properties> + + </properties> + + <build> + + </build> + +  +  +  + +</project> Added: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java =================================================================== --- trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java (rev 0) +++ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java 2010-06-29 16:47:37 UTC (rev 173) @@ -0,0 +1,105 @@ +/* *##% + * 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.nuiton.wikitty.hessian; + +import java.lang.reflect.Method; +import java.util.Properties; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittySearchEngin; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceCached; +import org.nuiton.wikitty.WikittyServiceDelegator; +import org.nuiton.wikitty.WikittyServiceImpl; +import org.nuiton.wikitty.WikittyServiceNotifier; +import org.nuiton.wikitty.WikittyServiceSecurity; +import org.nuiton.wikitty.WikittyStorage; +import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; +import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; +import org.nuiton.wikitty.solr.WikittySearchEnginSolr; + +/** + * Hesian service delegator. + * + * Based on empty constructor mandatory for some purpose (hessian), and + * wikitty service factory to get delegated service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyServiceHessianDelegator extends WikittyServiceDelegator { + + /** Configuration file name for application config. */ + protected static final String WIKITTY_HESSIAN_CONFIGURATION_FILE = "wikitty-hessian.properties"; + + /** + * Unique empty constructor. + * + * @throws WikittyException if delegated service can't be obtained + */ + public WikittyServiceHessianDelegator() throws WikittyException { + + super(); + + try { + // load configuration + ApplicationConfig config = new ApplicationConfig(); + config.setConfigFileName(WIKITTY_HESSIAN_CONFIGURATION_FILE); + config.parse(new String[0]); + + // get configuration as properties + Properties properties = config.getFlatOptions(); + + // make impl instance of wikitty service + WikittyExtensionStorage extensionStorage = new WikittyExtensionStorageJDBC(properties); + WikittyStorage wikittyStorage = new WikittyStorageJDBC(extensionStorage, properties); + WikittySearchEngin searchEngin = new WikittySearchEnginSolr(extensionStorage, properties); + + // make the chosen one IMPL + WikittyService service = new WikittyServiceImpl(extensionStorage, wikittyStorage, searchEngin); + + // add security + if (config.getOptionAsBoolean("wikitty.hessian.usesecurity")) { + service = new WikittyServiceSecurity(service); + } + + // add cache ? + if (config.getOptionAsBoolean("wikitty.hessian.usecache")) { + service = new WikittyServiceCached(service, properties); + } + + // add notification + if (config.getOptionAsBoolean("wikitty.hessian.usenotification")) { + service = new WikittyServiceNotifier(service, properties); + } + + // set delegate service + setDelegate(service); + } + catch (Exception eee) { + throw new WikittyException("Can't get delegate proxy", eee); + } + + } +} Property changes on: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-hessian-server/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wikitty-hessian-server/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/wikitty-hessian-server/src/main/webapp/WEB-INF/web.xml 2010-06-29 16:47:37 UTC (rev 173) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" 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_2_5.xsd"> + + <display-name>Wikitty</display-name> + + <servlet> + <servlet-name>wikittyServiceServlet</servlet-name> + <servlet-class>com.caucho.hessian.server.HessianServlet</servlet-class> + <init-param> + <param-name>home-api</param-name> + <param-value>org.nuiton.wikitty.WikittyService</param-value> + </init-param> + <init-param> + <param-name>home-class</param-name> + <param-value>org.nuiton.wikitty.hessian.WikittyServiceHessianDelegator</param-value> + </init-param> + <load-on-startup>2</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>wikittyServiceServlet</servlet-name> + <url-pattern>/wikitty</url-pattern> + </servlet-mapping> + +</web-app> Added: trunk/wikitty-hessian-server/src/main/webapp/index.jsp =================================================================== --- trunk/wikitty-hessian-server/src/main/webapp/index.jsp (rev 0) +++ trunk/wikitty-hessian-server/src/main/webapp/index.jsp 2010-06-29 16:47:37 UTC (rev 173) @@ -0,0 +1,11 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>Vradi services</title> + </head> + <body> + Wikiity service is running... + </body> +</html> \ No newline at end of file

1 0

r172 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by echatellier＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: echatellier Date: 2010-06-29 17:03:14 +0200 (Tue, 29 Jun 2010) New Revision: 172 Url: http://nuiton.org/repositories/revision/wikitty/172 Log: Add new constructor with properties (unused for now) Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-29 14:41:57 UTC (rev 171) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-29 15:03:14 UTC (rev 172) @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import org.apache.commons.logging.Log; @@ -42,7 +43,9 @@ import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.FacetTopic; import org.nuiton.wikitty.FieldType; +import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.TreeNode; import org.nuiton.wikitty.UpdateResponse; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; @@ -50,10 +53,8 @@ import org.nuiton.wikitty.WikittyExtensionStorage; import org.nuiton.wikitty.WikittySearchEngin; import org.nuiton.wikitty.WikittyTransaction; -import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.TreeNode; import com.arjuna.ats.arjuna.coordinator.BasicAction; import com.arjuna.ats.arjuna.coordinator.OnePhaseResource; @@ -447,7 +448,22 @@ /** JTA resource */ protected SolrResource solrResource; + /** + * Init wikitty search engin on solr embedded server. + * + * @param extensionStorage extension storage + */ public WikittySearchEnginSolr(WikittyExtensionStorage extensionStorage) { + this(extensionStorage, null); + } + + /** + * Init wikitty search engin on solr embedded server. + * + * @param extensionStorage extension storage + * @param properties properties (can be null) + */ + public WikittySearchEnginSolr(WikittyExtensionStorage extensionStorage, Properties properties) { try { CoreContainer.Initializer initializer = new CoreContainer.Initializer(); CoreContainer coreContainer = initializer.initialize();

1 0

r171 - trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui
by bbrossaud＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: bbrossaud Date: 2010-06-29 16:41:57 +0200 (Tue, 29 Jun 2010) New Revision: 171 Url: http://nuiton.org/repositories/revision/wikitty/171 Log: refresh the search page after an item addition Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 14:12:18 UTC (rev 170) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 14:41:57 UTC (rev 171) @@ -77,6 +77,7 @@ if (search != null && !search.isEmpty()) { List<Wikitty> wikitties = _model.retrieveWikittiesByKeyword(search); _wikittyModel.setWikitties(wikitties); + _selectedExtension = null; } } @@ -94,6 +95,8 @@ if (_selectedExtension != null) { List<Wikitty> list = _model.retrieveWikittiesByExtensionName(_selectedExtension.getName()); _wikittyModel.setWikitties(list); + } else { + onOK$Search(); } }

1 0

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

29 Jun '10

Author: bbrossaud Date: 2010-06-29 16:12:18 +0200 (Tue, 29 Jun 2010) New Revision: 170 Url: http://nuiton.org/repositories/revision/wikitty/170 Log: refresh the list when CRUD and multiple-selection works Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 13:59:21 UTC (rev 169) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 14:12:18 UTC (rev 170) @@ -35,7 +35,7 @@ protected Model _model = null; protected List<WikittyExtension> _extensions = new ArrayList<WikittyExtension>(); - protected WikittyExtension _selectedExtension; + protected WikittyExtension _selectedExtension = null; protected WikittyExtension _selectedNewExtension; protected Listbox formListBox; protected WikittyForm _wikittyForm = new WikittyForm(); @@ -89,19 +89,24 @@ } public void onClick$add() { - Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox); + Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox, new Wikitty()); _model.create(newWikitty); + if (_selectedExtension != null) { + List<Wikitty> list = _model.retrieveWikittiesByExtensionName(_selectedExtension.getName()); + _wikittyModel.setWikitties(list); + } } public void onClick$update() { if (_wikittyForm.isSelected()) { - Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox); + Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox, null); _model.update(newWikitty); } } public void onClick$delete() { - Set<Listitem> items = wikittiesListBox.getSelectedItems(); + Set<Listitem> set = wikittiesListBox.getSelectedItems(); + List<Listitem> items = new ArrayList<Listitem>(set); for (Listitem item : items) { Wikitty wikitty = (Wikitty) item.getValue(); _model.deleteWikittyById(wikitty.getId()); @@ -191,6 +196,7 @@ * Setters */ public void setSelectedExtension(WikittyExtension current) { + _selectedExtension = current; _wikittyForm.setHoldExtensions(current); List<Wikitty> list = _model.retrieveWikittiesByExtensionName(current.getName()); _wikittyModel.setWikitties(list); Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java 2010-06-29 13:59:21 UTC (rev 169) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java 2010-06-29 14:12:18 UTC (rev 170) @@ -178,12 +178,9 @@ return booleans; } - public Wikitty retriveWikittyInForm(Listbox formListBox) { - Wikitty newWikitty = null; - if (_wikitty != null) { + public Wikitty retriveWikittyInForm(Listbox formListBox, Wikitty newWikitty) { + if (newWikitty == null) { newWikitty = _wikitty; - } else { - newWikitty = new Wikitty(); } newWikitty.addExtension(_holdExtensions); List<Listitem> items = formListBox.getItems(); Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-29 13:59:21 UTC (rev 169) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-29 14:12:18 UTC (rev 170) @@ -4,7 +4,7 @@ Search: <textbox id="Search" /> <toolbarbutton id="home" label="Select another proxy"/> - <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions}" + <listbox id="extensionListBox" rows="8" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedExtension}"> <listhead> @@ -21,7 +21,7 @@ <groupbox> <caption label="wikitties" /> - <listbox id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> + <listbox multiple="true" id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> <listhead sizable="true"> <listheader label="ID" /> <listheader label="Extensions" />

1 0

r169 - trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian
by echatellier＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: echatellier Date: 2010-06-29 15:59:21 +0200 (Tue, 29 Jun 2010) New Revision: 169 Url: http://nuiton.org/repositories/revision/wikitty/169 Log: Add method to create a hessian proxy on a remote WikittyService Modified: trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java Modified: trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java 2010-06-29 13:50:57 UTC (rev 168) +++ trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java 2010-06-29 13:59:21 UTC (rev 169) @@ -21,6 +21,7 @@ import java.net.MalformedURLException; import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyService; import com.caucho.hessian.client.HessianProxyFactory; @@ -36,6 +37,17 @@ public class WikittyHessianFactory { /** + * Get hessian wikitty service proxy on remove endpoint. + * + * @param serviceEndpoint service endpoint (full url) + * @return hessian proxy implementing {@code WikittyService} + * @throws WikittyException if hessian proxy can't be created + */ + public static WikittyService getWikittyService(String serviceEndpoint) throws WikittyException { + return getService(WikittyService.class, serviceEndpoint); + } + + /** * Get hessian service proxy on remove endpoint. * * @param <S> service type @@ -44,7 +56,7 @@ * @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 { + public static <S> S getService(Class<S> serviceInterface, String serviceEndpoint) throws WikittyException { HessianProxyFactory factory = new HessianProxyFactory(); // Fix : com.caucho.hessian.io.HessianProtocolException: '��' is an unknown code

1 0

r168 - trunk/src/site/rst
by echatellier＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: echatellier Date: 2010-06-29 15:50:57 +0200 (Tue, 29 Jun 2010) New Revision: 168 Url: http://nuiton.org/repositories/revision/wikitty/168 Log: Add main doc Modified: trunk/src/site/rst/index.rst Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-06-29 13:33:59 UTC (rev 167) +++ trunk/src/site/rst/index.rst 2010-06-29 13:50:57 UTC (rev 168) @@ -1,2 +1,4 @@ Wikitty ======= + +Wikitty est un système de stockage et de recherche de type clé/valeur.

1 0

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

29 Jun '10

Author: bbrossaud Date: 2010-06-29 15:33:59 +0200 (Tue, 29 Jun 2010) New Revision: 167 Url: http://nuiton.org/repositories/revision/wikitty/167 Log: remove bugs Modified: 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/WikittyController.java trunk/wikitty-ui-zk/src/main/webapp/index.zul trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul Modified: 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 2010-06-29 13:14:14 UTC (rev 166) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java 2010-06-29 13:33:59 UTC (rev 167) @@ -95,6 +95,16 @@ _driver = driver; } + public void setAll(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); + } + /* * Getters */ Modified: 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 2010-06-29 13:14:14 UTC (rev 166) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java 2010-06-29 13:33:59 UTC (rev 167) @@ -22,6 +22,7 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Sessions; import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Groupbox; @@ -45,7 +46,6 @@ protected Listbox dataList; protected ApplicationConfig _config = new ApplicationConfig(); protected Properties _properties = new Properties(); - protected Window win; public LoginController() throws IOException { initConfig(); @@ -60,6 +60,7 @@ Window window = (Window) comp; Groupbox box = (Groupbox) window.getFellow("loginPassword"); box.setVisible(false); + disableUpdateButtons(); } public void initConfig() { @@ -71,6 +72,31 @@ } } + protected void disableUpdateButtons() { + Button update = (Button) self.getFellow("update"); + if (update.isDisabled() == false) { + update.setDisabled(true); + } + update = (Button) self.getFellow("distantUpdate"); + if (!update.isDisabled()) { + update.setDisabled(true); + } + } + + protected void enableLocalUpdateButton() { + Button update = (Button) self.getFellow("update"); + if (update.isDisabled()) { + update.setDisabled(false); + } + } + + protected void enableDistantUpdateButton() { + Button update = (Button) self.getFellow("distantUpdate"); + if (update.isDisabled()) { + update.setDisabled(false); + } + } + protected void saveNewData(Data data) throws FileNotFoundException, IOException { String name = ""; String path = ""; @@ -106,6 +132,29 @@ createProxyDatas(); } + protected void saveUpdateData(Data data) throws IOException { + String path = data.getPath(); + _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); + } + saveProperties(); + createProxyDatas(); + } + protected void loadProperties() throws IOException { String filePath = _config.getOption("wikitty-ui-zk.filePath"); File file = new File(filePath); @@ -174,11 +223,15 @@ } } - protected WikittyProxy createProxy(Properties properties, String login, String password) { + protected WikittyProxy createLocalProxy(Properties properties, String login, String password) { WikittyProxy proxy = new WikittyProxy(); - WikittyService ws = new WikittyServiceJDBC(properties); - ws = new WikittyServiceCached(ws); - proxy.setWikittyService(ws); + try { + WikittyService ws = new WikittyServiceJDBC(properties); + ws = new WikittyServiceCached(ws); + proxy.setWikittyService(ws); + } catch (Exception eee) { + return null; + } if (!login.isEmpty()) { proxy.login(login, password); } @@ -193,25 +246,54 @@ protected void fillDistantProxy(Data data) { ((Textbox) this.self.getFellow("distantName")).setValue(data.getName()); ((Textbox) this.self.getFellow("distantURL")).setValue(data.getUrl()); + enableDistantUpdateButton(); } protected void fillLocalProxy(Data data) { - ((Textbox) this.self.getFellow("Name")).setValue(data.getName()); - ((Textbox) this.self.getFellow("Solr")).setValue(data.getSolr()); - ((Textbox) this.self.getFellow("Db")).setValue(data.getDb()); + ((Textbox) this.self.getFellow("name")).setValue(data.getName()); + ((Textbox) this.self.getFellow("solr")).setValue(data.getSolr()); + ((Textbox) this.self.getFellow("db")).setValue(data.getDb()); ((Combobox) this.self.getFellow("driver")).setValue(data.getDriver()); + enableLocalUpdateButton(); } + protected void clearAllLocalFields() { + Textbox input = (Textbox) self.getFellow("name"); + input.setValue(""); + input = (Textbox) self.getFellow("solr"); + input.setValue(""); + input = (Textbox) self.getFellow("db"); + input.setValue(""); + input = (Textbox) self.getFellow("login"); + input.setValue(""); + input = (Textbox) self.getFellow("password"); + input.setValue(""); + Combobox box = (Combobox) self.getFellow("driver"); + box.setText(null); + } + + protected void clearAllDistantFields() { + Textbox input = (Textbox) self.getFellow("distantName"); + input.setValue(""); + input = (Textbox) self.getFellow("distantURL"); + input.setValue(""); + input = (Textbox) self.getFellow("distantLogin"); + input.setValue(""); + input = (Textbox) self.getFellow("distantPassword"); + input.setValue(""); + } + /* * Events */ public void onSelect$dataList() { Listitem item = dataList.getSelectedItem(); if (item != null) { + disableUpdateButtons(); Data data = (Data) item.getValue(); String login = data.getLogin(); String password = data.getPassword(); - Groupbox box = (Groupbox) win.getFellow("loginPassword"); + Groupbox box = (Groupbox) this.self.getFellow("loginPassword"); if (box != null) { if (!password.isEmpty() && !login.isEmpty()) { box.setVisible(true); @@ -223,6 +305,8 @@ box.setVisible(false); } } + clearAllDistantFields(); + clearAllLocalFields(); } } @@ -239,39 +323,71 @@ } } + public void onClick$update() throws IOException { + Listitem item = dataList.getSelectedItem(); + if (item != null) { + Data data = (Data) item.getValue(); + String name = ((Textbox) this.self.getFellow("name")).getValue(); + String db = ((Textbox) this.self.getFellow("db")).getValue(); + String solr = ((Textbox) this.self.getFellow("solr")).getValue(); + Combobox box = (Combobox) this.self.getFellow("driver"); + String driver = ""; + Comboitem boit = box.getSelectedItem(); + if (boit != null) { + driver = boit.getLabel(); + } + if (!name.isEmpty() && !db.isEmpty() && !solr.isEmpty() && !driver.isEmpty()) { + data.setAll(name, db, driver, solr, null, data.getLogin(), data.getPassword()); + saveUpdateData(data); + disableUpdateButtons(); + } + } + } + + public void onClick$distantUpdate() throws IOException { + Listitem item = dataList.getSelectedItem(); + if (item != null) { + Data data = (Data) item.getValue(); + String name = ((Textbox) this.self.getFellow("distantName")).getValue(); + String URL = ((Textbox) this.self.getFellow("distantURL")).getValue(); + if (!name.isEmpty() && !URL.isEmpty()) { + data.setAll(name, null, null, null, URL, data.getLogin(), data.getPassword()); + saveUpdateData(data); + disableUpdateButtons(); + } + } + } + public void onClick$select() throws ArgumentsParserException { Listitem item = dataList.getSelectedItem(); if (item != null) { Data data = (Data) item.getValue(); - String login = ((Textbox) win.getFellow("selectLogin")).getValue(); - String password = ((Textbox) win.getFellow("selectPassword")).getValue(); + String login = ((Textbox) this.self.getFellow("selectLogin")).getValue(); + String password = ((Textbox) this.self.getFellow("selectPassword")).getValue(); if (data.hasLoginPassword()) { if (!login.equals(data.getLogin()) || !password.equals(password)) { return; } } - ApplicationConfig config = new ApplicationConfig(); - config.parse(new String[]{}); - Properties properties = config.getFlatOptions(); - properties.setProperty("solr.data.dir", data.getSolr()); - properties.setProperty("jdbc.con.driver", data.getDriver()); - properties.setProperty("jdbc.con.host", data.getDb()); - properties.setProperty("jdbc.con.userName", "sa"); - properties.setProperty("jdbc.con.password", ""); - System.setProperty("solr.data.dir", data.getSolr()); - WikittyProxy proxy = createProxy(properties, login, password); - goToWikittyPage(proxy); + WikittyProxy proxy = null; + if (data.getUrl().isEmpty()) { + Properties properties = getLocalProperties(data); + proxy = createLocalProxy(properties, login, password); + } + if (proxy != null) { + goToWikittyPage(proxy); + } } } 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 name = ((Textbox) this.self.getFellow("name")).getValue(); + String db = ((Textbox) this.self.getFellow("db")).getValue(); + String solr = ((Textbox) this.self.getFellow("solr")).getValue(); + String login = ((Textbox) this.self.getFellow("login")).getValue(); + String password = ((Textbox) this.self.getFellow("password")).getValue(); String driver = ""; - Combobox box = (Combobox) win.getFellow("driver"); + Combobox box = (Combobox) this.self.getFellow("driver"); Comboitem item = box.getSelectedItem(); if (item != null) { driver = item.getLabel(); @@ -282,6 +398,17 @@ } } + public void onClick$distantAdd() throws FileNotFoundException, IOException { + String name = ((Textbox) this.self.getFellow("distantName")).getValue(); + String URL = ((Textbox) this.self.getFellow("distantURL")).getValue(); + String login = ((Textbox) this.self.getFellow("distantLogin")).getValue(); + String password = ((Textbox) this.self.getFellow("distantPassword")).getValue(); + if (!name.isEmpty() && !URL.isEmpty()) { + Data data = new Data(name, null, null, null, URL, login, password); + saveNewData(data); + } + } + public void onClick$delete() throws IOException { Set<Listitem> set = dataList.getSelectedItems(); List<Listitem> items = new ArrayList<Listitem>(set); @@ -292,6 +419,7 @@ _proxyModel.removeData(data); } saveProperties(); + disableUpdateButtons(); } } @@ -304,10 +432,15 @@ @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - item.setLabel(((Data) data).getName()); + String proxyName = ((Data) data).getName(); + if (!((Data) data).getUrl().isEmpty()) { + proxyName += " (Distant)"; + } + item.setLabel(proxyName); } }; } + /* * Setters */ @@ -318,4 +451,17 @@ public ProxyModel getProxyModel() { return _proxyModel; } + + public Properties getLocalProperties(Data data) throws ArgumentsParserException { + ApplicationConfig config = new ApplicationConfig(); + config.parse(new String[]{}); + Properties properties = config.getFlatOptions(); + properties.setProperty("solr.data.dir", data.getSolr()); + properties.setProperty("jdbc.con.driver", data.getDriver()); + properties.setProperty("jdbc.con.host", data.getDb()); + properties.setProperty("jdbc.con.userName", "sa"); + properties.setProperty("jdbc.con.password", ""); + System.setProperty("solr.data.dir", data.getSolr()); + return properties; + } } Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 13:14:14 UTC (rev 166) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 13:33:59 UTC (rev 167) @@ -14,6 +14,7 @@ import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyProxy; +import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Button; @@ -24,6 +25,7 @@ import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.Textbox; +import org.zkoss.zul.Window; /** * @@ -43,13 +45,32 @@ public WikittyController() { HttpSession Session = (HttpSession) Executions.getCurrent().getDesktop().getSession().getNativeSession(); WikittyProxy proxy = (WikittyProxy) Session.getAttribute("proxy"); - _model = new Model(proxy.getWikittyService()); - _extensions = _model.retrieveWikittyExtensions(); + if (proxy != null) { + _model = new Model(proxy.getWikittyService()); + _extensions = _model.retrieveWikittyExtensions(); + } else { + Executions.sendRedirect("/"); + } } + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + Window window = (Window) comp; + Button add = (Button) window.getFellow("addNewInput"); + add.setDisabled(true); + Button delete = (Button) window.getFellow("deleteInput"); + delete.setDisabled(true); + } + /* * Events */ + public void onClick$home() { + Executions.sendRedirect("/"); + } + public void onOK$Search() { Textbox textbox = (Textbox) self.getFellow("Search"); String search = textbox.getValue(); @@ -173,6 +194,11 @@ _wikittyForm.setHoldExtensions(current); List<Wikitty> list = _model.retrieveWikittiesByExtensionName(current.getName()); _wikittyModel.setWikitties(list); + Window window = (Window) this.self; + Button add = (Button) window.getFellow("addNewInput"); + add.setDisabled(true); + Button delete = (Button) window.getFellow("deleteInput"); + delete.setDisabled(true); } public void setSelectedNewExtension(WikittyExtension current) { Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-29 13:14:14 UTC (rev 166) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-29 13:33:59 UTC (rev 167) @@ -20,26 +20,28 @@ <button id="delete" label="Delete" width="36px" height="24px" /> <button id="modify" label="Modify" width="36px" height="24px" /> </groupbox> + <groupbox> <vbox> <label value="Name" /> - <textbox id="Name"/> + <textbox id="name"/> <label value="DB" /> - <textbox id="Db" /> + <textbox id="db" /> <combobox id="driver"> <comboitem label="org.h2.Driver" /> <comboitem label="mySQL" /> </combobox> <label value="Solr" /> - <textbox id="Solr" /> + <textbox id="solr" /> </vbox> <vbox> <label value="Login" /> - <textbox id="Login" /> + <textbox id="login" /> <label value="Password" /> - <textbox id="Password" /> + <textbox id="password" /> </vbox> <button id="add" label="Add" width="36px" height="24px" /> + <button id="update" label="Update" width="36px" height="24px" /> </groupbox> <groupbox> @@ -54,6 +56,7 @@ <textbox id="distantPassword" /> </vbox> <button id="distantAdd" label="Add" width="36px" height="24px" /> + <button id="distantUpdate" label="Update" width="36px" height="24px" /> </groupbox> </window> \ No newline at end of file Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-29 13:14:14 UTC (rev 166) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-29 13:33:59 UTC (rev 167) @@ -1,8 +1,9 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit"?> -<window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.WikittyController"> +<window id="win" title="wikitty" width="800px" border="normal" apply="org.nuiton.wikitty.ui.WikittyController"> Search: <textbox id="Search" /> + <toolbarbutton id="home" label="Select another proxy"/> <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedExtension}">

1 0