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

r166 - branches/2.0-eugene2/wikitty-api
by echatellier＠users.nuiton.org June 29, 2010

June 29, 2010

Author: echatellier Date: 2010-06-29 15:14:14 +0200 (Tue, 29 Jun 2010) New Revision: 166 Url: http://nuiton.org/repositories/revision/wikitty/166 Log: Fix generation. Modified: branches/2.0-eugene2/wikitty-api/pom.xml Modified: branches/2.0-eugene2/wikitty-api/pom.xml =================================================================== --- branches/2.0-eugene2/wikitty-api/pom.xml 2010-06-29 13:05:44 UTC (rev 165) +++ branches/2.0-eugene2/wikitty-api/pom.xml 2010-06-29 13:14:14 UTC (rev 166) @@ -201,8 +201,8 @@ <phase>generate-sources</phase> <configuration> <inputs> - <input>zargo:src/main/uml/wikitty-api:**\/*.zargo</input> - <input>xmi:src/main/uml/wikitty-api:**\/*.uml</input> + <input>zargo:src/main/uml/wikitty-api:*.zargo</input> + <input>xmi:src/main/uml/wikitty-api:*.uml</input> </inputs> <fullPackagePath>org.nuiton.wikitty</fullPackagePath> <defaultPackage>org.nuiton.wikitty</defaultPackage>

1 0

r165 - in branches/2.0-eugene2: . wikitty-api wikitty-generators wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org June 29, 2010

June 29, 2010

Author: echatellier Date: 2010-06-29 15:05:44 +0200 (Tue, 29 Jun 2010) New Revision: 165 Url: http://nuiton.org/repositories/revision/wikitty/165 Log: Test d'utilisation eugene 2 Modified: branches/2.0-eugene2/pom.xml branches/2.0-eugene2/wikitty-api/pom.xml branches/2.0-eugene2/wikitty-generators/pom.xml branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java Modified: branches/2.0-eugene2/pom.xml =================================================================== --- branches/2.0-eugene2/pom.xml 2010-06-29 12:33:21 UTC (rev 164) +++ branches/2.0-eugene2/pom.xml 2010-06-29 13:05:44 UTC (rev 165) @@ -163,7 +163,7 @@   - <eugene.version>1.0.1</eugene.version> + <eugene.version>2.0.2</eugene.version> <spring.version>3.0.1.RELEASE</spring.version> <hessian.version>3.1.6</hessian.version> <jetty.version>6.1.22</jetty.version> Modified: branches/2.0-eugene2/wikitty-api/pom.xml =================================================================== --- branches/2.0-eugene2/wikitty-api/pom.xml 2010-06-29 12:33:21 UTC (rev 164) +++ branches/2.0-eugene2/wikitty-api/pom.xml 2010-06-29 13:05:44 UTC (rev 165) @@ -199,8 +199,11 @@ <execution> <id>api-generation</id> <phase>generate-sources</phase> -  - <configuration> + </goals> +  </execution> </executions> </plugin> Modified: branches/2.0-eugene2/wikitty-generators/pom.xml =================================================================== --- branches/2.0-eugene2/wikitty-generators/pom.xml 2010-06-29 12:33:21 UTC (rev 164) +++ branches/2.0-eugene2/wikitty-generators/pom.xml 2010-06-29 13:05:44 UTC (rev 165) @@ -41,7 +41,7 @@ <build> <plugins> -  +  <plugin> <groupId>org.nuiton.processor</groupId> <artifactId>maven-processor-plugin</artifactId> Modified: branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java =================================================================== --- branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java 2010-06-29 12:33:21 UTC (rev 164) +++ branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java 2010-06-29 13:05:44 UTC (rev 165) @@ -16,13 +16,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.ImportsManager; -import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.java.ImportsManager; +import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelDependency; import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -40,6 +41,21 @@ } } + @Override + protected boolean canGenerateElement(Object element) { + + boolean canGenerate = true; + + if (element instanceof ObjectModel) { + // fail with no model name + canGenerate = false; + } + else { + canGenerate = super.canGenerateElement(element); + } + return canGenerate; + } + protected void addImport(String fqn) { if (containsClassAndGeneric(fqn)) { String[] type = getClassAndGeneric(fqn); Modified: branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java =================================================================== --- branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-06-29 12:33:21 UTC (rev 164) +++ branches/2.0-eugene2/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-06-29 13:05:44 UTC (rev 165) @@ -11,8 +11,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.util.Resource; public class WikittyMetaGenerator extends ObjectModelGenerator { @@ -105,7 +105,7 @@ } @Override - public void generate(ObjectModel model, File destDir) throws IOException { + public void applyTemplate(ObjectModel model, File destDir) throws IOException { for (Class<? extends ObjectModelGenerator> generatorClass : getGenerators()) { ObjectModelGenerator generator; if (excludeTemplates != null && excludeTemplates.contains(generatorClass.getName())) { @@ -130,7 +130,7 @@ if (log.isDebugEnabled()) { log.debug("call template : " + generatorClass.getSimpleName()); } - generator.generate(model, destDir); + generator.applyTemplate(model, destDir); } }

