- Vradi-commits - mailman.cloud.codelutin.com

r158 - trunk
by echatellier＠users.chorem.org 17 Jan '12

17 Jan '12

Author: echatellier Date: 2012-01-17 12:27:39 +0100 (Tue, 17 Jan 2012) New Revision: 158 Url: http://chorem.org/repositories/revision/vradi/158 Log: Fix generation (serialVersionUid) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 10:57:02 UTC (rev 157) +++ trunk/pom.xml 2012-01-17 11:27:39 UTC (rev 158) @@ -121,7 +121,7 @@ <nuitonUtilsVersion>2.4.3</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <wikittyVersion>3.3</wikittyVersion> + <wikittyVersion>3.3.1-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> <jrstVersion>1.5</jrstVersion>

1 0

r157 - trunk/vradi-services-web/src/main/webapp
by echatellier＠users.chorem.org 17 Jan '12

17 Jan '12

Author: echatellier Date: 2012-01-17 11:57:02 +0100 (Tue, 17 Jan 2012) New Revision: 157 Url: http://chorem.org/repositories/revision/vradi/157 Log: Fix build Modified: trunk/vradi-services-web/src/main/webapp/index.jsp Modified: trunk/vradi-services-web/src/main/webapp/index.jsp =================================================================== --- trunk/vradi-services-web/src/main/webapp/index.jsp 2012-01-17 10:40:41 UTC (rev 156) +++ trunk/vradi-services-web/src/main/webapp/index.jsp 2012-01-17 10:57:02 UTC (rev 157) @@ -28,6 +28,6 @@ <title>Vradi services</title> </head> <body> -Vradi is up and running (<%=org.chorem.vradi.VradiServiceConfiguration("application.version")%>)... +Vradi is up and running (<%=org.chorem.vradi.VradiServiceConfiguration.getConfig("application.version")%>)... </body> </html>

1 0

r156 - trunk
by echatellier＠users.chorem.org 17 Jan '12

17 Jan '12

Author: echatellier Date: 2012-01-17 11:40:41 +0100 (Tue, 17 Jan 2012) New Revision: 156 Url: http://chorem.org/repositories/revision/vradi/156 Log: Use nuiton-utils 2.4.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-12 09:11:23 UTC (rev 155) +++ trunk/pom.xml 2012-01-17 10:40:41 UTC (rev 156) @@ -118,7 +118,7 @@ <jaxxVersion>2.4</jaxxVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.3</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <wikittyVersion>3.3</wikittyVersion>

1 0

r155 - trunk/vradi-services/src/main/java/org/chorem/vradi/services
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 10:11:23 +0100 (Thu, 12 Jan 2012) New Revision: 155 Url: http://chorem.org/repositories/revision/vradi/155 Log: Use cajo configuration Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java 2012-01-12 09:11:13 UTC (rev 154) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java 2012-01-12 09:11:23 UTC (rev 155) @@ -1,3 +1,26 @@ +/* + * #%L + * Vradi :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.vradi.services; import org.apache.commons.logging.Log; Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2012-01-12 09:11:13 UTC (rev 154) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2012-01-12 09:11:23 UTC (rev 155) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Codelutin + * Copyright (C) 2009 - 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -23,6 +23,8 @@ */ package org.chorem.vradi.services; +import gnu.cajo.utils.extra.TransparentItemProxy; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiServiceConfigurationHelper; @@ -30,8 +32,6 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; -import com.caucho.hessian.client.HessianProxyFactory; - /** * VradiServiceFactory. * @@ -67,7 +67,7 @@ try { - /* String cajoEndPoint = serviceEndpoint; + String cajoEndPoint = serviceEndpoint; // cajo url is not http or other protocol, url must start with // // example: //localhost:1198/ws // remove protocol @@ -79,10 +79,10 @@ serviceEndpoint = getServiceURL(cajoEndPoint, servicePort, VradiStorageService.VRADI_SERVICE); result = (VradiStorageService) TransparentItemProxy.getItem( - serviceEndpoint, new Class[]{VradiStorageService.class});*/ + serviceEndpoint, new Class[]{VradiStorageService.class}); - HessianProxyFactory factory = new HessianProxyFactory(); + /*HessianProxyFactory factory = new HessianProxyFactory(); // Fix : com.caucho.hessian.io.HessianProtocolException: '��' is an unknown code factory.setHessian2Request(true); // pour que les méthodes aux noms dupliquées fonctionnent (arguments different) @@ -91,7 +91,7 @@ // vradi service result = (VradiStorageService) factory. create(VradiStorageService.class, - getServiceURL(serviceEndpoint, 0, VradiStorageService.VRADI_SERVICE)); + getServiceURL(serviceEndpoint, 0, VradiStorageService.VRADI_SERVICE));*/ } catch (Exception eee) { if (log.isErrorEnabled()) {

