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

r141 - trunk
by maven-release＠users.chorem.org 28 Oct '11

28 Oct '11

Author: maven-release Date: 2011-10-28 23:27:00 +0200 (Fri, 28 Oct 2011) New Revision: 141 Url: http://chorem.org/repositories/revision/vradi/141 Log: Update mavenpom4redmine to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 09:51:29 UTC (rev 140) +++ trunk/pom.xml 2011-10-28 21:27:00 UTC (rev 141) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <groupId>org.chorem</groupId>

1 0

r140 - in trunk: . vradi-entities/src/main/java/org/chorem/vradi/entities vradi-entities/src/main/xmi vradi-services/src/test/java/org/chorem/vradi/services/managers vradi-web/src/main/java/org/chorem/vradi/actions
by sletellier＠users.chorem.org 27 Oct '11

27 Oct '11

Author: sletellier Date: 2011-10-27 11:51:29 +0200 (Thu, 27 Oct 2011) New Revision: 140 Url: http://chorem.org/repositories/revision/vradi/140 Log: - Pass to eugene SNAPSHOT - Remove duplicated email field (use login) - Add test using criteria select Added: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java Modified: trunk/pom.xml trunk/vradi-entities/src/main/xmi/vradi.zargo trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/pom.xml 2011-10-27 09:51:29 UTC (rev 140) @@ -116,7 +116,7 @@  <jaxxVersion>2.4</jaxxVersion> - <eugenePluginVersion>2.3.5</eugenePluginVersion> + <eugenePluginVersion>2.4.1-SNAPSHOT</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> Added: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java =================================================================== --- trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java (rev 0) +++ trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java 2011-10-27 09:51:29 UTC (rev 140) @@ -0,0 +1,17 @@ +package org.chorem.vradi.entities; + +/** + * @author sletellier + */ +public class VradiUserImpl extends VradiUserAbstract { + + @Override + public String getEmail() { + return super.getLogin(); + } + + @Override + public void setEmail(String email) { + super.setLogin(email); + } +} Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo =================================================================== (Binary files differ) Modified: trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java =================================================================== --- trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java 2011-10-27 09:51:29 UTC (rev 140) @@ -32,6 +32,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Element; import java.util.ArrayList; import java.util.List; @@ -93,5 +97,11 @@ for (Group groupWithQuery : groupsWithQuery) { Assert.assertTrue(groupWithQuery instanceof Group); } + + // Get all query for group "codelutin" using select + Criteria criteria = Search.query().eq(Group.FQ_FIELD_GROUP_NAME, "codelutin").criteria(); + criteria.setSelect(Group.FQ_FIELD_GROUP_QUERIES); + PagedResult<Query> allByCriteria = wikittyProxy.findAllByCriteria(Query.class, criteria); + Assert.assertEquals(1, allByCriteria.size()); } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-27 09:51:29 UTC (rev 140) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import freemarker.template.utility.Collections12; import java.util.Collections; import javax.mail.MessagingException; import javax.mail.internet.AddressException; @@ -118,9 +117,7 @@ String md5 = StringUtil.encodeMD5(password); newUser.setPassword(md5); - // Login and email are the same in vradi web newUser.setLogin(email); - newUser.setEmail(email); newUser.setNoSend(Collections.EMPTY_SET); newUser.setNoReceived(Collections.EMPTY_SET); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-27 09:51:29 UTC (rev 140) @@ -190,7 +190,7 @@ } // Remove connected user email - recipient.remove(getUser().getEmail()); + recipient.remove(getUser().getLogin()); // Get mail url String url = VradiWebHelper.encodeAndGetUrl(SHOW_INVITATION_ACTION, noteId, sender.getWikittyId(), StringUtils.join(note.getPartners(), ","), message); @@ -205,7 +205,7 @@ } protected List<String> extractEmail(Collection<VradiUser> users) { - List<String> emails = WikittyUtil.getFieldValuesFromFQFieldName(VradiUser.FQ_FIELD_VRADIUSER_EMAIL, users); + List<String> emails = WikittyUtil.getFieldValuesFromFQFieldName(VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, users); return emails; } }

1 0

12 Oct '11