1 0

r164 - branches
by echatellier＠users.nuiton.org June 29, 2010

June 29, 2010

Author: echatellier Date: 2010-06-29 14:33:21 +0200 (Tue, 29 Jun 2010) New Revision: 164 Url: http://nuiton.org/repositories/revision/wikitty/164 Log: Eugene 2 migration Added: branches/2.0-eugene2/

1 0

r163 - trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui
by bbrossaud＠users.nuiton.org June 29, 2010

June 29, 2010

Author: bbrossaud Date: 2010-06-29 10:53:52 +0200 (Tue, 29 Jun 2010) New Revision: 163 Url: http://nuiton.org/repositories/revision/wikitty/163 Log: retrieved only the last extension version 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/WikittyForm.java 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 08:43:09 UTC (rev 162) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java 2010-06-29 08:53:52 UTC (rev 163) @@ -11,7 +11,6 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import javax.swing.ComboBoxEditor; import org.apache.commons.lang.UnhandledException; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; 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 08:43:09 UTC (rev 162) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java 2010-06-29 08:53:52 UTC (rev 163) @@ -316,7 +316,11 @@ components = getComponentsByWikittyBooleanType(fieldExtension); } Listcell cell1 = new Listcell("(" + fieldExtension.getWikittyExtension().getName() + ")"); - Listcell cell2 = new Listcell(fieldExtension.getName()); + String fieldName = fieldExtension.getName(); + if (fieldType.isCollection()) { + fieldName += " (Multiple field)"; + } + Listcell cell2 = new Listcell(fieldName); Listcell cell3 = new Listcell(); String id = fieldExtension.getWikittyExtension().getName() + "." + fieldExtension.getName(); cell3.setId(id);

1 0

r162 - in trunk/wikitty-ui-zk/src/main: java/org/nuiton/wikitty/ui webapp
by bbrossaud＠users.nuiton.org June 29, 2010

June 29, 2010