1 0

r154 - trunk/vradi-services
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 10:11:13 +0100 (Thu, 12 Jan 2012) New Revision: 154 Url: http://chorem.org/repositories/revision/vradi/154 Log: Useless opencsv deps Modified: trunk/vradi-services/pom.xml Modified: trunk/vradi-services/pom.xml =================================================================== --- trunk/vradi-services/pom.xml 2012-01-12 09:09:43 UTC (rev 153) +++ trunk/vradi-services/pom.xml 2012-01-12 09:11:13 UTC (rev 154) @@ -127,11 +127,6 @@ </dependency> <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> - - <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency>

1 0

r153 - trunk/vradi-services-web/src/main/resources
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 10:09:43 +0100 (Thu, 12 Jan 2012) New Revision: 153 Url: http://chorem.org/repositories/revision/vradi/153 Log: Remove wikitty conf files from vradi Removed: trunk/vradi-services-web/src/main/resources/jbossts-properties.xml trunk/vradi-services-web/src/main/resources/solrconfig.xml Deleted: trunk/vradi-services-web/src/main/resources/jbossts-properties.xml =================================================================== --- trunk/vradi-services-web/src/main/resources/jbossts-properties.xml 2012-01-11 11:33:13 UTC (rev 152) +++ trunk/vradi-services-web/src/main/resources/jbossts-properties.xml 2012-01-12 09:09:43 UTC (rev 153) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties> -  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir"> - ${vradi.objectStore.dir} - </entry> -</properties> Deleted: trunk/vradi-services-web/src/main/resources/solrconfig.xml =================================================================== --- trunk/vradi-services-web/src/main/resources/solrconfig.xml 2012-01-11 11:33:13 UTC (rev 152) +++ trunk/vradi-services-web/src/main/resources/solrconfig.xml 2012-01-12 09:09:43 UTC (rev 153) @@ -1,556 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - - - -<config> - - <luceneMatchVersion>LUCENE_31</luceneMatchVersion> - -  - <abortOnConfigurationError>${solr.abortOnConfigurationError:true} - </abortOnConfigurationError> - -  - <dataDir>${wikitty.searchengine.solr.directory.data:./solr/data}</dataDir> - -  - <directoryFactory name="DirectoryFactory" - class="${wikitty.searchengine.solr.directory.factory:solr.StandardDirectoryFactory}"/> - - <indexDefaults> -  - <useCompoundFile>false</useCompoundFile> - - <mergeFactor>10</mergeFactor> -  -  -  - <ramBufferSizeMB>32</ramBufferSizeMB> - <maxMergeDocs>2147483647</maxMergeDocs> - <maxFieldLength>10000</maxFieldLength> - <writeLockTimeout>1000</writeLockTimeout> - <commitLockTimeout>10000</commitLockTimeout> - -  - <lockType>simple</lockType> - </indexDefaults> - - <mainIndex> -  - <useCompoundFile>false</useCompoundFile> - <ramBufferSizeMB>32</ramBufferSizeMB> - <mergeFactor>10</mergeFactor> -  -  - <maxMergeDocs>2147483647</maxMergeDocs> - <maxFieldLength>10000</maxFieldLength> - -  - <unlockOnStartup>true</unlockOnStartup> - </mainIndex> - -  - <jmx/> - -  - <updateHandler class="solr.DirectUpdateHandler2"> - </updateHandler> - - - <query> -  - <maxBooleanClauses>2147483647</maxBooleanClauses> - - -  -  - -  -  - -  -  - -  -  - -  -  -  - -  -  - -  -  - -  -  - -  -  - - </query> - -  - <requestDispatcher handleSelect="true"> -  - <requestParsers enableRemoteStreaming="false" - multipartUploadLimitInKB="2048"/> - </requestDispatcher> - - -  - - -  - <requestHandler name="standard" class="solr.SearchHandler" default="true"> -  - <lst name="defaults"> - <str name="echoParams">explicit</str> -  - </lst> - </requestHandler> - - -  - <requestHandler name="dismax" class="solr.SearchHandler"> - <lst name="defaults"> - <str name="defType">dismax</str> - <str name="echoParams">explicit</str> - <float name="tie">0.01</float> - <str name="qf"> - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - </str> - <str name="pf"> - text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9 - </str> - <str name="bf"> - ord(popularity)^0.5 recip(rord(price),1,1000,1000)^0.3 - </str> - <str name="fl"> - id,name,price,score - </str> - <str name="mm"> - 2<-1 5<-2 6<90% - </str> - <int name="ps">100</int> - <str name="q.alt">*:*</str> -  - <str name="hl.fl">text features name</str> -  - <str name="f.name.hl.fragsize">0</str> -  - <str name="f.name.hl.alternateField">name</str> - <str name="f.text.hl.fragmenter">regex</str> -  - </lst> - </requestHandler> - -  - <requestHandler name="partitioned" class="solr.SearchHandler"> - <lst name="defaults"> - <str name="defType">dismax</str> - <str name="echoParams">explicit</str> - <str name="qf">text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0</str> - <str name="mm">2<-1 5<-2 6<90%</str> -  - <str name="bq">incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2</str> - </lst> -  - <lst name="appends"> - <str name="fq">inStock:true</str> - </lst> -  - <lst name="invariants"> - <str name="facet.field">cat</str> - <str name="facet.field">manu_exact</str> - <str name="facet.query">price:[* TO 500]</str> - <str name="facet.query">price:[500 TO *]</str> - </lst> - </requestHandler> - - -  - -  - <searchComponent name="spellcheck" class="solr.SpellCheckComponent"> - - <str name="queryAnalyzerFieldType">textSpell</str> - - <lst name="spellchecker"> - <str name="name">default</str> - <str name="field">spell</str> - <str name="spellcheckIndexDir">./spellchecker1</str> - - </lst> - <lst name="spellchecker"> - <str name="name">jarowinkler</str> - <str name="field">spell</str> -  - <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str> - <str name="spellcheckIndexDir">./spellchecker2</str> - - </lst> - - <lst name="spellchecker"> - <str name="classname">solr.FileBasedSpellChecker</str> - <str name="name">file</str> - <str name="sourceLocation">spellings.txt</str> - <str name="characterEncoding">UTF-8</str> - <str name="spellcheckIndexDir">./spellcheckerFile</str> - </lst> - </searchComponent> - -  - <requestHandler name="/spellCheckCompRH" class="solr.SearchHandler"> - <lst name="defaults"> -  - <str name="spellcheck.onlyMorePopular">false</str> -  - <str name="spellcheck.extendedResults">false</str> -  - <str name="spellcheck.count">1</str> - </lst> - <arr name="last-components"> - <str>spellcheck</str> - </arr> - </requestHandler> - -  - -  -  -  - -  - <requestHandler name="/update" class="solr.XmlUpdateRequestHandler"/> - -  - <requestHandler name="/analysis" class="solr.AnalysisRequestHandler"/> - - -  - <requestHandler name="/update/csv" class="solr.CSVRequestHandler" - startup="lazy"/> - - -  - <requestHandler name="/admin/" - class="org.apache.solr.handler.admin.AdminHandlers"/> - -  - <requestHandler name="/admin/ping" class="PingRequestHandler"> - <lst name="defaults"> - <str name="qt">standard</str> - <str name="q">solrpingquery</str> - <str name="echoParams">all</str> - </lst> - </requestHandler> - -  - <requestHandler name="/debug/dump" class="solr.DumpRequestHandler"> - <lst name="defaults"> - <str name="echoParams">explicit</str> -  - <str name="echoHandler">true</str> - </lst> - </requestHandler> - - - <highlighting> -  -  - <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" - default="true"> - <lst name="defaults"> - <int name="hl.fragsize">100</int> - </lst> - </fragmenter> - -  - <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter"> - <lst name="defaults"> -  - <int name="hl.fragsize">70</int> -  - <float name="hl.regex.slop">0.5</float> -  - <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str> - </lst> - </fragmenter> - </highlighting> - - <queryParser name="lucene" - class="org.nuiton.wikitty.storage.solr.WikittyQueryParser"/> - <queryParser name="wikitty" - class="org.nuiton.wikitty.storage.solr.WikittyQueryParser"/> - -  - -  - -  - <admin> - <defaultQuery>solr</defaultQuery> - -  - </admin> - -</config>