Author: sletellier Date: 2011-10-12 18:20:34 +0200 (Wed, 12 Oct 2011) New Revision: 139 Url: http://chorem.org/repositories/revision/vradi/139 Log: - Refoactor extractId method to WikittyUtils class - Fix some bugs on parteners - Add return links on pages - Add tiltes on pages - Use wikitty field tags Removed: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java 2011-10-12 16:20:34 UTC (rev 139) @@ -129,6 +129,10 @@ return ordinal() - 1; } + public String getValueAsString() { + return String.valueOf(getValue()); + } + public static SendingStatus getStatus(int i) { for (SendingStatus status : values()) { if (status.getValue() == i) { Deleted: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,44 +0,0 @@ -/* - * #%L - * Vradi :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Codelutin - * %% - * 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; - -import org.nuiton.wikitty.entities.BusinessEntity; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * @author sletellier - */ -public class VradiServiceHelper { - - public static List<String> extractIds(Collection<? extends BusinessEntity> beans) { - List<String> ids = new ArrayList<String>(); - for (BusinessEntity bean : beans) { - ids.add(bean.getWikittyId()); - } - return ids; - } -} Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-10-12 16:20:34 UTC (rev 139) @@ -24,6 +24,7 @@ package org.chorem.vradi.beans; import org.chorem.vradi.entities.Form; +import org.nuiton.wikitty.WikittyUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -86,28 +87,16 @@ public FormPagedResult(List<Form> formsToShow, int totalFoundFormNb, int pageToShow, int nbFormsToShow) { this(); - formsIdsToShow = extractIds(formsToShow); + formsIdsToShow = WikittyUtil.getIds(formsToShow); this.totalFoundFormNb = totalFoundFormNb; this.pageToShow = pageToShow; this.nbFormsToShow = nbFormsToShow; } public void setFormsToShow(List<Form> formsToShow) { - setFormsIdsToShow(extractIds(formsToShow)); + setFormsIdsToShow(WikittyUtil.getIds(formsToShow)); } - protected List<String> extractIds(List<Form> formsToShow) { - List<String> formsIds = new ArrayList<String>(); - if (formsToShow != null) { - for (Form form : formsToShow) { - if (form != null) { - formsIds.add(form.getWikittyId()); - } - } - } - return formsIds; - } - public List<String> getFormsIdsToShow() { return formsIdsToShow; } Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java 2011-10-12 16:20:34 UTC (rev 139) @@ -58,7 +58,6 @@ import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.operators.Element; -import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; @@ -1117,7 +1116,7 @@ for (Sending sending : sendings) { if (sending != null) { String userId = user.getWikittyId(); - if (sending != null && userId.equals(sending.getUser())) { + if (userId.equals(sending.getUser())) { if (log.isDebugEnabled()) { log.debug("Sending is existing for queryMaker : " + user.getName()); Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java 2011-10-12 16:20:34 UTC (rev 139) @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.vradi.VradiServiceHelper; import org.chorem.vradi.entities.Form; import org.chorem.vradi.entities.Thesaurus; import org.chorem.vradi.services.VradiException; @@ -87,7 +86,7 @@ List<Thesaurus> thesaurusProposed = thesaurusManager.proposeThesaurus(formId); if (!thesaurusProposed.isEmpty()) { Form form = wikittyProxy.restore(Form.class, formId); - form = formManager.updateForm(form, VradiServiceHelper.extractIds(thesaurusProposed)); + form = formManager.updateForm(form, WikittyUtil.getIds(thesaurusProposed)); // Set form as selected form.setStatus(formManager.getSelectionneStatus().getWikittyId()); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -65,7 +65,7 @@ import static org.nuiton.i18n.I18n._; /** @author letellier */ -public class VradiHelper extends VradiServiceHelper { +public class VradiHelper { private static final Log log = LogFactory.getLog(VradiHelper.class); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -57,7 +58,7 @@ // Return users of clients Collections.sort(users, VradiComparators.USER_COMPARATOR); - return extractIds(users); + return WikittyUtil.getIds(users); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -54,7 +55,7 @@ List<Client> clients = dataService.findAllClients(); Collections.sort(clients, VradiComparators.CLIENT_COMPARATOR); - return extractIds(clients); + return WikittyUtil.getIds(clients); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -51,7 +52,7 @@ VradiDataService dataService = getDataService(dataProvider); List<Client> clients = dataService.findAllClients(); Collections.sort(clients, VradiComparators.CLIENT_COMPARATOR); - return extractIds(clients); + return WikittyUtil.getIds(clients); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -67,7 +68,7 @@ } // Return users of group - return extractIds(users); + return WikittyUtil.getIds(users); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -54,7 +55,7 @@ List<Group> groups = dataService.findAllGroups(); Collections.sort(groups, VradiComparators.GROUP_COMPARATOR); - return extractIds(groups); + return WikittyUtil.getIds(groups); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -52,7 +53,7 @@ List<XmlStream> streamList = dataService.findAllXmlStreams(); Collections.sort(streamList, VradiComparators.XML_STREAM_COMPARATOR); - return extractIds(streamList); + return WikittyUtil.getIds(streamList); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiEntitiesListener; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; import java.util.ArrayList; @@ -55,23 +56,12 @@ @Override public void init(List<B> toCombo, List<B> toList) { - idsInCombo = extractId(toCombo); - idsInList = extractId(toList); + idsInCombo = WikittyUtil.getIds(toCombo); + idsInList = WikittyUtil.getIds(toList); super.init(toCombo, toList); } - protected List<String> extractId(List<B> beans) { - - List<String> ids = new ArrayList<String>(); - if (beans != null) { - for (BusinessEntity bean : beans) { - ids.add(bean.getWikittyId()); - } - } - return ids; - } - protected boolean isLoadedId(String wikittyId) { return idsInCombo.contains(wikittyId) || idsInList.contains(wikittyId); } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -32,6 +32,7 @@ import org.chorem.vradi.services.VradiDataService; import org.chorem.vradi.services.VradiService; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.List; import java.util.Set; @@ -85,7 +86,7 @@ setListDatas(groups); idsInList.clear(); - idsInList.addAll(VradiHelper.extractIds(groups)); + idsInList.addAll(WikittyUtil.getIds(groups)); } protected void updateCombo(String wikittyId) { @@ -98,7 +99,7 @@ setComboDatas(allGroups); idsInCombo.clear(); - idsInCombo.addAll(VradiHelper.extractIds(allGroups)); + idsInCombo.addAll(WikittyUtil.getIds(allGroups)); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -34,6 +34,7 @@ import org.chorem.vradi.services.VradiDataService; import org.chorem.vradi.services.VradiService; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -103,7 +104,7 @@ setListDatas(users); idsInList.clear(); - idsInList.addAll(VradiHelper.extractIds(users)); + idsInList.addAll(WikittyUtil.getIds(users)); return users; } return Collections.EMPTY_LIST; @@ -118,7 +119,7 @@ setComboDatas(allUsers); idsInCombo.clear(); - idsInCombo.addAll(VradiHelper.extractIds(allUsers)); + idsInCombo.addAll(WikittyUtil.getIds(allUsers)); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -338,16 +338,4 @@ // return result; // } - public static List<String> extractIds(Collection<? extends BusinessEntity> entities) { - List<String> ids = new ArrayList<String>(); - if (entities == null) { - return ids; - } - for (BusinessEntity e : entities) { - if (e != null) { - ids.add(e.getWikittyId()); - } - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -72,7 +73,7 @@ Collections.sort(formSorted, VradiComparators.FORM_COMPARATOR); // Return forms - return extractIds(formSorted); + return WikittyUtil.getIds(formSorted); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,6 +33,7 @@ import org.chorem.vradi.ui.email.helpers.EmailDataHelper; import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -68,7 +69,7 @@ Collections.sort(groupSorted, VradiComparators.GROUP_COMPARATOR); // Return groups - return extractIds(groupSorted); + return WikittyUtil.getIds(groupSorted); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -32,6 +32,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -88,7 +89,7 @@ } // Return users of group - return extractIds(users); + return WikittyUtil.getIds(users); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -61,7 +62,7 @@ Collections.sort(userSorted, VradiComparators.USER_COMPARATOR); // Return clients - return extractIds(userSorted); + return WikittyUtil.getIds(userSorted); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,6 +33,7 @@ import org.chorem.vradi.entities.Session; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.email.renderers.EmailFormsListCellRenderer; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; import javax.swing.DefaultListModel; @@ -106,7 +107,7 @@ @Override public void entitiesAdded(Set<Sending> added) { - refreshIfNeeded(VradiHelper.extractIds(added)); + refreshIfNeeded(WikittyUtil.getIds(added)); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -52,6 +52,7 @@ import org.chorem.vradi.ui.offer.models.OfferListTableModel; import org.chorem.vradi.ui.thesaurus.helpers.ThesaurusDataHelper; import org.chorem.vradi.ui.thesaurus.helpers.ThesaurusTreeTableHelper; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyExtension; @@ -572,13 +573,13 @@ // status List<Status> statuses = criterias.getStatusSelection().getSelectedValues(); - List<String> statusIds = VradiHelper.extractIds(statuses); + List<String> statusIds = WikittyUtil.getIds(statuses); queryParameters.setStatusIds(statusIds); // xml streams id List<XmlStream> xmlStreams = criterias.getXmlStreamSelection() .getSelectedValues(); - List<String> streamIds = VradiHelper.extractIds(xmlStreams); + List<String> streamIds = WikittyUtil.getIds(xmlStreams); queryParameters.setStreamIds(streamIds); } @@ -633,12 +634,12 @@ // status (traité/non traité) List<Status> statuses = criterias.getStatusSelection().getSelectedValues(); - List<String> statusIds = VradiHelper.extractIds(statuses); + List<String> statusIds = WikittyUtil.getIds(statuses); queryParameters.setStatusIds(statusIds); // xml stream id List<XmlStream> xmlStreams = criterias.getXmlStreamSelection().getSelectedValues(); - List<String> streamIds = VradiHelper.extractIds(xmlStreams); + List<String> streamIds = WikittyUtil.getIds(xmlStreams); queryParameters.setStreamIds(streamIds); } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java 2011-10-12 16:20:34 UTC (rev 139) @@ -198,12 +198,12 @@ protected void selectThesaurus(ThesaurusTreeHelper helper) { desactiveListener(helper); List<VradiTreeNode> nodes = rootHelper.getSelectedNodes(); - List<String> thesaurusIds = extractIds(nodes); + List<String> thesaurusIds = extractNodeIds(nodes); helper.tryToSelect(thesaurusIds); activeListener(helper); } - protected List<String> extractIds(List<VradiTreeNode> nodes) { + protected List<String> extractNodeIds(List<VradiTreeNode> nodes) { List<String> ids = new ArrayList<String>(); for (VradiTreeNode node : nodes) { ids.add(node.getId()); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -381,18 +381,6 @@ return parents; } - protected List<String> extractIds(List<Thesaurus> beans) { - List<String> ids = new ArrayList<String>(); - if (beans != null) { - for (Thesaurus bean : beans) { - if (bean != null) { - ids.add(bean.getWikittyId()); - } - } - } - return ids; - } - public static RootThesaurus getRootThesaurus(VradiTreeNode node) { if (!node.getInternalClass().equals(RootThesaurus.class)) { return null; Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -379,16 +379,6 @@ return parents; } - protected List<String> extractIds(List<Thesaurus> beans) { - List<String> ids = new ArrayList<String>(); - if (beans != null) { - for (Thesaurus bean : beans) { - ids.add(bean.getWikittyId()); - } - } - return ids; - } - @Override public ThesaurusDataProvider getDataProvider() { return (ThesaurusDataProvider) dataProvider; Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,8 +33,8 @@ import org.chorem.vradi.services.VradiException; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; -import java.util.ArrayList; import java.util.List; /** @author letellier */ @@ -63,7 +63,7 @@ } // Return children - return extractIds(rootThesaurusList); + return WikittyUtil.getIds(rootThesaurusList); } @Override @@ -79,12 +79,4 @@ null, NavHelper.getChildLoador(ThesaurusNodeLoadors.class)); } - - protected List<String> extractIds(List<RootThesaurus> entities) { - List<String> ids = new ArrayList<String>(); - for (RootThesaurus e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,8 +33,8 @@ import org.chorem.vradi.services.VradiException; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.tree.VradiTreeTableNode; +import org.nuiton.wikitty.WikittyUtil; -import java.util.ArrayList; import java.util.List; /** @author letellier */ @@ -71,7 +71,7 @@ } // Return children - return extractIds(rootThesaurusList); + return WikittyUtil.getIds(rootThesaurusList); } @Override @@ -84,12 +84,4 @@ NavHelper.getChildLoador(ThesaurusTreeTableNodeLoadors.class) ); } - - protected List<String> extractIds(List<RootThesaurus> entities) { - List<String> ids = new ArrayList<String>(); - for (RootThesaurus e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,8 +31,8 @@ import org.chorem.vradi.entities.Thesaurus; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; -import java.util.ArrayList; import java.util.List; /** @author letellier */ @@ -53,7 +53,7 @@ public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { List<Thesaurus> thesauruses = VradiService.getVradiDataService().getChildrenThesaurus(parentId); - return extractIds(thesauruses); + return WikittyUtil.getIds(thesauruses); } @@ -71,12 +71,4 @@ NavHelper.getChildLoador(ThesaurusNodeLoadors.class) ); } - - protected List<String> extractIds(List<Thesaurus> entities) { - List<String> ids = new ArrayList<String>(); - for (Thesaurus e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,9 +33,7 @@ import org.chorem.vradi.ui.thesaurus.ThesaurusDataProvider; import org.chorem.vradi.ui.thesaurus.helpers.ThesaurusDataHelper; import org.chorem.vradi.ui.tree.VradiTreeTableNode; -import org.nuiton.wikitty.entities.BusinessEntity; - -import java.util.ArrayList; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collection; import java.util.List; @@ -73,7 +71,7 @@ } } - return extractIds(thesauruses); + return WikittyUtil.getIds(thesauruses); } @Override @@ -86,12 +84,4 @@ NavHelper.getChildLoador(ThesaurusTreeTableNodeLoadors.class) ); } - - protected List<String> extractIds(Collection<? extends BusinessEntity> entities) { - List<String> ids = new ArrayList<String>(); - for (BusinessEntity e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,10 +31,6 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.BusinessEntity; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** @author sletellier <letellier(a)codelutin.com> */ public abstract class AbstractVradiNodeLoadors<B extends BusinessEntity> extends NavTreeNodeChildLoador<String, B, VradiTreeNode> { @@ -67,17 +63,4 @@ null, childLoador); } - - protected List<String> extractIds(Collection<B> entities) { - List<String> ids = new ArrayList<String>(); - if (entities == null) { - return ids; - } - for (BusinessEntity e : entities) { - if (e != null) { - ids.add(e.getWikittyId()); - } - } - return ids; - } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,8 @@ package org.chorem.vradi; +import org.chorem.vradi.entities.FormNote; import org.chorem.vradi.entities.VradiUser; +import org.nuiton.wikitty.WikittyProxy; import java.util.Collection; @@ -20,6 +22,13 @@ // Do nothing return user; } + + @Override + public void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener) { + FormNote formNote = proxy.restore(FormNote.class, formNoteId); + formNote.addPartners(partener.getWikittyId()); + proxy.store(formNote); + } }, // Same mails are send for both @@ -36,6 +45,11 @@ // Do nothing return user; } + + @Override + public void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener) { + // Do nothing + } }, NO_MORE("NoMoreReceived", "vradi.invitation.nomore", EmailType.INVITATION_REJECT, EmailType.INVITATION_CONFIRMATION_REJECT) { @@ -50,6 +64,11 @@ user.addNoSend(to.getWikittyId()); return user; } + + @Override + public void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener) { + // Do nothing + } }; public static final String BUTTON_PREFIX = ".button"; @@ -113,4 +132,6 @@ public abstract VradiUser updateReceivedUserPreference(VradiUser user, VradiUser from); public abstract VradiUser updateSendUserPreference(VradiUser user, VradiUser to); + + public abstract void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener); } \ No newline at end of file Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -5,12 +5,17 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.Sending; import org.nuiton.jrst.JRST; import org.nuiton.util.GZUtil; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.search.PagedResult; /** * Utilities class Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -90,9 +90,11 @@ } } } - log.debug(String.format( - "Accept field '%s' is %s with excludes: %s and includes: %s", - fqfield, result, excludes, includes)); + if (log.isDebugEnabled()) { + log.debug(String.format( + "Accept field '%s' is %s with excludes: %s and includes: %s", + fqfield, result, excludes, includes)); + } return result; } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -58,10 +58,16 @@ try { for (Object key : request.getParameterMap().keySet()) { String k = String.valueOf(key); - log.debug(String.format("Look for field(%s)", k)); + + if (log.isDebugEnabled()) { + log.debug(String.format("Look for field(%s)", k)); + } if (w.hasField(k) && isAcceptable(k)) { Object v = request.getParameter(k); - log.debug(String.format("Put value(%s) in field(%s)", v, k)); + + if (log.isDebugEnabled()) { + log.debug(String.format("Put value(%s) in field(%s)", v, k)); + } w.setFqField(k, v); } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import java.util.Date; import java.util.Set; import org.apache.commons.lang.StringUtils; @@ -87,7 +86,7 @@ formNote = new FormNoteImpl(); formNote.setCreationDate(new Date()); formNote.setForm(getFormId()); - formNote.addPartners(proxy.getUser().getWikittyId()); + formNote.addPartners(getUser().getWikittyId()); formNote.setSummary(StringUtils.trimToEmpty(summary)); formNote.setContent(StringUtils.trimToEmpty(content)); formNote.setSeekingPartner(false); @@ -97,6 +96,10 @@ proxy.store(formNote); } + if (log.isDebugEnabled()) { + log.debug("seeking parteners : " + formNote.getSeekingPartner()); + } + partners = proxy.restore(VradiUser.class, formNote.getPartners()); // Render JRST in HTML Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.FormNote; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -65,7 +65,9 @@ if (redirectTo == null) { redirectTo = "/"; } - log.debug(String.format("Login ok, we go to '%s'", redirectTo)); + if (log.isDebugEnabled()) { + log.debug(String.format("Login ok, we go to '%s'", redirectTo)); + } result = SUCCESS; } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -117,7 +117,11 @@ VradiUserImpl newUser = new VradiUserImpl(); String md5 = StringUtil.encodeMD5(password); newUser.setPassword(md5); + + // Login and email are the same in vradi web newUser.setLogin(email); + newUser.setEmail(email); + newUser.setNoSend(Collections.EMPTY_SET); newUser.setNoReceived(Collections.EMPTY_SET); VradiUser login = proxy.store(newUser); //Stores the new user Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,10 +1,5 @@ package org.chorem.vradi.actions; -import static org.nuiton.i18n.I18n._; - -import com.opensymphony.xwork2.ActionContext; - -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -56,8 +51,11 @@ String result = SUCCESS; WikittyProxy proxy = getProxy(); user = proxy.restore(VradiUser.class, userId); - log.debug(String.format("User '%s' is %s: ", userId, user)); + if (log.isDebugEnabled()) { + log.debug(String.format("User '%s' is %s: ", userId, user)); + } + if (user != null) { // if collection is not initialized put empty collection if (user.getNoSend() == null) { Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,7 +1,7 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import java.util.Arrays; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -9,14 +9,19 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.EmailType; -import org.chorem.vradi.VradiWebConfig; +import org.chorem.vradi.VradiConstants; import org.chorem.vradi.VradiWebHelper; +import org.chorem.vradi.entities.Form; import org.chorem.vradi.entities.FormNote; +import org.chorem.vradi.entities.GroupForms; +import org.chorem.vradi.entities.Sending; import org.chorem.vradi.entities.VradiUser; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Element; /** * @@ -30,6 +35,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(SendInvitationAction.class); + public static final String SHOW_INVITATION_ACTION = "showInvitation"; protected String noteId; @@ -47,6 +53,10 @@ this.noteId = noteId; } + public String getNoteId() { + return noteId; + } + public void setFormReceiver(boolean formReceiver) { this.formReceiver = formReceiver; } @@ -95,7 +105,7 @@ * l'action de recherche de partenaire et non pas a la liste complete * des partenaires deja present sur la note. * - * @return + * @return action result * @throws Exception */ @Override @@ -104,26 +114,47 @@ WikittyProxy proxy = getProxy(); VradiUser sender = getVradiSession().getUser(); FormNote note = proxy.restore(FormNote.class, noteId); + Form form = proxy.restore(Form.class, note.getForm()); Set<String> recipient = new HashSet<String>(); + // User that received form if (formReceiver) { - Criteria c = Search.query() - // FIXME ajouter le critere de recherche des personnes ayant recu ce formulaire + + // Get all group form for this form + Criteria groupFormCriteria = Search.query() + .eq(GroupForms.FQ_FIELD_GROUPFORMS_FORM, note.getForm()) .criteria(); - PagedResult<VradiUser> users = proxy.findAllByCriteria(VradiUser.class, c); - for (VradiUser user : users) { - if (acceptReceiver(sender, user)) { - String email = user.getEmail(); - recipient.add(email); - } - } + List<String> groupFormsId = proxy.findAllIdByCriteria(groupFormCriteria).getAll(); + + // Get all sendings for all groupForms + Criteria snedingCriteria = Search.query() + .contains(Sending.FQ_FIELD_SENDING_GROUPFORMS, groupFormsId) + .or() + .eq(Sending.FIELD_SENDING_STATUS, VradiConstants.SendingStatus.RECEIVED.getValueAsString()) + .eq(Sending.FIELD_SENDING_STATUS, VradiConstants.SendingStatus.SENT.getValueAsString()) + .criteria(); + + PagedResult<Sending> sendings = proxy.findAllByCriteria(Sending.class, snedingCriteria); + List<String> userIds = WikittyUtil.getFieldValuesFromFQFieldName(Sending.FQ_FIELD_SENDING_USER, sendings); + + // Get all users who received form + List<VradiUser> users = proxy.restore(VradiUser.class, userIds); + + // Extract all emails + List<String> emails = extractEmail(users); + recipient.addAll(emails); } + // Other seekers if (seeker) { + + // Get all form notes created for form Criteria c = Search.query() - // FIXME ajouter le critere de recherche des personnes ayant une note sur ce formulaire avec la case seekingPartners a true + .neq(Element.ELT_ID, noteId) + .eq(FormNote.FQ_FIELD_FORMNOTE_FORM, note.getForm()) + .eq(FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER, Boolean.TRUE.toString()) .criteria(); PagedResult<FormNote> notes = proxy.findAllByCriteria(FormNote.class, c); @@ -132,24 +163,22 @@ userIds.addAll(n.getPartners()); } Set<VradiUser> users = proxy.restore(VradiUser.class, userIds); - for (VradiUser user : users) { - if (acceptReceiver(sender, user)) { - String email = user.getEmail(); - recipient.add(email); - } - } + + // Extract all emails + List<String> emails = extractEmail(users); + recipient.addAll(emails); } + // For partners if (partners) { List<VradiUser> users = proxy.restore(VradiUser.class, Arrays.asList(userId)); - for (VradiUser user : users) { - if (acceptReceiver(sender, user)) { - String email = user.getEmail(); - recipient.add(email); - } - } + + // Extract all emails + List<String> emails = extractEmail(users); + recipient.addAll(emails); } + // For invite if (invite) { String[] inviteEmails = inviteEmail.split(","); for (String email : inviteEmails) { @@ -160,8 +189,13 @@ } } + // Remove connected user email + recipient.remove(getUser().getEmail()); + + // Get mail url String url = VradiWebHelper.encodeAndGetUrl(SHOW_INVITATION_ACTION, noteId, sender.getWikittyId(), StringUtils.join(note.getPartners(), ","), message); + // Sending email if (EmailType.OPTION_REQUEST.sendEmail(recipient, sender, message, url, sender.getInfo())) { sendCount = recipient.size(); return SUCCESS; @@ -170,5 +204,8 @@ return ERROR; } - + protected List<String> extractEmail(Collection<VradiUser> users) { + List<String> emails = WikittyUtil.getFieldValuesFromFQFieldName(VradiUser.FQ_FIELD_VRADIUSER_EMAIL, users); + return emails; + } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; @@ -173,8 +172,12 @@ public String sendInvitationResultConfirm() throws Exception { - // Update preference + // Update preference and parteners VradiUser user = invitationResult.updateSendUserPreference(getUser(), getSender()); + + // Update parteners + invitationResult.updateParteners(getProxy(), noteId, getSender()); + setUser(getProxy().store(user)); if (this.invitationResult.sendConfirmEmail(Collections.singleton(getSender().getLogin()), Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-10-12 16:20:34 UTC (rev 139) @@ -62,8 +62,11 @@ redirect = url.toString(); } session.put(LoginAction.REDIRECT_AFTER_LOGIN, redirect); - log.debug(String.format("User not loggued redirect to '%s' and '%s'", + + if (log.isDebugEnabled()) { + log.debug(String.format("User not loggued redirect to '%s' and '%s'", loginRedirect, redirect)); + } // ServletActionContext.getResponse().sendRedirect(loginRedirect); return loginRedirect; } else { Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-10-12 16:20:34 UTC (rev 139) @@ -55,9 +55,9 @@ vradi.template.thesaurus.renamed.title=[Vradi web] Ask to rename thesuaurus vradi.template.webHarvest=User %1$s ask to add webHarvest script '%3$s' with comment \: %2$s vradi.template.webHarvest.title=[Vradi web] Ask to add webHarvest script -vradi.formNoteList.title=Form answers +vradi.formNoteList.title=Answers for form vradi.new.formNote=New answer -vradi.formNote.title=Answer edition +vradi.formNote.title=Answer edition for form vradi.formNote.close=Close this answer vradi.delete=Delete vradi.show=Show @@ -101,4 +101,5 @@ vradi.userPreference.note.close=Closed notes vradi.attachment.update=Update vradi.attachment.history=History -vradi.attachment.delete=Delete \ No newline at end of file +vradi.attachment.delete=Delete +vradi.action.return=Return \ No newline at end of file Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-10-12 16:20:34 UTC (rev 139) @@ -1,5 +1,6 @@ vradi.action.locale.english=Anglais vradi.action.locale.french=Français +vradi.action.return=Retour vradi.action.submit=Soumettre aux administrateurs vradi.add=Ajouter vradi.addfiles.content=Fichier à ajouter @@ -33,8 +34,8 @@ vradi.formNote.close=Fermer la réponse vradi.formNote.seekPartners=Recherche de partenaires vradi.formNote.seekingPartner=Partenaires recherchés -vradi.formNote.title=Edition de la réponse -vradi.formNoteList.title=Réponses du formulaire +vradi.formNote.title=Edition de la réponse pour le formulaire +vradi.formNoteList.title=Réponses pour le formulaire vradi.formView.title=Visualisation d'un formulaire vradi.invitation.accept=L'utilisateur %1$s accèpte de travailler avec vous sur %3$s parce que \: %2$s\n\nPour répondre à cette demande veuillez aller sur la page\:'%4$s'\n"\n\nCordialement. vradi.invitation.accept.button=Accepter @@ -98,7 +99,7 @@ vradi.seekingPartners.inviteEmail=Emails des invités (séparées par des ',') vradi.seekingPartners.partners=Des partenaires d'une autre réponse vradi.seekingPartners.seeker=Ceux qui recherche des partenaires pour cette appel d'offre -vradi.seekingPartners.title=Recherche de partenaires +vradi.seekingPartners.title=Recherche de partenaires pour le formulaire vradi.send=Envoyer vradi.sendInvitation.count=Nombre d'invitations envoyés vradi.sendInvitation.title=Envoi d'invitation Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -1,4 +1,4 @@ -<%-- +<%-- Document : formNote Created on : 21 mai 2011, 11:53:26 Author : poussin @@ -6,15 +6,20 @@ <%@page import="org.chorem.vradi.entities.FormNote"%> <%@ page import="org.chorem.vradi.entities.FormNoteState" %> +<%@ page import="org.chorem.vradi.entities.Form" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> +<%@taglib prefix="ws" uri="/wikitty-struts"%> <!DOCTYPE html> <html> + <s:set name="proxy" value="%{getProxy()}"/> <s:set name="localNoteId" value="formNote.wikittyId"/> + <s:set name="localFormId" value="formNote.form"/> + <s:set name="seekingPartner" value="formNote.seekingPartner"/> <s:set name="localFieldSummary"><%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%></s:set> <s:set name="localFieldContent"><%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%></s:set> <head> @@ -24,7 +29,7 @@ <sj:head jquerytheme="sunny"/> <script type="text/javascript"> function seekingPartnersChange(checkbox) { - var url="<s:url action='edit/#localNoteId' namespace='/ajax'/>"; + var url="<s:url action='edit/%{localNoteId}' namespace='/ajax'/>"; url = url + "?<%=FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER%>=" + checkbox.checked; var xhr=new XMLHttpRequest(); xhr.open('GET', url, true); @@ -33,13 +38,16 @@ </script> </head> <body> - <h1><s:text name="vradi.formNote.title" /></h1> + <s:url id="formNoteListUrl" action="formNoteList/%{localFormId}" namespace="/"/> + <s:a href="%{formNoteListUrl}"><s:text name="vradi.action.return"/></s:a> + <h1><s:text name="vradi.formNote.title" /> :</h1> + <h2><ws:field wikittyId="${localFormId}" proxy="${proxy}" fqFieldName="<%=Form.FQ_FIELD_INFOGENE_OBJET%>"/></h2> <div id="result" hidden="true"> <img id="indicator-result" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </div> <div> <s:url id="closeButtonUrl" - action="edit/#localNoteId" + action="edit/%{localNoteId}" namespace="/ajax"> <s:param name="state"> <%=FormNoteState.CLOSE.getValue()%> @@ -51,7 +59,7 @@ <s:text name="vradi.formNote.close"/> </sj:a> - <s:url id="deleteUrl" action="delete/#localNoteId" namespace="/ajax"/> + <s:url id="deleteUrl" action="delete/%{localNoteId}" namespace="/ajax"/> <sj:a href="%{deleteUrl}" targets="result" indicator="indicator-result" button="true" buttonIcon="ui-icon-gear"><s:text name="vradi.delete"/></sj:a> @@ -86,8 +94,10 @@ <s:set id="seekingPartnerText"> <s:text name="vradi.formNote.seekingPartner"/> </s:set> + <s:checkbox label="%{seekingPartnerText}" - name="formNote.seekingPartners" value="formNote.seekingPartner" + name="formNote.seekingPartners" + value="seekingPartner" onchange="seekingPartnersChange(this);"/> </div> @@ -104,8 +114,10 @@ </s:set> <div> - <sj:tabbedpanel id="tabContainerSummary" animate="true" - collapsible="true" useSelectedTabCookie="true"> + <sj:tabbedpanel id="tabContainerSummary" + animate="true" + collapsible="true"> + <sj:tab id="tabHtmlSummary" target="htmlSummary" label="%{summaryText}"/> <sj:tab id="tabHtmlSummaryEdit" target="htmlSummaryEdit" label="%{editText}"/> @@ -134,8 +146,10 @@ </div> <div> - <sj:tabbedpanel id="tabContainerContent" animate="true" - collapsible="true" useSelectedTabCookie="true"> + <sj:tabbedpanel id="tabContainerContent" + animate="true" + collapsible="true"> + <sj:tab id="tabHtmlContent" target="htmlContent" label="%{summaryText}"/> <sj:tab id="tabHtmlContentEdit" target="htmlContentEdit" label="%{editText}"/> @@ -164,8 +178,10 @@ </div> <div> - <sj:tabbedpanel id="tabContainerFiles" animate="true" - collapsible="true" useSelectedTabCookie="true"> + <sj:tabbedpanel id="tabContainerFiles" + animate="true" + collapsible="true"> + <s:set id="filesText"> <s:text name="vradi.files"/> </s:set> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -1,4 +1,5 @@ -<%-- +<%@ page import="org.chorem.vradi.entities.Form" %> +<%-- Document : formNoteList Created on : 21 mai 2011, 11:39:21 Author : poussin @@ -6,6 +7,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="ws" uri="/wikitty-struts"%> <!DOCTYPE html> <html> @@ -14,17 +16,24 @@ <title><s:text name="vradi.formNoteList.title" /></title> </head> <body> - <h1><s:text name="vradi.formNoteList.title" /></h1> + <s:set name="proxy" value="%{getProxy()}"/> + <h1><s:text name="vradi.formNoteList.title" /> :</h1> + <h2><ws:field wikittyId="${formId}" proxy="${proxy}" fqFieldName="<%=Form.FQ_FIELD_INFOGENE_OBJET%>"/></h2> <ul> <s:iterator value="formNotes" var="note"> - <s:set name="formatedDate" value="%{formatDate(#note.creationDate)}"/> - <li><s:a action="formNote/%{note.wikittyId}" namespace="/"> - <s:property value="formatedDate"/><s:property value="summary"/> + <li> + <s:a action="formNote/%{wikittyId}" namespace="/"> + <s:set name="formatedDate" value="%{formatDate(creationDate)}"/> + <s:property value="formatedDate"/> : <s:property value="summary"/> </s:a> </li> </s:iterator> - <li><s:a action="formNote/new?formId=%{formId}" namespace="/"><s:text name="vradi.new.formNote"/></s:a></li> + <li> + <s:a action="formNote/new?formId=%{formId}" namespace="/"> + <s:text name="vradi.new.formNote"/> + </s:a> + </li> </ul> </body> </html> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -1,4 +1,5 @@ -<%-- +<%@ page import="org.chorem.vradi.entities.Form" %> +<%-- Document : seekPartners Created on : 31 mai 2011, 19:33:28 Author : poussin @@ -8,6 +9,7 @@ <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> +<%@taglib prefix="ws" uri="/wikitty-struts"%> <!DOCTYPE html> <html> @@ -18,7 +20,12 @@ <sj:head jquerytheme="sunny"/> </head> <body> - <h1><s:text name="vradi.seekingPartners.title" /></h1> + <s:url id="formNoteUrl" action="formNote/%{noteId}" namespace="/"/> + <s:a href="%{formNoteUrl}"><s:text name="vradi.action.return"/></s:a> + <h1><s:text name="vradi.seekingPartners.title" /> : </h1> + <s:set name="proxy" value="%{getProxy()}"/> + <s:set name="formId" value="%{note.form}"/> + <h2><ws:field wikittyId="${formId}" proxy="${proxy}" fqFieldName="<%=Form.FQ_FIELD_INFOGENE_OBJET%>"/></h2> <s:form id="seekingPartnersForm" action="sendInvitation" namespace="/" method="POST"> <s:hidden name="noteId"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -18,7 +18,9 @@ <sj:head jquerytheme="sunny"/> </head> <body> + <s:url id="formNoteUrl" action="formNote/%{noteId}" namespace="/"/> + <s:a href="%{formNoteUrl}"><s:text name="vradi.action.return"/></s:a> <h1><s:text name="vradi.sendInvitation.title" /></h1> - <s:text name="vradi.sendInvitation.count" />: <s:property value="sendCount"/> + <s:text name="vradi.sendInvitation.count" /> : <s:property value="sendCount"/> </body> </html>