Author: bbrossaud Date: 2010-06-29 10:43:09 +0200 (Tue, 29 Jun 2010) New Revision: 162 Url: http://nuiton.org/repositories/revision/wikitty/162 Log: retrieved only the last extension version 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/Model.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/LoginController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java 2010-06-28 15:56:28 UTC (rev 161) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java 2010-06-29 08:43:09 UTC (rev 162) @@ -11,6 +11,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; +import javax.swing.ComboBoxEditor; import org.apache.commons.lang.UnhandledException; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; @@ -185,11 +186,23 @@ return proxy; } - protected void goToWikittyPage(WikittyProxy proxy){ + protected void goToWikittyPage(WikittyProxy proxy) { Sessions.getCurrent().setAttribute("proxy", proxy); Executions.sendRedirect("wikitty.zul"); } + protected void fillDistantProxy(Data data) { + ((Textbox) this.self.getFellow("distantName")).setValue(data.getName()); + ((Textbox) this.self.getFellow("distantURL")).setValue(data.getUrl()); + } + + 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()); + ((Combobox) this.self.getFellow("driver")).setValue(data.getDriver()); + } + /* * Events */ @@ -214,6 +227,19 @@ } } + public void onClick$modify() { + Listitem item = dataList.getSelectedItem(); + if (item != null) { + Data data = (Data) item.getValue(); + String url = data.getUrl(); + if (!url.isEmpty()) { + fillDistantProxy(data); + } else { + fillLocalProxy(data); + } + } + } + public void onClick$select() throws ArgumentsParserException { Listitem item = dataList.getSelectedItem(); if (item != null) { @@ -225,7 +251,7 @@ return; } } - ApplicationConfig config = new ApplicationConfig(); + ApplicationConfig config = new ApplicationConfig(); config.parse(new String[]{}); Properties properties = config.getFlatOptions(); properties.setProperty("solr.data.dir", data.getSolr()); Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-06-28 15:56:28 UTC (rev 161) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-06-29 08:43:09 UTC (rev 162) @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; -import org.bouncycastle.jce.provider.JDKAlgorithmParameterGenerator.ElGamal; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; @@ -41,7 +40,10 @@ List<WikittyExtension> extensions = new ArrayList<WikittyExtension>(); for (String id : ids) { WikittyExtension wikittyExtension = _service.restoreExtension(null, id); - extensions.add(wikittyExtension); + wikittyExtension = _service.restoreExtensionLastVersion(null, wikittyExtension.getName()); + if (extensions.contains(wikittyExtension) == false) { + extensions.add(wikittyExtension); + } } return extensions; } @@ -65,11 +67,11 @@ public void update(Wikitty wikitty) { _service.store(null, wikitty); } - + /* * Delete */ - public void deleteWikittyById(String id) { - _service.delete(null, id); - } + public void deleteWikittyById(String id) { + _service.delete(null, id); + } } 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-28 15:56:28 UTC (rev 161) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 08:43:09 UTC (rev 162) @@ -10,19 +10,19 @@ import java.util.List; import java.util.Set; import javax.servlet.http.HttpSession; +import org.nuiton.wikitty.FieldType; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.util.GenericForwardComposer; -import org.zkoss.zul.Hbox; +import org.zkoss.zul.Button; import org.zkoss.zul.Label; import org.zkoss.zul.ListModel; import org.zkoss.zul.Listbox; 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; /** @@ -93,6 +93,23 @@ _wikittyForm.addExtension(_selectedNewExtension); } + public void onSelect$formListBox() { + Listitem item = formListBox.getSelectedItem(); + if (item != null) { + FieldExtension fieldExtension = (FieldExtension) item.getValue(); + FieldType fieldType = fieldExtension.getFieldType(); + Button add = (Button) self.getFellow("addNewInput"); + Button delete = (Button) self.getFellow("deleteInput"); + if (!fieldType.isCollection()) { + add.setDisabled(true); + delete.setDisabled(true); + } else { + add.setDisabled(false); + delete.setDisabled(false); + } + } + } + /* * Renderers */ @@ -106,38 +123,17 @@ Listcell cell2 = new Listcell(); item.appendChild(cell1); item.appendChild(cell2); - Hbox box = new Hbox(); - cell2.appendChild(box); Collection<String> extensions = ((Wikitty) data).getExtensionNames(); Iterator<String> itCurrent = extensions.iterator(); while (itCurrent.hasNext()) { String extension = itCurrent.next(); - String toolTip = ""; - WikittyExtension wikittyExtension = ((Wikitty) data).getExtension(extension); - Collection<String> fieldNames = wikittyExtension.getFieldNames(); - for (String fieldName : fieldNames) { - String result = ((Wikitty) data).getFieldAsString(extension, fieldName); - if (result == null) { - result = ""; - } - if (result.length() > 50) { - result = result.substring(0, 46); - if (wikittyExtension.getFieldType(fieldName).isCollection()) { - result += "...]"; - } else { - result += "..."; - } - } - toolTip += fieldName + " : " + result + "\n"; - } + String toolTip = getToolTipsByExtension(extension, (Wikitty) data); if (itCurrent.hasNext()) { extension += ", "; } Label label = new Label(extension); label.setTooltiptext(toolTip); - label.setMultiline(true); - System.out.println(label.getTooltiptext()); - box.appendChild(label); + cell2.appendChild(label); } } }; @@ -190,4 +186,25 @@ /* * Methods */ + protected String getToolTipsByExtension(String extension, Wikitty wikitty) { + String toolTip = ""; + WikittyExtension wikittyExtension = wikitty.getExtension(extension); + Collection<String> fieldNames = wikittyExtension.getFieldNames(); + for (String fieldName : fieldNames) { + String result = wikitty.getFieldAsString(extension, fieldName); + if (result == null) { + result = ""; + } + if (result.length() > 50) { + result = result.substring(0, 46); + if (wikittyExtension.getFieldType(fieldName).isCollection()) { + result += "...]"; + } else { + result += "..."; + } + } + toolTip += fieldName + " : " + result + "\n"; + } + return toolTip; + } } Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-28 15:56:28 UTC (rev 161) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-29 08:43:09 UTC (rev 162) @@ -18,6 +18,7 @@ </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" /> </groupbox> <groupbox> <vbox> Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-28 15:56:28 UTC (rev 161) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-29 08:43:09 UTC (rev 162) @@ -3,7 +3,7 @@ <window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.WikittyController"> Search: <textbox id="Search" /> - <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions, load-after='add.onClick, update.onClick'}" + <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedExtension}"> <listhead>