1 0

r152 - trunk/vradi-services-web/src/main/webapp
by echatellier＠users.chorem.org 11 Jan '12

11 Jan '12

Author: echatellier Date: 2012-01-11 12:33:13 +0100 (Wed, 11 Jan 2012) New Revision: 152 Url: http://chorem.org/repositories/revision/vradi/152 Log: Restore jsp code Modified: trunk/vradi-services-web/src/main/webapp/index.jsp Modified: trunk/vradi-services-web/src/main/webapp/index.jsp =================================================================== --- trunk/vradi-services-web/src/main/webapp/index.jsp 2012-01-11 09:55:43 UTC (rev 151) +++ trunk/vradi-services-web/src/main/webapp/index.jsp 2012-01-11 11:33:13 UTC (rev 152) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2010 Codelutin + Copyright (C) 2009 - 2012 Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -28,6 +28,6 @@ <title>Vradi services</title> </head> <body> -Vradi is up and running (<%=org.chorem.vradi.VradiServiceConfigurationn("application.version")%>)... +Vradi is up and running (<%=org.chorem.vradi.VradiServiceConfiguration("application.version")%>)... </body> </html>

1 0

r151 - in trunk: . vradi-swing/src/main/java/org/chorem/vradi/ui/helpers
by jcouteau＠users.chorem.org 11 Jan '12

