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

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

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

09 Jan '12

Author: echatellier Date: 2012-01-09 10:54:56 +0100 (Mon, 09 Jan 2012) New Revision: 148 Url: http://chorem.org/repositories/revision/vradi/148 Log: Update nuiton-utils to 2.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 17:21:37 UTC (rev 147) +++ trunk/pom.xml 2012-01-09 09:54:56 UTC (rev 148) @@ -118,7 +118,7 @@ <jaxxVersion>2.4</jaxxVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <wikittyVersion>3.3-SNAPSHOT</wikittyVersion>

1 0

r147 - trunk
by maven-release＠users.chorem.org 04 Jan '12

04 Jan '12

Author: maven-release Date: 2012-01-04 18:21:37 +0100 (Wed, 04 Jan 2012) New Revision: 147 Url: http://chorem.org/repositories/revision/vradi/147 Log: Update mavenpom4redmine to 3.0.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 17:04:52 UTC (rev 146) +++ trunk/pom.xml 2012-01-04 17:21:37 UTC (rev 147) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <groupId>org.chorem</groupId>

1 0

r146 - in trunk: . vradi-services vradi-services/src/main/java/org/chorem/vradi/services
by echatellier＠users.chorem.org 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 18:04:52 +0100 (Wed, 04 Jan 2012) New Revision: 146 Url: http://chorem.org/repositories/revision/vradi/146 Log: Fix server connexion with hessian Modified: trunk/pom.xml trunk/vradi-services/pom.xml trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 16:13:10 UTC (rev 145) +++ trunk/pom.xml 2012-01-04 17:04:52 UTC (rev 146) @@ -495,6 +495,12 @@ <version>${servletApiVersion}</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>4.0.6</version> + </dependency> </dependencies> </dependencyManagement> Modified: trunk/vradi-services/pom.xml =================================================================== --- trunk/vradi-services/pom.xml 2012-01-04 16:13:10 UTC (rev 145) +++ trunk/vradi-services/pom.xml 2012-01-04 17:04:52 UTC (rev 146) @@ -161,6 +161,11 @@ <artifactId>lucene-core</artifactId> </dependency> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + </dependency> + </dependencies> <build> 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-04 16:13:10 UTC (rev 145) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2012-01-04 17:04:52 UTC (rev 146) @@ -23,7 +23,6 @@ */ 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; @@ -31,6 +30,8 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; +import com.caucho.hessian.client.HessianProxyFactory; + /** * VradiServiceFactory. * @@ -66,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 @@ -78,20 +79,20 @@ 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(); -// // Fix : com.caucho.hessian.io.HessianProtocolException: '��' is an unknown code -// factory.setHessian2Request(true); -// // pour que les méthodes aux noms dupliquées fonctionnent (arguments different) -// factory.setOverloadEnabled(true); -// -// // vradi service -// result = (VradiStorageService) factory. -// create(VradiStorageService.class, -// getServiceURL(serviceEndpoint, VradiStorageService.VRADI_SERVICE)); + HessianProxyFactory factory = new HessianProxyFactory(); + // Fix : com.caucho.hessian.io.HessianProtocolException: '��' is an unknown code + factory.setHessian2Request(true); + // pour que les méthodes aux noms dupliquées fonctionnent (arguments different) + factory.setOverloadEnabled(true); + // vradi service + result = (VradiStorageService) factory. + create(VradiStorageService.class, + getServiceURL(serviceEndpoint, 0, VradiStorageService.VRADI_SERVICE)); + } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't init remote proxy", eee);

1 0

r145 - trunk/vradi-entities/src/main/java/org/chorem/vradi/entities
by echatellier＠users.chorem.org 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 17:13:10 +0100 (Wed, 04 Jan 2012) New Revision: 145 Url: http://chorem.org/repositories/revision/vradi/145 Log: Readd constructors. Modified: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java Modified: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java =================================================================== --- trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java 2012-01-04 15:45:00 UTC (rev 144) +++ trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java 2012-01-04 16:13:10 UTC (rev 145) @@ -1,10 +1,34 @@ package org.chorem.vradi.entities; +import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.Wikitty; + /** * @author sletellier */ public class VradiUserImpl extends VradiUserAbstract { + /** + * + */ + public VradiUserImpl() { + super(); + } + + /** + * @param businessEntityImpl + */ + public VradiUserImpl(BusinessEntityImpl businessEntityImpl) { + super(businessEntityImpl); + } + + /** + * @param wikitty + */ + public VradiUserImpl(Wikitty wikitty) { + super(wikitty); + } + @Override public String getEmail() { return super.getLogin();