1 0

r161 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org June 28, 2010

June 28, 2010

Author: echatellier Date: 2010-06-28 17:56:28 +0200 (Mon, 28 Jun 2010) New Revision: 161 Url: http://nuiton.org/repositories/revision/wikitty/161 Log: Add requires into putExtension event (not enough information without it). 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-28 14:10:45 UTC (rev 160) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-28 15:56:28 UTC (rev 161) @@ -493,6 +493,10 @@ // extension Set<String> extension = new HashSet<String>(); extension.add(ext.getName()); + + // also add requires fields + extension.add(ext.requires); + idsExtension.put(ext.getId(), extension); }

1 0

r160 - in trunk/wikitty-ui-zk: . src/main/java/org/nuiton/wikitty/ui src/main/webapp
by bbrossaud＠users.nuiton.org June 28, 2010

June 28, 2010

Author: bbrossaud Date: 2010-06-28 16:10:45 +0200 (Mon, 28 Jun 2010) New Revision: 160 Url: http://nuiton.org/repositories/revision/wikitty/160 Log: add search bar and tooltips but the carriage return for the tooltip doesn't work Modified: trunk/wikitty-ui-zk/pom.xml trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.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/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-06-27 06:36:25 UTC (rev 159) +++ trunk/wikitty-ui-zk/pom.xml 2010-06-28 14:10:45 UTC (rev 160) @@ -87,7 +87,6 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.136</version> <scope>runtime</scope> </dependency> @@ -188,3 +187,4 @@ + Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-06-27 06:36:25 UTC (rev 159) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-06-28 14:10:45 UTC (rev 160) @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.List; +import org.bouncycastle.jce.provider.JDKAlgorithmParameterGenerator.ElGamal; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; @@ -50,6 +51,14 @@ List<Wikitty> wikitties = _service.findAllByCriteria(null, criteria).cast(null, _service).getAll(); return wikitties; } + + public List<Wikitty> retrieveWikittiesByKeyword(String search) { + List<Wikitty> wikitties = new ArrayList<Wikitty>(); + Criteria criteria = Search.query().keyword(search).criteria(); + wikitties = _service.findAllByCriteria(null, criteria).cast(null, _service).getAll(); + return wikitties; + } + /* * Update */ 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-27 06:36:25 UTC (rev 159) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-28 14:10:45 UTC (rev 160) @@ -5,6 +5,8 @@ package org.nuiton.wikitty.ui; import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; import java.util.List; import java.util.Set; import javax.servlet.http.HttpSession; @@ -13,10 +15,15 @@ import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.Hbox; +import org.zkoss.zul.Label; import org.zkoss.zul.ListModel; import org.zkoss.zul.Listbox; +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; /** * @@ -34,15 +41,24 @@ protected WikittyModel _wikittyModel = new WikittyModel(); public WikittyController() { - HttpSession Session = (HttpSession) Executions.getCurrent().getDesktop().getSession().getNativeSession(); - WikittyProxy proxy = (WikittyProxy) Session.getAttribute("proxy"); - _model = new Model(proxy.getWikittyService()); + HttpSession Session = (HttpSession) Executions.getCurrent().getDesktop().getSession().getNativeSession(); + WikittyProxy proxy = (WikittyProxy) Session.getAttribute("proxy"); + _model = new Model(proxy.getWikittyService()); _extensions = _model.retrieveWikittyExtensions(); } /* * Events */ + public void onOK$Search() { + Textbox textbox = (Textbox) self.getFellow("Search"); + String search = textbox.getValue(); + if (search != null && !search.isEmpty()) { + List<Wikitty> wikitties = _model.retrieveWikittiesByKeyword(search); + _wikittyModel.setWikitties(wikitties); + } + } + public void onClick$addNewInput() { _wikittyForm.addNewInput(formListBox); } @@ -86,7 +102,43 @@ @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - item.setLabel(((Wikitty) data).getId()); + Listcell cell1 = new Listcell(((Wikitty) data).getId()); + Listcell cell2 = new Listcell(); + item.appendChild(cell1); + item.appendChild(cell2); + Hbox box = new Hbox(); + cell2.appendChild(box); + Collection<String> extensions = ((Wikitty) data).getExtensionNames(); + Iterator<String> itCurrent = extensions.iterator(); + while (itCurrent.hasNext()) { + String extension = itCurrent.next(); + String toolTip = ""; + WikittyExtension wikittyExtension = ((Wikitty) data).getExtension(extension); + Collection<String> fieldNames = wikittyExtension.getFieldNames(); + for (String fieldName : fieldNames) { + String result = ((Wikitty) data).getFieldAsString(extension, fieldName); + if (result == null) { + result = ""; + } + if (result.length() > 50) { + result = result.substring(0, 46); + if (wikittyExtension.getFieldType(fieldName).isCollection()) { + result += "...]"; + } else { + result += "..."; + } + } + toolTip += fieldName + " : " + result + "\n"; + } + if (itCurrent.hasNext()) { + extension += ", "; + } + Label label = new Label(extension); + label.setTooltiptext(toolTip); + label.setMultiline(true); + System.out.println(label.getTooltiptext()); + box.appendChild(label); + } } }; } @@ -135,10 +187,6 @@ _wikittyForm.setWikitty(current); } - private void debbug(String debug) { - throw new UnsupportedOperationException(debug); - } - /* * Methods */ Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-27 06:36:25 UTC (rev 159) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-28 14:10:45 UTC (rev 160) @@ -1,6 +1,6 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit"?> -<window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.LoginController"> +<window id="win" title="Win" 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}" > Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-27 06:36:25 UTC (rev 159) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-28 14:10:45 UTC (rev 160) @@ -2,6 +2,7 @@ <window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.WikittyController"> + Search: <textbox id="Search" /> <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions, load-after='add.onClick, update.onClick'}" selectedItem="@{win$composer.selectedExtension}"> @@ -14,11 +15,16 @@ <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}"> + <listhead sizable="true"> + <listheader label="ID" /> + <listheader label="Extensions" /> + </listhead> </listbox> <button id="delete" label="Delete" width="46px" height="24px"/> </groupbox>