1 0

r138 - in trunk/vradi-web/src/main: java/org/chorem/vradi/actions webapp/WEB-INF/jsp
by sletellier＠users.chorem.org 11 Oct '11

11 Oct '11

Author: sletellier Date: 2011-10-11 17:25:11 +0200 (Tue, 11 Oct 2011) New Revision: 138 Url: http://chorem.org/repositories/revision/vradi/138 Log: - Remove static getAction method - Clean all jsp pages to only use tags Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 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 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -25,10 +25,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(AttachmentListAction.class); - static public AttachmentListAction getAction() { - return (AttachmentListAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String targetId; /** les fichiers attache a ce target */ protected PagedResult<Attachment> attachments; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -20,10 +20,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(DeleteAction.class); - static public DeleteAction getAction() { - return (DeleteAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String id; public void setId(String id) { Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -21,10 +21,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(EditAction.class); - static public EditAction getAction() { - return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - /** restraint les modifications possibles sur certaine extension */ protected HttpServletRequest request; protected String id; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -25,10 +25,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(FormNoteAction.class); - - static public FormNoteAction getAction() { - return (FormNoteAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } /** used form new formNote */ protected String formId; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -23,10 +23,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(FormNoteListAction.class); - static public FormNoteListAction getAction() { - return (FormNoteListAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String formId; protected PagedResult<FormNote> formNotes; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -35,10 +35,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(RestoreUserAction.class); - static public RestoreUserAction getAction() { - return (RestoreUserAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String userId; protected VradiUser user; protected String infoHtml; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -20,10 +20,6 @@ */ public class SavedQueriesAction extends VradiBaseAction implements ServletRequestAware { - static public SavedQueriesAction getAction() { - return (SavedQueriesAction) ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected HttpServletRequest request; protected List<Query> lastQueries; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -27,10 +27,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(SeekPartnersAction.class); - static public SeekPartnersAction getAction() { - return (SeekPartnersAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String noteId; protected FormNote note; protected Set<VradiUser> partners; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -32,10 +32,6 @@ static private Log log = LogFactory.getLog(SendInvitationAction.class); public static final String SHOW_INVITATION_ACTION = "showInvitation"; - static public SendInvitationAction getAction() { - return (SendInvitationAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String noteId; protected boolean formReceiver; protected boolean seeker; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -34,10 +34,6 @@ static private Log log = LogFactory.getLog(ShowInvitationAction.class); public static final String SHOW_RESULT_INVITATION_ACTION = "showInvitationResult"; - static public ShowInvitationAction getAction() { - return (ShowInvitationAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected HttpServletRequest request; protected String p; protected String noteId; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -26,10 +26,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(ShowInvitationAction.class); - static public ShowInvitationResultAction getAction() { - return (ShowInvitationResultAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected HttpServletRequest request; protected String p; protected String noteId; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -24,10 +24,6 @@ private static final long serialVersionUID = -2886756982077980790L; - static public ThesaurusAction getAction() { - return (ThesaurusAction) ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - public static final String THESAURUS_NAME_REQUEST = "thesaurusNameRequest"; protected List<TreeNode> nodes = new ArrayList<TreeNode>(); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -2,10 +2,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + +import java.util.Date; import java.util.Map; import org.apache.struts2.interceptor.SessionAware; import org.chorem.vradi.VradiSession; import org.chorem.vradi.VradiWebConfig; +import org.chorem.vradi.VradiWebHelper; import org.chorem.vradi.entities.VradiUser; import org.chorem.vradi.services.VradiDataService; import org.nuiton.util.ApplicationConfig; @@ -24,17 +27,6 @@ protected static final Log log = LogFactory.getLog(VradiBaseAction.class); - /** - * Key to find current action in context. - * child can have method - * <pre> - * static public ChildAction getAction() { - * return (ChildAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - * } - * </pre> - */ - protected static final String CONTEXT_ACTION_KEY = "action"; - protected static final String CONTEXT_SELECTED_QUERY_KEY = "selectedQuery"; protected transient Map<String, Object> session; @@ -69,4 +61,8 @@ public ApplicationConfig getConfig() { return VradiWebConfig.getConfig(); } + + public String formatDate(Date date) { + return VradiWebHelper.formatDate(date); + } } \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,33 +4,22 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.entities.Attachment"%> -<%@page import="org.chorem.vradi.actions.AttachmentListAction"%> -<%@ page import="org.chorem.vradi.VradiWebHelper" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -AttachmentListAction action = AttachmentListAction.getAction(); -%> - <div id="actionResult" hidden="true"> <img id="indicator-deleteAttachment" src="/img/indicator.gif" alt="deleting..." style="display:none"/> </div> <ul> - <% for (Attachment a : action.getAttachments()) { - if (a != null) { - String attachmentId = a.getWikittyId(); - ActionContext.getContext().put("localAttachmentId", attachmentId); - %> + <s:iterator value="attachments" var="attachment"> + <li> + <s:set name="formatedDate" value="%{formatDate(#attachment.date)}"/> + <s:property value="#formatedDate"/> <s:a action="raw/%{attachment.wikittyId}/Attachment.content" namespace="/ajax"><s:property value="%{attachment.name}"/></s:a> - <li><%=VradiWebHelper.formatDate(a.getDate())%> <s:a action="raw/%{localAttachmentId}/Attachment.content" namespace="/ajax"><%=a.getName()%></s:a> - - <s:url id="deleteUrl" action="delete/%{localAttachmentId}" namespace="/ajax"/> + <s:url id="deleteUrl" action="delete/%{attachment.wikittyId}" namespace="/ajax"/> <sj:a href="%{deleteUrl}" targets="actionResult" button="true" @@ -40,6 +29,5 @@ <s:text name="vradi.attachment.delete"/> </sj:a> </li> - <% } - } %> + </s:iterator> </ul> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,9 +4,7 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.FormNote"%> -<%@page import="org.chorem.vradi.actions.FormNoteAction"%> <%@ page import="org.chorem.vradi.entities.FormNoteState" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> @@ -14,21 +12,11 @@ <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -FormNoteAction action = FormNoteAction.getAction(); -FormNote formNote = action.getFormNote(); - -ActionContext.getContext().put("localNoteId", formNote.getWikittyId()); -ActionContext.getContext().put("localFieldSummary", FormNote.FQ_FIELD_FORMNOTE_SUMMARY); -ActionContext.getContext().put("localFieldContent", FormNote.FQ_FIELD_FORMNOTE_CONTENT); -ActionContext.getContext().put("localNote", formNote); -ActionContext.getContext().put("localSeekingPartner", formNote.getSeekingPartner()); -ActionContext.getContext().put("localSummary", formNote.getSummary()); -ActionContext.getContext().put("localContent", formNote.getContent()); -%> - <!DOCTYPE html> <html> + <s:set name="localNoteId" value="formNote.wikittyId"/> + <s:set name="localFieldSummary"><%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%></s:set> + <s:set name="localFieldContent"><%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%></s:set> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="vradi.formNote.title" /></title> @@ -36,7 +24,7 @@ <sj:head jquerytheme="sunny"/> <script type="text/javascript"> function seekingPartnersChange(checkbox) { - var url="<s:url action='edit/%{localNoteId}' namespace='/ajax'/>"; + var url="<s:url action='edit/#localNoteId' namespace='/ajax'/>"; url = url + "?<%=FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER%>=" + checkbox.checked; var xhr=new XMLHttpRequest(); xhr.open('GET', url, true); @@ -51,7 +39,7 @@ </div> <div> <s:url id="closeButtonUrl" - action="edit/%{localNoteId}" + action="edit/#localNoteId" namespace="/ajax"> <s:param name="state"> <%=FormNoteState.CLOSE.getValue()%> @@ -63,16 +51,16 @@ <s:text name="vradi.formNote.close"/> </sj:a> - <s:url id="deleteUrl" action="delete/%{localNoteId}" namespace="/ajax"/> + <s:url id="deleteUrl" action="delete/#localNoteId" namespace="/ajax"/> <sj:a href="%{deleteUrl}" targets="result" indicator="indicator-result" button="true" buttonIcon="ui-icon-gear"><s:text name="vradi.delete"/></sj:a> </div> <div> - <% for (String h : formNote.getHistory()) { %> - <div><%=h%></div> - <% } %> + <s:iterator value="formNote.history" var="h"> + <div><s:property value="#h"/></div> + </s:iterator> </div> <div> @@ -99,7 +87,7 @@ <s:text name="vradi.formNote.seekingPartner"/> </s:set> <s:checkbox label="%{seekingPartnerText}" - name="formNote.seekingPartners" value="%{localSeekingPartner}" + name="formNote.seekingPartners" value="formNote.seekingPartner" onchange="seekingPartnersChange(this);"/> </div> @@ -133,7 +121,7 @@ <s:form id="htmlSummaryEditForm" action="rst" namespace="/ajax"> <s:hidden name="id" value="%{localNoteId}"/> <s:hidden name="field" value="%{localFieldSummary}"/> - <s:textarea name="rst" value="%{localSummary}"/> + <s:textarea name="rst" value="%{formNote.summary}"/> <sj:submit id="htmlSummaryEditSubmit" value="%{saveText}" targets="result" @@ -163,7 +151,7 @@ <s:form id="htmlContentEditForm" action="rst" namespace="/ajax"> <s:hidden name="id" value="%{localNoteId}"/> <s:hidden name="field" value="%{localFieldContent}"/> - <s:textarea name="rst" value="%{localContent}"/> + <s:textarea name="rst" value="%{formNote.content}"/> <sj:submit id="htmlContentEditSubmit" value="%{saveText}" targets="result" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,17 +4,9 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.entities.FormNote"%> -<%@page import="org.chorem.vradi.actions.FormNoteListAction"%> -<%@ page import="org.chorem.vradi.VradiWebHelper" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -FormNoteListAction action = FormNoteListAction.getAction(); -%> - <!DOCTYPE html> <html> <head> @@ -25,11 +17,13 @@ <h1><s:text name="vradi.formNoteList.title" /></h1> <ul> - <% for (FormNote note : action.getFormNotes()) { - ActionContext.getContext().put("localNoteId", note.getWikittyId()); - %> - <li><s:a action="formNote/%{localNoteId}" namespace="/"><%=VradiWebHelper.formatDate(note.getCreationDate())%> <%=note.getSummary()%></s:a></li> - <% } %> + <s:iterator value="formNotes" var="note"> + <s:set name="formatedDate" value="%{formatDate(#note.creationDate)}"/> + <li><s:a action="formNote/%{note.wikittyId}" namespace="/"> + <s:property value="formatedDate"/><s:property value="summary"/> + </s:a> + </li> + </s:iterator> <li><s:a action="formNote/new?formId=%{formId}" namespace="/"><s:text name="vradi.new.formNote"/></s:a></li> </ul> </body> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -1,28 +1,18 @@ -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@ page import="org.chorem.vradi.actions.ShowInvitationAction" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -ShowInvitationAction action = ShowInvitationAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSenderId()); -ActionContext.getContext().put("invitationResult", action.getInvitationResult()); -ActionContext.getContext().put("message", action.getMessage()); -%> +<h1><s:property value="title"/></h1> -<h1><%=action.getTitle()%></h1> - <div> - <p><%=action.getContent()%></p> + <p><s:property value="%{action.content}"/></p> </div> <s:form action="sendInvitationResult" namespace="/" theme="simple"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="invitationResult" value="%{invitationResult}"/> - <s:hidden name="message" value="%{message}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId"/> + <s:hidden name="invitationResult"/> + <s:hidden name="message"/> <s:textarea name="messageResult"/> <s:submit id="acceptButton" key="vradi.send"/> </s:form> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -1,30 +1,19 @@ -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@ page import="org.chorem.vradi.actions.ShowInvitationResultAction" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -ShowInvitationResultAction action = ShowInvitationResultAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSenderId()); -ActionContext.getContext().put("invitationResult", action.getInvitationResult()); -ActionContext.getContext().put("message", action.getMessage()); -ActionContext.getContext().put("messageResult", action.getMessageResult()); -%> +<h1><s:property value="title"/></h1> -<h1><%=action.getTitle()%></h1> - <div> - <p><%=action.getContent()%></p> + <p><s:property value="content"/></p> </div> <s:form action="sendInvitationResultConfirm" namespace="/" theme="simple"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="invitationResult" value="%{invitationResult}"/> - <s:hidden name="message" value="%{message}"/> - <s:hidden name="messageResult" value="%{messageResult}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId"/> + <s:hidden name="invitationResult"/> + <s:hidden name="message"/> + <s:hidden name="messageResult"/> <s:textarea name="messageConfirmResult"/> <s:submit id="acceptButton" key="vradi.send"/> </s:form> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -1,16 +1,6 @@ -<%@ page import="com.opensymphony.xwork2.ActionContext" %> -<%@ page import="org.chorem.vradi.entities.Query" %> -<%@ page import="java.util.List" %> -<%@ page import="org.chorem.vradi.actions.SavedQueriesAction" %> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags" %> -<% -SavedQueriesAction action = SavedQueriesAction.getAction(); -List<Query> lastQueries = action.getLastQueries(); -ActionContext.getContext().put("lastQueries", lastQueries); -%> - <s:form id="queryForm" action="searchPanel" namespace="/fragment"> <s:url id="savedQueries" action="savedQueries" namespace="/ajax"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,21 +4,11 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.actions.SeekPartnersAction"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -SeekPartnersAction action = SeekPartnersAction.getAction(); -ActionContext.getContext().put("localPartners", action.getPartners()); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localNoteSummary", action.getNote().getSummary()); - -%> - <!DOCTYPE html> <html> <head> @@ -31,13 +21,13 @@ <h1><s:text name="vradi.seekingPartners.title" /></h1> <s:form id="seekingPartnersForm" action="sendInvitation" namespace="/" method="POST"> - <s:hidden name="noteId" value="%{localNoteId}"/> + <s:hidden name="noteId"/> <s:checkbox name="formReceiver" key="vradi.seekingPartners.formReceiver"/> <s:checkbox name="seeker" key="vradi.seekingPartners.seeker"/> <s:checkbox name="partners" key="vradi.seekingPartners.partners"/> - <s:select size="5" multiple="true" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/> + <s:select size="5" multiple="true" name="userId" list="%{partners}" listKey="wikittyId" listValue="login"/> - <s:set id="showText"> + <s:set var="showText"> <s:text name="vradi.show"/> </s:set> @@ -57,7 +47,7 @@ <s:textarea name="message" value="%{localNoteSummary}" key="vradi.userPreference.info"/> - <s:set id="sendText"> + <s:set var="sendText"> <s:text name="vradi.send"/> </s:set> <s:submit value="%{sendText}"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,17 +4,11 @@ Author : poussin --%> -<%@page import="org.chorem.vradi.actions.SendInvitationAction"%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -SendInvitationAction action = SendInvitationAction.getAction(); -%> - <!DOCTYPE html> <html> <head> @@ -25,6 +19,6 @@ </head> <body> <h1><s:text name="vradi.sendInvitation.title" /></h1> - <s:text name="vradi.sendInvitation.count" />: <%=action.getSendCount()%> + <s:text name="vradi.sendInvitation.count" />: <s:property value="sendCount"/> </body> </html> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,20 +4,11 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.actions.ShowInvitationAction"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -ShowInvitationAction action = ShowInvitationAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSender().getWikittyId()); -ActionContext.getContext().put("message", action.getMessage()); -%> - <!DOCTYPE html> <html> <head> @@ -27,12 +18,13 @@ <sj:head jquerytheme="sunny"/> </head> <body> + <s:set name="sender" value="sender"/> <h1><s:text name="vradi.showInvitation.title" /></h1> <div> - <s:text name="vradi.showInvitation.from"/><%=action.getSender().getLogin()%> + <s:text name="vradi.showInvitation.from"/><s:property value="#sender.login"/> <p> - <%=action.getSenderInfo()%> + <s:property value="senderInfo" escapeHtml="false"/> </p> </div> @@ -41,7 +33,7 @@ <form id="partnersForm" action="fragment/userInfo.action" namespace="/"> <s:select size="5" name="userId" list="partners" listKey="wikittyId" listValue="login"/> - <s:set id="showText"> + <s:set var="showText"> <s:text name="vradi.show"/> </s:set> <sj:submit id="partnersSubmit" @@ -57,14 +49,14 @@ <div> <s:text name="vradi.showInvitation.requestMsg"/> - <p><%=action.getMessageRST()%></p> + <p><s:property value="messageRST" escapeHtml="false"/></p> </div> <div> <s:form id="form" namespace="/fragment" action="invitationResult"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="message" value="%{message}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId" value="%{sender.wikittyId}"/> + <s:hidden name="message"/> <s:url id="invitationResultUrl" namespace="/ajax" action="invitationResultButtons"/> <sj:radio href="%{invitationResultUrl}" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,21 +4,11 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@ page import="org.chorem.vradi.actions.ShowInvitationResultAction" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -ShowInvitationResultAction action = ShowInvitationResultAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSender().getWikittyId()); -ActionContext.getContext().put("message", action.getMessage()); -ActionContext.getContext().put("messageResult", action.getMessageResult()); -%> - <!DOCTYPE html> <html> <head> @@ -31,30 +21,35 @@ <h1><s:text name="vradi.showInvitationConfirm.title" /></h1> <div> - <s:text name="vradi.showInvitationConfirm.from"/><%=action.getSender().getLogin()%> + <s:set name="sender" value="sender"/> + <s:text name="vradi.showInvitationConfirm.from"/><s:property value="%{sender.login}"/> <p> - <%=action.getSenderInfo()%> + <s:property value="senderInfo" escapeHtml="false"/> </p> </div> <div> <s:text name="vradi.showInvitationConfirm.requestMsg"/> - <p><%=action.getMessageRST()%></p> + <p> + <s:property value="messageRST" escapeHtml="false"/> + </p> </div> <div> <s:text name="vradi.showInvitationConfirm.requestConfirmMsg"/> - <p><%=action.getMessageResultRST()%></p> + <p> + <s:property value="messageRST" escapeHtml="false"/> + </p> </div> <div> <s:form id="form" namespace="/fragment" action="invitationResultConfirm"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="message" value="%{message}"/> - <s:hidden name="messageResult" value="%{messageResult}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId" value="%{sender.wikittyId}"/> + <s:hidden name="message"/> + <s:hidden name="messageResult"/> <s:url id="invitationResultConfirmUrl" namespace="/ajax" action="invitationResultConfirmButtons"/> <sj:radio href="%{invitationResultConfirmUrl}" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,24 +4,10 @@ Author : poussin --%> -<%@page import="org.chorem.vradi.actions.RestoreUserAction"%> -<%@page import="org.chorem.vradi.entities.VradiUser"%> -<%@ page import="static org.nuiton.i18n.I18n._" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -RestoreUserAction action = RestoreUserAction.getAction(); -VradiUser user = action.getUser(); -String email = _("vradi.noEmail"); -String info = action.getInfoHtml(); -if (user != null) { - email = user.getLogin(); - info = action.getInfoHtml(); -} -%> +<a href="mailto:${user.email}"><s:property value="%{user.email}"/></a> -<a href="mailto:<%=email%>"><%=email%></a> - -<div><%=info%></div> \ No newline at end of file +<div><s:property value="infoHtml" escapeHtml="false"/></div> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,8 +4,6 @@ Author : poussin --%> -<%@page import="org.chorem.vradi.actions.RestoreUserAction"%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.VradiUser"%> <%@ page import="org.chorem.vradi.entities.Infogene" %> <%@ page import="static org.nuiton.i18n.I18n._" %> @@ -16,18 +14,6 @@ <%@ taglib prefix="ws" uri="/wikitty-struts" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> -<% -RestoreUserAction action = RestoreUserAction.getAction(); -VradiUser user = action.getUser(); -ActionContext.getContext().put("localUserId", user.getWikittyId()); -ActionContext.getContext().put("localUserEmail", user.getLogin()); -ActionContext.getContext().put("localUserInfo", user.getInfo()); -ActionContext.getContext().put("localUserNoSend", user.getNoSend()); -ActionContext.getContext().put("localUserNoReceived", user.getNoReceived()); - -ActionContext.getContext().put("localVradiUserFieldInfo", VradiUser.FQ_FIELD_VRADIUSER_INFO); -%> - <!DOCTYPE html> <html> <head> @@ -60,6 +46,15 @@ </head> <body> + <s:set name="fielUserInfo"><%=VradiUser.FQ_FIELD_VRADIUSER_INFO%></s:set> + <s:set name="fqFieldUserLogin"><%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%></s:set> + <s:set name="fqFieldNoSend"><%=VradiUser.FQ_FIELD_VRADIUSER_NOSEND%></s:set> + <s:set name="fqFieldNoReceived"><%=VradiUser.FQ_FIELD_VRADIUSER_NORECEIVED%></s:set> + + <s:set name="user" value="user"/> + <s:set name="localUserId" value="%{user.wikittyId}"/> + <s:set name="proxy" value="%{getProxy()}"/> + <h1><s:text name="vradi.userPreference.title" /></h1> <div id="actionResult" style="display: none;"></div> @@ -69,11 +64,11 @@ +--> <div> <s:form id="infoForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> - <sj:textarea name="%{localVradiUserFieldInfo}" - value="%{localUserInfo}" + <sj:textarea name="%{fielUserInfo}" + value="%{user.info}" key="vradi.userPreference.info"/> - <s:set id="saveText"> + <s:set var="saveText"> <s:text name="vradi.save"/> </s:set> <sj:submit id="infoFormSubmit" @@ -87,11 +82,11 @@ <img id="indicator-infoFormSubmit" src="/img/indicator.gif" alt="saving..." style="display:none;"/> </div> - <s:set id="showText"> + <s:set var="showText"> <s:text name="vradi.show"/> </s:set> - <s:set id="deleteText"> + <s:set var="deleteText"> <s:text name="vradi.delete"/> </s:set> @@ -105,12 +100,12 @@ <%--</ws:form>--%> <s:form id="noSendForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> - <ws:selectAssociation proxy="<%=action.getProxy()%>" + <ws:selectAssociation proxy="${proxy}" name="userId" size="5" - businessEntity="<%=action.getUser()%>" - fqFieldName="<%=VradiUser.FQ_FIELD_VRADIUSER_NOSEND%>" - descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + businessEntity="${user}" + fqFieldName="${fqFieldNoSend}" + descField="${fqFieldUserLogin}"/> <sj:submit id="noSendFormShowSubmit" @@ -143,12 +138,12 @@ <h2><s:text name="vradi.userPreference.noreceived" /></h2> <s:form id="noReceivedForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> - <ws:selectAssociation proxy="<%=action.getProxy()%>" + <ws:selectAssociation proxy="${proxy}" name="userId" size="5" - businessEntity="<%=action.getUser()%>" - fqFieldName="<%=VradiUser.FQ_FIELD_VRADIUSER_NORECEIVED%>" - descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + businessEntity="${user}" + fqFieldName="${fqFieldNoReceived}" + descField="${fqFieldUserLogin}"/> <sj:submit id="noReceivedFormShowSubmit" @@ -183,8 +178,8 @@ <ws:select name="userId" size="5" - entityValues="<%=action.getPartners()%>" - descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + entityValues="${partners}" + descField="${fqFieldUserLogin}"/> <%--<s:select size="5" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/>--%> <sj:submit @@ -197,7 +192,7 @@ button="true" /> - <s:set id="formText"> + <s:set var="formText"> <s:text name="vradi.userPreference.form"/> </s:set> <sj:submit @@ -224,19 +219,19 @@ <s:url id="resultOpenedUrl" namespace="/ajax" action="formNoteGrid"> <s:param name="opened" value="true"/> </s:url> - <s:set id="creationDateText"> + <s:set var="creationDateText"> <s:text name="vradi.form.creationDate"/> </s:set> - <s:set id="objetText"> + <s:set var="objetText"> <s:text name="vradi.form.object"/> </s:set> - <s:set id="actionText"> + <s:set var="actionText"> <s:text name="vradi.form.action"/> </s:set> - <s:set id="fqCreationDate"> + <s:set var="fqCreationDate"> <%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%> </s:set> - <s:set id="fqObjet"> + <s:set var="fqObjet"> <%=Infogene.FQ_FIELD_INFOGENE_OBJET%> </s:set>