1 0

r144 - in trunk: vradi-services/src/main/java/org/chorem/vradi/services vradi-services/src/main/java/org/chorem/vradi/services/managers vradi-swing/src/main/java/org/chorem/vradi/ui/admin vradi-web/src/main/java/org/chorem/vradi/actions
by echatellier＠users.chorem.org 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 16:45:00 +0100 (Wed, 04 Jan 2012) New Revision: 144 Url: http://chorem.org/repositories/revision/vradi/144 Log: Fix compilation Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java 2012-01-04 15:45:00 UTC (rev 144) @@ -525,9 +525,11 @@ fields.put(key, extension.getFieldType(key)); } + // FIXME echatellier 20120104 tag value map WikittyExtension fieldOrderedExtension = new WikittyExtension(extension.getName(), extension.getVersion(), + new HashMap<String, String>(), extension.getRequires(), fields); fieldOrderedExtension.setTagValues(extension.getTagValues()); Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java 2012-01-04 15:45:00 UTC (rev 144) @@ -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,7 @@ */ package org.chorem.vradi.services.managers; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiConstants.FormTypeTemplateEnum; @@ -155,8 +156,9 @@ newVersion = WikittyUtil.DEFAULT_VERSION; } - WikittyExtension extension = new WikittyExtension(name, newVersion, - requires, new LinkedHashMap<String, FieldType>(fields)); + // FIXME echatellier 20120104 requires array + WikittyExtension extension = new WikittyExtension(name, newVersion, new HashMap<String, String>(), + requires.toArray(new String[]{}), new LinkedHashMap<String, FieldType>(fields)); if (tagValues != null) { for (Map.Entry<String, String> entry : tagValues.entrySet()) { @@ -415,8 +417,9 @@ WikittyExtension formType; try { + // FIXME echatellier 20120104 tag value map formType = new WikittyExtension(formTypeName, - WikittyUtil.DEFAULT_VERSION, + WikittyUtil.DEFAULT_VERSION, new HashMap<String, String>(), Form.EXT_FORM, new LinkedHashMap<String, FieldType>()); wikittyProxy.storeExtension(formType); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java 2012-01-04 15:45:00 UTC (rev 144) @@ -1148,8 +1148,10 @@ WikittyExtension uiExtension = context.getBean(); String extensionName = uiExtension.getName(); - WikittyExtension newFormType = new WikittyExtension(extensionName, - uiExtension.getVersion(), uiExtension.getRequires(), null); + + // FIXME echatellier 20120104 tag values empty + WikittyExtension newFormType = new WikittyExtension(extensionName, + uiExtension.getVersion(), uiExtension.getTagValues(), uiExtension.getRequires(), null); // Keep all field names List<String> fieldsNames = new ArrayList<String>(); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java 2012-01-04 15:45:00 UTC (rev 144) @@ -42,7 +42,7 @@ public String execute() throws Exception { String result = SUCCESS; if (targetId == null) { - attachments = new PagedResult<Attachment>( + attachments = new PagedResult<Attachment>("", 0, 0, "", null, Collections.EMPTY_LIST); } else { WikittyProxy proxy = getProxy();

1 0

r143 - trunk
by echatellier＠users.chorem.org 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 16:16:56 +0100 (Wed, 04 Jan 2012) New Revision: 143 Url: http://chorem.org/repositories/revision/vradi/143 Log: Switch to eugene stable. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 22:23:07 UTC (rev 142) +++ trunk/pom.xml 2012-01-04 15:16:56 UTC (rev 143) @@ -116,7 +116,7 @@  <jaxxVersion>2.4</jaxxVersion> - <eugenePluginVersion>2.4.1-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion>

1 0