1 0

r159 - trunk
by tchemit＠users.nuiton.org June 27, 2010

June 27, 2010

Author: tchemit Date: 2010-06-27 08:36:25 +0200 (Sun, 27 Jun 2010) New Revision: 159 Url: http://nuiton.org/repositories/revision/wikitty/159 Log: Utilisation de mavenpom4redmine 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-25 12:47:24 UTC (rev 158) +++ trunk/pom.xml 2010-06-27 06:36:25 UTC (rev 159) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent>

1 0

r158 - in trunk/wikitty-ui-zk/src/main: java/org/nuiton/wikitty/ui webapp
by bbrossaud＠users.nuiton.org June 25, 2010

June 25, 2010

Author: bbrossaud Date: 2010-06-25 14:47:24 +0200 (Fri, 25 Jun 2010) New Revision: 158 Url: http://nuiton.org/repositories/revision/wikitty/158 Log: create a WikittyProxy with the specifics options 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/Model.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkService.java trunk/wikitty-ui-zk/src/main/webapp/index.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-24 16:50:53 UTC (rev 157) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java 2010-06-25 12:47:24 UTC (rev 158) @@ -29,6 +29,13 @@ setPassword(password); } + public boolean hasLoginPassword() { + if (_password.isEmpty() || _login.isEmpty()) { + return false; + } + return true; + } + /* * Setters */ @@ -106,7 +113,7 @@ public String getDriver() { return _driver; } - + public String getSolr() { return _solr; } 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-24 16:50:53 UTC (rev 157) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java 2010-06-25 12:47:24 UTC (rev 158) @@ -14,9 +14,17 @@ import org.apache.commons.lang.UnhandledException; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceCached; +import org.nuiton.wikitty.jdbc.WikittyServiceJDBC; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.Sessions; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Groupbox; import org.zkoss.zul.Listbox; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -45,6 +53,15 @@ createProxyDatas(); } + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + Window window = (Window) comp; + Groupbox box = (Groupbox) window.getFellow("loginPassword"); + box.setVisible(false); + } + public void initConfig() { _config.setConfigFileName("wikitty-ui-zk.properties"); try { @@ -79,11 +96,9 @@ _properties.setProperty(path + ".url", url); } String login = data.getLogin(); + String password = data.getPassword(); if (!login.isEmpty()) { _properties.setProperty(path + ".login", login); - } - String password = data.getPassword(); - if (!password.isEmpty()) { _properties.setProperty(path + ".password", password); } data.setPath(path); @@ -123,9 +138,9 @@ 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"); + 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); @@ -159,17 +174,71 @@ } } + protected WikittyProxy createProxy(Properties properties, String login, String password) { + WikittyProxy proxy = new WikittyProxy(); + WikittyService ws = new WikittyServiceJDBC(properties); + ws = new WikittyServiceCached(ws); + proxy.setWikittyService(ws); + if (!login.isEmpty()) { + proxy.login(login, password); + } + return proxy; + } + + protected void goToWikittyPage(WikittyProxy proxy){ + Sessions.getCurrent().setAttribute("proxy", proxy); + Executions.sendRedirect("wikitty.zul"); + } + /* * Events */ - public void onClick$select() { + public void onSelect$dataList() { Listitem item = dataList.getSelectedItem(); if (item != null) { Data data = (Data) item.getValue(); - //WikittyZkConfig config = WikittyZkConfig.getInstance(); + String login = data.getLogin(); + String password = data.getPassword(); + Groupbox box = (Groupbox) win.getFellow("loginPassword"); + if (box != null) { + if (!password.isEmpty() && !login.isEmpty()) { + box.setVisible(true); + Textbox loginText = (Textbox) box.getFellow("selectLogin"); + loginText.setValue(""); + Textbox passwordText = (Textbox) box.getFellow("selectPassword"); + passwordText.setValue(""); + } else { + box.setVisible(false); + } + } } } + 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(); + 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); + } + } + public void onClick$add() throws FileNotFoundException, IOException { String name = ((Textbox) win.getFellow("Name")).getValue(); String db = ((Textbox) win.getFellow("Db")).getValue(); Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-06-24 16:50:53 UTC (rev 157) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-06-25 12:47:24 UTC (rev 158) @@ -19,49 +19,48 @@ */ public class Model { - protected WikittyZkService _service = new WikittyZkService(); + protected WikittyService _service = null; + public Model(WikittyService service) { + _service = service; + } + /* * Create */ public void create(Wikitty wikitty) { - WikittyService ws = _service.getWikittyService(); - ws.store(null, wikitty); + _service.store(null, wikitty); } /* * Retrieve */ public List<WikittyExtension> retrieveWikittyExtensions() { - WikittyService ws = _service.getWikittyService(); - List<String> ids = ws.getAllExtensionIds(null); + List<String> ids = _service.getAllExtensionIds(null); List<WikittyExtension> extensions = new ArrayList<WikittyExtension>(); for (String id : ids) { - WikittyExtension wikittyExtension = ws.restoreExtension(null, id); + WikittyExtension wikittyExtension = _service.restoreExtension(null, id); extensions.add(wikittyExtension); } return extensions; } public List<Wikitty> retrieveWikittiesByExtensionName(String extensionName) { - WikittyService ws = _service.getWikittyService(); Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, extensionName).criteria(); - List<Wikitty> wikitties = ws.findAllByCriteria(null, criteria).cast(null, ws).getAll(); + List<Wikitty> wikitties = _service.findAllByCriteria(null, criteria).cast(null, _service).getAll(); return wikitties; } /* * Update */ public void update(Wikitty wikitty) { - WikittyService ws = _service.getWikittyService(); - ws.store(null, wikitty); + _service.store(null, wikitty); } /* * Delete */ public void deleteWikittyById(String id) { - WikittyService ws = _service.getWikittyService(); - ws.delete(null, id); + _service.delete(null, id); } } 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-24 16:50:53 UTC (rev 157) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-25 12:47:24 UTC (rev 158) @@ -7,8 +7,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import javax.servlet.http.HttpSession; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyProxy; +import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.ListModel; import org.zkoss.zul.Listbox; @@ -21,7 +24,7 @@ */ public class WikittyController extends GenericForwardComposer { - protected Model _model = new Model(); + protected Model _model = null; protected List<WikittyExtension> _extensions = new ArrayList<WikittyExtension>(); protected WikittyExtension _selectedExtension; protected WikittyExtension _selectedNewExtension; @@ -31,6 +34,9 @@ protected WikittyModel _wikittyModel = new WikittyModel(); public WikittyController() { + HttpSession Session = (HttpSession) Executions.getCurrent().getDesktop().getSession().getNativeSession(); + WikittyProxy proxy = (WikittyProxy) Session.getAttribute("proxy"); + _model = new Model(proxy.getWikittyService()); _extensions = _model.retrieveWikittyExtensions(); } 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 16:50:53 UTC (rev 157) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java 2010-06-25 12:47:24 UTC (rev 158) @@ -16,9 +16,14 @@ *##%*/ package org.nuiton.wikitty.ui; +import java.io.IOException; import static org.nuiton.i18n.I18n._; import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.util.Properties; +import java.util.Set; import org.apache.commons.lang.UnhandledException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,22 +51,32 @@ 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); } } } - public static synchronized WikittyZkConfig getInstance() { + public static synchronized WikittyZkConfig getInstance() throws IOException { 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); } } + Properties props = instance.getFlatOptions(); + Set<String> names = props.stringPropertyNames(); + for (String name : names) { + System.out.println(name + "=" + props.getProperty(name)); + } + File file = new File("/var/wikitty-zk/toto.fr"); + if (!file.exists()) { + file.createNewFile(); + } + OutputStream stream = new FileOutputStream(file); + props.store(stream, null); + stream.close(); return instance; } Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkService.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkService.java 2010-06-24 16:50:53 UTC (rev 157) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkService.java 2010-06-25 12:47:24 UTC (rev 158) @@ -16,6 +16,7 @@ *##%*/ package org.nuiton.wikitty.ui; +import java.io.IOException; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.jdbc.WikittyServiceJDBC; @@ -23,7 +24,7 @@ protected WikittyService instance; - public WikittyZkService() { + public WikittyZkService() throws IOException { WikittyZkConfig config = WikittyZkConfig.getInstance(); instance = new WikittyServiceJDBC(config.getFlatOptions()); } Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-24 16:50:53 UTC (rev 157) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-25 12:47:24 UTC (rev 158) @@ -10,10 +10,15 @@ </listhead> </listbox> + <groupbox id="loginPassword" > + <label value="Login" /> + <textbox id="selectLogin" /> + <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" /> </groupbox> - <groupbox> <vbox> <label value="Name" />

1 0

r157 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org June 24, 2010

June 24, 2010

Author: echatellier Date: 2010-06-24 18:50:53 +0200 (Thu, 24 Jun 2010) New Revision: 157 Url: http://nuiton.org/repositories/revision/wikitty/157 Log: Add warn in old field definition detection 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-24 15:57:55 UTC (rev 156) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-24 16:50:53 UTC (rev 157) @@ -143,12 +143,16 @@ String uniqueString = match.group(6); if (uniqueString != null) { tagValuesMap.put(FieldType.UNIQUE, "true"); + if (log.isWarnEnabled()) { + log.warn("Old field constraints definition detected \"unique\" ; prefer use of \"unique=true\""); + } } // legacy field definition : not null String notNullString = match.group(7); if (notNullString != null) { tagValuesMap.put(FieldType.NOT_NULL, "true"); + log.warn("Old field constraints definition detected \"non null\" ; prefer use of \"notNull=true\""); } fieldType.setTagValues(tagValuesMap);

1 0