11 Jan '12

Author: jcouteau Date: 2012-01-11 10:55:43 +0100 (Wed, 11 Jan 2012) New Revision: 151 Url: http://chorem.org/repositories/revision/vradi/151 Log: Use new nuiton-utils Desktop API Modified: trunk/pom.xml trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/helpers/UIHelper.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 16:02:47 UTC (rev 150) +++ trunk/pom.xml 2012-01-11 09:55:43 UTC (rev 151) @@ -118,13 +118,13 @@ <jaxxVersion>2.4</jaxxVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.3-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <wikittyVersion>3.3</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> - <jrstVersion>1.4-SNAPSHOT</jrstVersion> + <jrstVersion>1.5</jrstVersion> <oooVersion>3.2.1</oooVersion> <javamailVersion>1.4.3</javamailVersion> <struts2Version>2.2.3</struts2Version> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/helpers/UIHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/helpers/UIHelper.java 2012-01-09 16:02:47 UTC (rev 150) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/helpers/UIHelper.java 2012-01-11 09:55:43 UTC (rev 151) @@ -45,6 +45,7 @@ import org.chorem.vradi.ui.renderers.VradiI18nTableCellRenderer; import org.jdesktop.swingx.JXTreeTable; import org.nuiton.widget.SwingSession; +import org.nuiton.util.DesktopUtil; import javax.swing.ComboBoxModel; import javax.swing.DefaultComboBoxModel; @@ -196,8 +197,7 @@ if (log.isDebugEnabled()) { log.debug("Browse URI : " + uri.toString()); } - Desktop desktop = Desktop.getDesktop(); - desktop.browse(uri); + DesktopUtil.browse(uri); } }

1 0

r150 - trunk
by echatellier＠users.chorem.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 17:02:47 +0100 (Mon, 09 Jan 2012) New Revision: 150 Url: http://chorem.org/repositories/revision/vradi/150 Log: Update wikitty et nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 10:31:34 UTC (rev 149) +++ trunk/pom.xml 2012-01-09 16:02:47 UTC (rev 150) @@ -118,10 +118,10 @@ <jaxxVersion>2.4</jaxxVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <wikittyVersion>3.3-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.3</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> <jrstVersion>1.4-SNAPSHOT</jrstVersion>

1 0

r149 - trunk
by echatellier＠users.chorem.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 11:31:34 +0100 (Mon, 09 Jan 2012) New Revision: 149 Url: http://chorem.org/repositories/revision/vradi/149 Log: Use snapshot for getObject() methods Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 09:54:56 UTC (rev 148) +++ trunk/pom.xml 2012-01-09 10:31:34 UTC (rev 149) @@ -118,7 +118,7 @@ <jaxxVersion>2.4</jaxxVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.2-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <wikittyVersion>3.3-SNAPSHOT</wikittyVersion>

1 0