1 0

r137 - trunk/vradi-web/src/main/java/org/chorem/vradi/actions
by sletellier＠users.chorem.org 11 Oct '11

11 Oct '11

Author: sletellier Date: 2011-10-11 15:07:34 +0200 (Tue, 11 Oct 2011) New Revision: 137 Url: http://chorem.org/repositories/revision/vradi/137 Log: Make vradiBaseAction extend org.nuiton.web.struts2.BaseAction Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-10-11 13:01:38 UTC (rev 136) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-10-11 13:07:34 UTC (rev 137) @@ -1,11 +1,7 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.List; import java.util.Map; import org.apache.struts2.interceptor.SessionAware; import org.chorem.vradi.VradiSession; @@ -13,17 +9,16 @@ import org.chorem.vradi.entities.VradiUser; import org.chorem.vradi.services.VradiDataService; import org.nuiton.util.ApplicationConfig; +import org.nuiton.web.struts2.BaseAction; import org.nuiton.wikitty.WikittyProxy; /** - * TODO sletellier 20110519 : move this method to nuiton utils web - * * Base class which must be extended by every action * Overrides the Struts2 methods to render text in order to explicitly show * the missing i18n translations * Allows access to the session and the proxy */ -public class VradiBaseAction extends ActionSupport implements SessionAware { +public class VradiBaseAction extends BaseAction implements SessionAware { private static final long serialVersionUID = 1L; @@ -41,10 +36,9 @@ protected static final String CONTEXT_ACTION_KEY = "action"; protected static final String CONTEXT_SELECTED_QUERY_KEY = "selectedQuery"; - public static final String UNTRANSLATED_MARKER = "???"; - - protected Map<String, Object> session; + protected transient Map<String, Object> session; + @Override public void setSession(Map<String, Object> session) { this.session = session; @@ -75,77 +69,4 @@ public ApplicationConfig getConfig() { return VradiWebConfig.getConfig(); } - - @Override - public String getText(String aTextName) { - String value = super.getText(aTextName); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, String defaultValue) { - String value = super.getText(aTextName, defaultValue); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, String defaultValue, String obj) { - String value = super.getText(aTextName, defaultValue, obj); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, List<?> args) { - String value = super.getText(aTextName, args); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String key, String[] args) { - String value = super.getText(key, args); - return getSafeText(key, value); - } - - @Override - public String getText(String aTextName, String defaultValue, List<?> args) { - String value = super.getText(aTextName, defaultValue, args); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String key, String defaultValue, String[] args) { - String value = super.getText(key, defaultValue, args); - return getSafeText(key, value); - } - - @Override - public String getText(String key, String defaultValue, List<?> args, - ValueStack stack) { - String value = super.getText(key, defaultValue, args, stack); - return getSafeText(key, value); - } - - @Override - public String getText(String key, String defaultValue, String[] args, - ValueStack stack) { - String value = super.getText(key, defaultValue, args, stack); - return getSafeText(key, value); - } - - /** - * Surrounds the non translated keys with a marker to make them visible - * - * @param key i18n key - * @param value text to check - * @return translated text - */ - protected String getSafeText(String key, String value) { - if (StringUtils.isEmpty(value)) { - if (log.isWarnEnabled()) { - log.warn("Key [" + key + "] is not translated"); - } - return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; - } - return value; - } } \ No newline at end of file

1 0

r136 - in trunk: . vradi-services vradi-services/src/main/java/org/chorem/vradi/services vradi-services-web vradi-services-web/src/main/java/org/chorem/vradi/services vradi-services-web/src/main/webapp/WEB-INF vradi-services-web/src/test/java/org/chorem/vradi/services vradi-services-web/src/test/java/org/chorem/vradi/services/util vradi-swing vradi-swing/src/main/java/org/chorem/vradi/services vradi-web vradi-web/src/main/java/org/chorem/vradi vradi-web/src/main/resources
by sletellier＠users.chorem.org 11 Oct '11

11 Oct '11

Author: sletellier Date: 2011-10-11 15:01:38 +0200 (Tue, 11 Oct 2011) New Revision: 136 Url: http://chorem.org/repositories/revision/vradi/136 Log: Use cajo server Removed: trunk/vradi-services-web/src/main/java/org/chorem/vradi/services/VradiWikittyServiceDelegator.java trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java Modified: trunk/pom.xml trunk/vradi-services-web/pom.xml trunk/vradi-services-web/src/main/webapp/WEB-INF/web.xml trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/util/ReindexService.java trunk/vradi-services/pom.xml trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java trunk/vradi-swing/pom.xml trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java trunk/vradi-web/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java trunk/vradi-web/src/main/resources/struts.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/pom.xml 2011-10-11 13:01:38 UTC (rev 136) @@ -116,15 +116,17 @@  <jaxxVersion>2.4</jaxxVersion> + <eugenePluginVersion>2.3.5</eugenePluginVersion> + <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <generatorPluginVersion>2.3.5</generatorPluginVersion> - <wikittyVersion>3.2-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.3-SNAPSHOT</wikittyVersion> + <slf4jVersion>1.6.1</slf4jVersion> + <h2Version>1.2.134</h2Version> <jrstVersion>1.4-SNAPSHOT</jrstVersion> <oooVersion>3.2.1</oooVersion> <javamailVersion>1.4.3</javamailVersion> - <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> <struts2jqueryVersion>3.1.0</struts2jqueryVersion> <servletApiVersion>2.5</servletApiVersion> @@ -136,12 +138,12 @@  <license.licenseName>agpl_v3</license.licenseName> -  - <i18n.bundles>fr_FR,en_GB</i18n.bundles> - <i18n.silent>true</i18n.silent> +  +  +  -  - <i18n.bundleOutputEncoding>ISO-8859-1</i18n.bundleOutputEncoding> +  +  </properties> @@ -168,6 +170,12 @@ </dependency> <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> @@ -283,12 +291,6 @@ <dependency> <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-hessian-client</artifactId> - <version>${wikittyVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-struts</artifactId> <version>${wikittyVersion}</version> </dependency> @@ -365,13 +367,6 @@ </dependency> <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>4.0.6</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> <version>1.2.2</version> @@ -519,7 +514,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${generatorPluginVersion}</version> + <version>${eugenePluginVersion}</version> <dependencies> <dependency> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/vradi-services/pom.xml =================================================================== --- trunk/vradi-services/pom.xml 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-services/pom.xml 2011-10-11 13:01:38 UTC (rev 136) @@ -161,11 +161,6 @@ <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 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2011-10-11 13:01:38 UTC (rev 136) @@ -23,15 +23,13 @@ */ package org.chorem.vradi.services; -import com.caucho.hessian.client.HessianProxyFactory; +import gnu.cajo.utils.extra.TransparentItemProxy; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.vradi.VradiServiceConfiguration; import org.chorem.vradi.VradiServiceConfigurationHelper; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyServiceFactory; /** * VradiServiceFactory. @@ -62,40 +60,38 @@ // check is it's valid url if (isValidUrl(serviceEndpoint)) { + if (log.isInfoEnabled()) { + log.info("Use remote mode with url : " + serviceEndpoint); + } + try { -// Cajo impl -// String cajoEndPoint = serviceEndpoint; -// // cajo url is not http or other protocol, url must start with // -// // example: //localhost:1198/ws -// // remove protocol -// int i = cajoEndPoint.indexOf("://"); -// if (i >= 0) { -// cajoEndPoint = serviceEndpoint.substring(i+1); -// } -// int servicePort = VradiServiceConfigurationHelper.getServicePort(config); -// serviceEndpoint = getServiceURL(cajoEndPoint, servicePort, VradiStorageService.VRADI_SERVICE); -// -// if (log.isInfoEnabled()) { -// log.info("Use remote mode with url : " + serviceEndpoint); -// } -// result = (VradiStorageService) TransparentItemProxy.getItem( -// serviceEndpoint, new Class[]{VradiStorageService.class}); - if (log.isInfoEnabled()) { - log.info("Use remote mode with url : " + serviceEndpoint); + String cajoEndPoint = serviceEndpoint; + // cajo url is not http or other protocol, url must start with // + // example: //localhost:1198/ws + // remove protocol + int i = cajoEndPoint.indexOf("://"); + if (i >= 0) { + cajoEndPoint = serviceEndpoint.substring(i+1); } + int servicePort = VradiServiceConfigurationHelper.getServicePort(config); + serviceEndpoint = getServiceURL(cajoEndPoint, servicePort, 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); + result = (VradiStorageService) TransparentItemProxy.getItem( + serviceEndpoint, new Class[]{VradiStorageService.class}); - // 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, VradiStorageService.VRADI_SERVICE)); + } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't init remote proxy", eee); @@ -120,10 +116,11 @@ /** * Get wikittyService instanciate by vradiService * + * @param vradiService of application * @return wikittyService instanciate */ - public static WikittyService getWikittyService(ApplicationConfig config) { - return WikittyServiceFactory.buildWikittyService(config); + public static WikittyService getWikittyService(VradiStorageService vradiService) { + return vradiService.getWikittyService(); } /** @@ -141,8 +138,9 @@ FileService fileService; String serviceEndpoint = VradiServiceConfigurationHelper.getRemoteEndpoint(config); if (isValidUrl(serviceEndpoint)) { + int servletPort = VradiServiceConfigurationHelper.getServletPort(config); // file service - String fileServiceUrl = getServiceURL(serviceEndpoint, "file"); + String fileServiceUrl = getServiceURL(serviceEndpoint, servletPort, "file"); log.info("File service url : " + fileServiceUrl); fileService = new FileServiceProxy(fileServiceUrl); } else { @@ -162,9 +160,14 @@ * @param serviceEndUrl service small name * @return service full url */ - protected static String getServiceURL(String serviceEndpoint, String serviceEndUrl) { + protected static String getServiceURL(String serviceEndpoint, int port, String serviceEndUrl) { String fullUrl = serviceEndpoint; + // Add port if != 0 + if (port != 0) { + fullUrl += ":" + port; + } + // Warn hessian won't work with double / if (!fullUrl.endsWith("/")) { fullUrl += "/"; Modified: trunk/vradi-services-web/pom.xml =================================================================== --- trunk/vradi-services-web/pom.xml 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-services-web/pom.xml 2011-10-11 13:01:38 UTC (rev 136) @@ -47,11 +47,6 @@ </dependency> <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> Deleted: trunk/vradi-services-web/src/main/java/org/chorem/vradi/services/VradiWikittyServiceDelegator.java =================================================================== --- trunk/vradi-services-web/src/main/java/org/chorem/vradi/services/VradiWikittyServiceDelegator.java 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-services-web/src/main/java/org/chorem/vradi/services/VradiWikittyServiceDelegator.java 2011-10-11 13:01:38 UTC (rev 136) @@ -1,48 +0,0 @@ -/* - * #%L - * Vradi :: Services Web - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 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.chorem.vradi.VradiServiceConfiguration; -import org.nuiton.wikitty.services.WikittyServiceDelegator; - -/** - * Wikitty proxy delegator. - * <p/> - * This delegator exist only because we cannot put instance as hessian service. - * <p/> - * This delegator just delegate everything to a static real wikitty service. - * - * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ - */ -public class VradiWikittyServiceDelegator extends WikittyServiceDelegator { - - public VradiWikittyServiceDelegator() { - super(VradiServiceFactory.getWikittyService(VradiServiceConfiguration.getConfig())); - } -} Modified: trunk/vradi-services-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/vradi-services-web/src/main/webapp/WEB-INF/web.xml 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-services-web/src/main/webapp/WEB-INF/web.xml 2011-10-11 13:01:38 UTC (rev 136) @@ -30,52 +30,54 @@ <display-name>Vradi</display-name> <servlet> - <servlet-name>vradiStorageServlet</servlet-name> - <servlet-class>com.caucho.hessian.server.HessianServlet</servlet-class> - <init-param> - <param-name>home-api</param-name> - <param-value>org.chorem.vradi.services.VradiStorageService</param-value> - </init-param> - <init-param> - <param-name>home-class</param-name> - <param-value>org.chorem.vradi.services.VradiStorageServiceImpl - </param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> - <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.chorem.vradi.services.VradiWikittyServiceDelegator - </param-value> - </init-param> - <load-on-startup>2</load-on-startup> - </servlet> - <servlet> <servlet-name>fileServlet</servlet-name> <servlet-class>org.chorem.vradi.services.FileServlet</servlet-class> </servlet> - <servlet-mapping> - <servlet-name>vradiStorageServlet</servlet-name> - <url-pattern>/vradiservice</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>wikittyServiceServlet</servlet-name> - <url-pattern>/wikittyservice</url-pattern> - </servlet-mapping> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  -  -  -  -  + <listener> + <description>Init</description> + <listener-class>org.chorem.vradi.ApplicationListener</listener-class> + </listener> <servlet-mapping> <servlet-name>fileServlet</servlet-name> Deleted: trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java =================================================================== --- trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java 2011-10-11 13:01:38 UTC (rev 136) @@ -1,204 +0,0 @@ -/* - * #%L - * Vradi :: Services Web - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 Codelutin - * %% - * 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 com.caucho.hessian.client.HessianProxyFactory; -import org.apache.commons.lang.time.DateUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.vradi.VradiConstants; -import org.chorem.vradi.beans.XmlStreamImportResult; -import org.chorem.vradi.entities.Session; -import org.chorem.vradi.entities.SessionImpl; -import org.chorem.vradi.entities.XmlFieldBinding; -import org.chorem.vradi.entities.XmlStream; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.mortbay.jetty.runner.Runner; -import org.nuiton.util.Resource; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.WikittyExtension; - -import java.net.URL; -import java.util.Date; -import java.util.List; - -/** - * VradiHessianStorageTest. - * - * @author $Author$ - * @version $Revision$ $Date$ - * @since 21 févr. 2010 02:13:16 - * - * TODO echatellier 20110629 test desactivé car toujours en echec - * je pense que les wikitty service coté serveur ne s'initialise pas - * avec la bonne configuration, donc tous les tests qui utilisent - * l'index solr ne cherche pas là où il faut - */ -@Ignore -public class VradiHessianStorageTest extends VradiStorageServiceTest { - static final Log log = LogFactory.getLog(VradiHessianStorageTest.class); - - static final String port = "9000"; - - static final String clearUrl = "http://localhost:" + port + "/clearservice"; - - static final String storageUrl = "http://localhost:" + port + "/vradiservice"; - - static final String wikittyUrl = "http://localhost:" + port + "/wikittyservice"; - - static final String fileUrl = "http://localhost:" + port + "/file"; - - static VradiJettyRunner runner; - - public static class VradiJettyRunner extends Runner { - @Override - public void run() throws Exception { - _server.start(); - // Skip join - } - - public void stop() throws Exception { - _server.stop(); - } - } - - @BeforeClass - public static void startServer() throws Exception { - - runner = new VradiJettyRunner(); - - // This is the file to find to get the path of vradi-services-web module - String placeHolder = "/vradi_services_web.place_holder"; - - // Find the file - URL url = Resource.getURL(placeHolder); - - // Remove the file name and folder 'target/test-classes' - String contextPath = url.toString(); - String target = "/target/test-classes"; - contextPath = contextPath.substring(0, contextPath.length() - (placeHolder.length() + target.length())); - - // Add webapp context - contextPath += "/src/test/webapp"; - String[] args = {"--port", port, contextPath}; - runner.configure(args); - - runner.run(); - } - - @AfterClass - public static void stopServer() throws Exception { - runner.stop(); - } - - @Override - @Before - public void clear() throws Exception { - HessianProxyFactory factory = new HessianProxyFactory(); - factory.setHessian2Request(true); - factory.setOverloadEnabled(true); - - log.debug("--clear-----------------------------------------"); - ClearService clearService = (ClearService) factory.create(ClearService.class, clearUrl); - clearService.clear(); - storageService = (VradiStorageService) factory.create(VradiStorageService.class, storageUrl); - WikittyService wikittyService = (WikittyService) factory.create(WikittyService.class, wikittyUrl); - wikittyProxy = new WikittyProxy(wikittyService); - dataService = new VradiDataServiceImpl(config, wikittyProxy); - - // fait avec le proxy > servlet pour tester - fileService = new FileServiceProxy(fileUrl); - } - - @Override - protected XmlStreamImportResult initData(WikittyExtension extension) - throws Exception { - List<XmlFieldBinding> bindings = createXmlBindings(extension); - XmlStream xmlStream = createXmlStream(extension, bindings); - return storageService.importFormsFromXmlStream(xmlStream); - } - - /* - * TODO add doc about this test !!! - * - */ - @Test - public void testPropagation() throws Exception { - - Session session = new SessionImpl(); - - session.setNum(7); - wikittyProxy.getWikitty(session).addExtension( - new WikittyExtension("ouaf", "2.0", (String)null, - WikittyUtil.buildFieldMapExtension( - "Numeric a", - "Numeric b", - "String c"))); - session.setSessionDate(new Date()); - - session.setStatus(VradiConstants.SessionStatus.ACTIVE.getValue()); - - session = wikittyProxy.store(session); - - session.setField("ouaf", "a", 1); - session.setField("ouaf", "b", 1.0); - session.setField("ouaf", "c", "Ouaf"); - session.setNum(1); - session.setSessionDate(DateUtils.addMinutes(new Date(), 15)); - Session sessionService = wikittyProxy.store(session); - - if (session.getWikittyId().equals(sessionService.getWikittyId())) { - int scInt = wikittyProxy.getWikitty(sessionService).getFieldAsInt("ouaf", "a"); - int lcInt = wikittyProxy.getWikitty(session).getFieldAsInt("ouaf", "a"); - - Float scFloat = wikittyProxy.getWikitty(sessionService).getFieldAsFloat("ouaf", "b"); - Float lcFloat = wikittyProxy.getWikitty(session).getFieldAsFloat("ouaf", "b"); - - String scString = wikittyProxy.getWikitty(sessionService).getFieldAsString("ouaf", "c"); - String lcString = wikittyProxy.getWikitty(session).getFieldAsString("ouaf", "c"); - - log.info("testPropagation result, local : " + session.getNum() + " serveur : " + sessionService.getNum()); - log.info("testPropagation result as int, local : " + lcInt + " serveur : " + scInt); - log.info("testPropagation result as float, local : " + lcFloat + " serveur : " + scFloat); - log.info("testPropagation result as String, local : " + lcString + " serveur : " + scString); - log.info("testPropagation result, local : " + session.getSessionDate() + " serveur : " + sessionService.getSessionDate()); - - Assert.assertEquals(session.getNum(), sessionService.getNum()); - Assert.assertEquals(lcInt, scInt); - Assert.assertEquals(lcFloat, scFloat); - Assert.assertEquals(lcString, scString); - Assert.assertEquals(session.getSessionDate(), sessionService.getSessionDate()); - } - - wikittyProxy.delete(session.getWikittyId()); - } - -} Modified: trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/util/ReindexService.java =================================================================== --- trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/util/ReindexService.java 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/util/ReindexService.java 2011-10-11 13:01:38 UTC (rev 136) @@ -24,10 +24,13 @@ package org.chorem.vradi.services.util; -import com.caucho.hessian.client.HessianProxyFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.VradiServiceConfiguration; import org.chorem.vradi.entities.Thesaurus; +import org.chorem.vradi.services.VradiServiceFactory; +import org.chorem.vradi.services.VradiStorageService; +import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -57,13 +60,13 @@ public static void main(String... args) throws MalformedURLException { - HessianProxyFactory factory = new HessianProxyFactory(); - factory.setHessian2Request(true); - factory.setOverloadEnabled(true); + ApplicationConfig config = VradiServiceConfiguration.getConfig(); + VradiStorageService vradiStorageService = VradiServiceFactory.getVradiServiceStorage(config); - WikittyService wikittyService = (WikittyService) factory.create(WikittyService.class, wikittyUrl); - WikittyProxy wikittyProxy = new WikittyProxy(wikittyService); + WikittyService wikittyService = VradiServiceFactory.getWikittyService(vradiStorageService); + WikittyProxy wikittyProxy = VradiServiceFactory.getProxy(wikittyService); + //synEngin(wikittyProxy); //deleteObseleteThesaurus(wikittyProxy); } Modified: trunk/vradi-swing/pom.xml =================================================================== --- trunk/vradi-swing/pom.xml 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-swing/pom.xml 2011-10-11 13:01:38 UTC (rev 136) @@ -86,12 +86,6 @@ </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-hessian-client</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -112,11 +106,6 @@ </dependency> <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - </dependency> - - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <scope>runtime</scope> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java 2011-10-11 13:01:38 UTC (rev 136) @@ -65,7 +65,7 @@ vradiStorageService = VradiServiceFactory.getVradiServiceStorage(configuration); - wikittyService = VradiServiceFactory.getWikittyService(configuration); + wikittyService = VradiServiceFactory.getWikittyService(vradiStorageService); fileService = VradiServiceFactory.getFileService(configuration); Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-web/pom.xml 2011-10-11 13:01:38 UTC (rev 136) @@ -70,6 +70,11 @@ </dependency> <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> </dependency> @@ -189,12 +194,6 @@ </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-hessian-client</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>runtime</scope> Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java 2011-10-11 13:01:38 UTC (rev 136) @@ -4,6 +4,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.Attachment; +import org.chorem.vradi.services.VradiServiceFactory; +import org.chorem.vradi.services.VradiStorageService; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -56,7 +58,8 @@ if (ws == null) { synchronized(VradiProxy.class) { if (ws == null) { - ws = WikittyServiceFactory.buildWikittyService(config); + VradiStorageService vradiServiceStorage = VradiServiceFactory.getVradiServiceStorage(config); + ws = VradiServiceFactory.getWikittyService(vradiServiceStorage); } } } Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-09-22 17:32:28 UTC (rev 135) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-10-11 13:01:38 UTC (rev 136) @@ -4,6 +4,11 @@ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> + + <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" + type="com.opensymphony.xwork2.TextProvider" /> + <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> + <constant name="struts.enable.SlashesInActionNames" value="true"/> <constant name="struts.ognl.allowStaticMethodAccess" value="true"/>

1 0