- Simexplorer-si-commits - mailman.cloud.codelutin.com

r545 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 25 Jan '08

25 Jan '08

Author: glandais Date: 2008-01-25 16:16:46 +0000 (Fri, 25 Jan 2008) New Revision: 545 Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java Log: Share common links of detail and history Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-25 16:16:18 UTC (rev 544) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-25 16:16:46 UTC (rev 545) @@ -47,27 +47,12 @@ import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; import fr.cemagref.simexplorer.is.ui.web.tools.AttachmentStreamResponse; -public class ElementDetail extends ElementPage { +public class ElementDetail extends ElementPageDetail { - @Inject - private ComponentResources resources; - - @InjectPage - private ElementExport elementExport; - - @InjectPage - private ElementHistory elementHistory; - - @InjectPage - private ElementDelete elementDelete; - - @InjectPage - private ElementRights elementRights; - public String getWindowTitle() { return ""; } - + /** * Headers of tree grid * @@ -88,38 +73,6 @@ return nodes; } - public Object onExport(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementExport.setup(uuid, version); - return elementExport; - } - - public Object onHistory(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementHistory.setup(uuid, version); - return elementHistory; - } - - public Object onDelete(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementDelete.setup(uuid, version); - return elementDelete; - } - - public Object onRights(String context) { - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - elementRights.setup(uuid, version); - return elementRights; - } - private Object downloadElement(String uuid, String version) { StreamResponse response; @@ -160,55 +113,6 @@ return node; } - private String generateString(String actionCaption, String action, - LoggableElement element) { - String context = element.getMetaData().getUuid() + "," - + element.getMetaData().getVersion(); - Link link = resources.createActionLink(action, false, context); - StringBuffer sb = new StringBuffer(""); - sb.append("<a href=\""); - sb.append(link.toString()); - sb.append("\">"); - sb.append(actionCaption); - sb.append("</a>"); - return sb.toString(); - } - - private String generateActions(LoggableElement element, StringBuilder sb, - String... actions) { - String res; - for (String anAction : actions) { - sb.append("<br>"); - sb.append(generateString(anAction, anAction, element)); - } - sb.append("<br>"); - // TODO add security - sb.append(generateString("rights", "rights", element)); - - res = sb.substring(4); - return res; - } - - private String[] generateStringArray(String s1, String s2, String s3, - LoggableElement element, String... actions) { - List<String> result = new ArrayList<String>(); - result.add(s1); - result.add(s2); - result.add(s3); - String s4 = ""; - StringBuilder sb = new StringBuilder(""); - if (element != null) { - s4 = generateActions(element, sb, actions); - } - result.add(s4); - - return result.toArray(new String[result.size()]); - } - - private String[] generateStringArray(String s1, String s2, String s3) { - return generateStringArray(s1, s2, s3, null); - } - private String generateHeader(String caption) { StringBuilder sb = new StringBuilder(); sb.append("<b>"); @@ -225,8 +129,8 @@ node.setColumns(generateStringArray("Application exploration", getElement().getMetaData().getName(), getElement() - .getMetaData().getVersion().toString(), getElement(), - "export", "history", "delete")); + .getMetaData().getVersion().toString(), getElement() + .getMetaData(), "export", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node1 = new TreeNode(); @@ -265,8 +169,8 @@ explorationDataNode.setColumns(generateStringArray("Exploration data", explorationData.getMetaData().getName(), explorationData - .getMetaData().getVersion().toString(), - explorationData, "history", "delete")); + .getMetaData().getVersion().toString(), explorationData + .getMetaData(), "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -302,8 +206,8 @@ TreeNode res = new TreeNode(); res.setType(TreeNode.TYPE_DOCUMENT); - res.setColumns(generateStringArray("Result", "", "", explorationData, - "download")); + res.setColumns(generateStringArray("Result", "", "", explorationData + .getMetaData(), "download")); return res; } @@ -331,7 +235,7 @@ componentNode.setColumns(generateStringArray("Component", component .getMetaData().getName(), component.getMetaData().getVersion() - .toString(), component, "history", "delete")); + .toString(), component.getMetaData(), "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -374,9 +278,11 @@ TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray("Library", library - .getMetaData().getName(), library.getMetaData() - .getVersion().toString(), library, "download")); + node + .setColumns(generateStringArray("Library", library + .getMetaData().getName(), library.getMetaData() + .getVersion().toString(), library.getMetaData(), + "download")); res.add(node); } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-25 16:16:18 UTC (rev 544) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-25 16:16:46 UTC (rev 545) @@ -22,15 +22,19 @@ import java.util.Comparator; import java.util.List; +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.Link; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; -public class ElementHistory extends ElementPage { +public class ElementHistory extends ElementPageDetail { public class MetadataVersionComparator implements Comparator<MetaDataEntity> { @@ -44,6 +48,9 @@ @Persist private MetaDataEntity[] versions; + @Inject + private ComponentResources resources; + @Override public void setup(String uuid, String version) { super.setup(uuid, version); @@ -58,7 +65,7 @@ public String getWindowTitle() { return ""; } - + /** * Headers of tree grid * @@ -134,7 +141,8 @@ TreeNode node = new TreeNode(); // FIXME date tostring node.setColumns(generateStringArray(mde.getVersion().toString(), mde - .getDescription(), mde.getCreationDate().toString())); + .getDescription(), mde.getCreationDate().toString(), mde, + "export", "delete", "details")); node.setObject(mde.getVersion()); node.setType(TreeNode.TYPE_DOCUMENT); return node; @@ -144,8 +152,4 @@ return (Version) treeNode.getObject(); } - private String[] generateStringArray(String... s) { - return s; - } - } Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-01-25 16:16:46 UTC (rev 545) @@ -0,0 +1,140 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.web.pages; + +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.Link; +import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.ioc.annotations.Inject; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; + +public abstract class ElementPageDetail extends ElementPage { + + @Inject + private ComponentResources resources; + + @InjectPage + private ElementExport elementExport; + + @InjectPage + private ElementHistory elementHistory; + + @InjectPage + private ElementDelete elementDelete; + + @InjectPage + private ElementRights elementRights; + + @InjectPage + private ElementDetail elementDetail; + + public Object onExport(String context) { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + elementExport.setup(uuid, version); + return elementExport; + } + + public Object onHistory(String context) { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + elementHistory.setup(uuid, version); + return elementHistory; + } + + public Object onDelete(String context) { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + elementDelete.setup(uuid, version); + return elementDelete; + } + + public Object onRights(String context) { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + elementRights.setup(uuid, version); + return elementRights; + } + + public Object onDetails(String context) { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + elementDetail.setup(uuid, version); + return elementDetail; + } + + private String generateString(String actionCaption, String action, + MetaDataEntity element) { + String context = element.getUuid() + "," + element.getVersion(); + Link link = resources.createActionLink(action, false, context); + StringBuffer sb = new StringBuffer(""); + sb.append("<a href=\""); + sb.append(link.toString()); + sb.append("\">"); + sb.append(actionCaption); + sb.append("</a>"); + return sb.toString(); + } + + private String generateActions(MetaDataEntity element, String... actions) { + StringBuilder sb = new StringBuilder(""); + + String res; + for (String anAction : actions) { + sb.append("<br>"); + sb.append(generateString(anAction, anAction, element)); + } + sb.append("<br>"); + // TODO add security + sb.append(generateString("rights", "rights", element)); + + res = sb.substring(4); + return res; + } + + protected String[] generateStringArray(String s1, String s2, String s3, + MetaDataEntity element, String... actions) { + List<String> result = new ArrayList<String>(); + result.add(s1); + result.add(s2); + result.add(s3); + String s4 = ""; + if (element != null) { + s4 = generateActions(element, actions); + } + result.add(s4); + + return result.toArray(new String[result.size()]); + } + + protected String[] generateStringArray(String... s) { + return s; + } + +}

1 0

r544 - trunk/simexplorer-is
by glandais＠users.labs.libre-entreprise.org 25 Jan '08

25 Jan '08

Author: glandais Date: 2008-01-25 16:16:18 +0000 (Fri, 25 Jan 2008) New Revision: 544 Modified: trunk/simexplorer-is/pom.xml Log: Fix repo Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-01-25 15:45:14 UTC (rev 543) +++ trunk/simexplorer-is/pom.xml 2008-01-25 16:16:18 UTC (rev 544) @@ -45,7 +45,7 @@ <site> <id>labs</id> <url> - scp://labs.libre-entreprise.org/home/groups/simexplorer-si/htdocs/ + scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2/ </url> </site> </distributionManagement>

1 0

r543 - trunk/simexplorer-is-swing
by glandais＠users.labs.libre-entreprise.org 25 Jan '08

25 Jan '08

Author: glandais Date: 2008-01-25 15:45:14 +0000 (Fri, 25 Jan 2008) New Revision: 543 Modified: trunk/simexplorer-is-swing/ Log: ignore target Property changes on: trunk/simexplorer-is-swing ___________________________________________________________________ Name: svn:ignore - .* + .* target

1 0

r542 - in trunk: simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages simexplorer-is-web/src/java/fr
by glandais＠users.labs.libre-entreprise.org 25 Jan '08

25 Jan '08

Author: glandais Date: 2008-01-25 15:44:03 +0000 (Fri, 25 Jan 2008) New Revision: 542 Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Back.java trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Back.tml Removed: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java trunk/simexplorer-is-web/src/main/webapp/ApplicationExport.tml trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.properties Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is-web/src/main/webapp/ApplicationImport.tml trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml trunk/simexplorer-is-web/src/main/webapp/ElementDetail.tml trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml trunk/simexplorer-is-web/src/main/webapp/GroupList.tml trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml trunk/simexplorer-is-web/src/main/webapp/UserList.tml trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/Login.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserList.properties Log: Rights edit page Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java 2008-01-25 15:44:03 UTC (rev 542) @@ -17,6 +17,8 @@ * ##% */ package fr.cemagref.simexplorer.is.security.credentials; +import java.util.List; + import javax.ejb.Local; import fr.cemagref.simexplorer.is.security.entities.Permission; Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java 2008-01-25 15:44:03 UTC (rev 542) @@ -70,4 +70,6 @@ public void savePermission(Permission p); + public void setPermissions(String uuid, Permission[] permissions); + } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-25 15:44:03 UTC (rev 542) @@ -197,4 +197,13 @@ em.persist(p); } + public void setPermissions(String uuid, Permission[] permissions) { + em.createQuery( + "delete from Permission p where p.businessId=:businessId") + .setParameter("businessId", uuid).executeUpdate(); + for (Permission permission : permissions) { + em.persist(permission); + } + } + } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java 2008-01-25 15:44:03 UTC (rev 542) @@ -17,8 +17,12 @@ * ##% */ package fr.cemagref.simexplorer.is.security.entities; -public class Permission { +import java.io.Serializable; +public class Permission implements Serializable { + + private static final long serialVersionUID = 2753683847549451125L; + private Integer id; private String businessId; private Actor actor; Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-01-25 15:44:03 UTC (rev 542) @@ -20,6 +20,7 @@ import javax.ejb.Remote; import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.security.entities.User; @Remote @@ -97,4 +98,8 @@ public User getLoggedUser(String token) throws SimExplorerServiceException; + public Permission[] getPermissions(String uuid); + + public void setPermissions(String uuid, Permission[] permissions); + } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-01-25 15:44:03 UTC (rev 542) @@ -41,6 +41,7 @@ import fr.cemagref.simexplorer.is.security.dao.DaoSecurity; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.LoginAction; +import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.security.entities.User; @Stateless(name = "AuthenticationService") @@ -74,7 +75,8 @@ */ } - private String computeHash(String clearString) throws SimExplorerServiceException { + private String computeHash(String clearString) + throws SimExplorerServiceException { MessageDigest messageDigest = null; try { messageDigest = MessageDigest.getInstance("SHA-1"); @@ -138,7 +140,8 @@ return group; } - public User saveUser(String token, String login, String mail) throws SimExplorerServiceException { + public User saveUser(String token, String login, String mail) + throws SimExplorerServiceException { User user = new User(); user.setLogin(login); user.setMail(mail); @@ -181,7 +184,8 @@ } } - public String loginUser(String login, String password) throws SimExplorerServiceException { + public String loginUser(String login, String password) + throws SimExplorerServiceException { if (!superAdminCheck) { checkSuperAdmin(); superAdminCheck = true; @@ -211,7 +215,8 @@ dao.deleteToken(token); } - public User requestAccount(String login, String mail) throws SimExplorerServiceException { + public User requestAccount(String login, String mail) + throws SimExplorerServiceException { User user = new User(); user.setLogin(login); user.setMail(mail); @@ -223,14 +228,16 @@ return user; } - public void changePassword(String token, String login, String password) throws SimExplorerServiceException { + public void changePassword(String token, String login, String password) + throws SimExplorerServiceException { User user = getUser(token, login); String passwordHash = computeHash(password); user.setPasswordHash(passwordHash); dao.saveUser(user); } - public void resetPassword(String token, String login) throws SimExplorerServiceException { + public void resetPassword(String token, String login) + throws SimExplorerServiceException { User user = getUser(token, login); String password = generatePassword(); sendMail(login, user.getMail(), password); @@ -329,4 +336,13 @@ dao.updateGroup(realGroup); } + public Permission[] getPermissions(String uuid) { + List<Permission> permissions = dao.getPermissions(uuid); + return permissions.toArray(new Permission[permissions.size()]); + } + + public void setPermissions(String uuid, Permission[] permissions) { + dao.setPermissions(uuid, permissions); + } + } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java 2008-01-25 15:44:03 UTC (rev 542) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.service; import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.security.entities.User; @@ -127,4 +128,14 @@ private Object checkImplemented() { throw new IllegalStateException("not implemented"); } + + public Permission[] getPermissions(String uuid) { + // TODO Auto-generated method stub + return null; + } + + public void setPermissions(String uuid, Permission[] permissions) { + // TODO Auto-generated method stub + + } } \ No newline at end of file Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Back.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Back.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Back.java 2008-01-25 15:44:03 UTC (rev 542) @@ -0,0 +1,35 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.web.components; + +import org.apache.tapestry.annotations.Parameter; + +public class Back { + + @Parameter(required = true) + private String label; + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + +} Deleted: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.java 2008-01-25 15:44:03 UTC (rev 542) @@ -1,24 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.web.pages; - -import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; - -public class ApplicationExport extends UserPage { - -} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2008-01-25 15:44:03 UTC (rev 542) @@ -60,4 +60,8 @@ } } + public String getWindowTitle() { + return ""; + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-01-25 15:44:03 UTC (rev 542) @@ -40,4 +40,8 @@ // return null; // } + public String getWindowTitle() { + return ""; + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-25 15:44:03 UTC (rev 542) @@ -64,6 +64,10 @@ @InjectPage private ElementRights elementRights; + public String getWindowTitle() { + return ""; + } + /** * Headers of tree grid * @@ -143,14 +147,14 @@ private TreeNode generateElement() { TreeNode node = null; - if (element instanceof ExplorationApplication) { + if (getElement() instanceof ExplorationApplication) { node = generateExplorationApplication(); } - if (element instanceof ExplorationData) { - node = generateExplorationData((ExplorationData) element); + if (getElement() instanceof ExplorationData) { + node = generateExplorationData((ExplorationData) getElement()); } - if (element instanceof Component) { - node = generateComponent((Component) element); + if (getElement() instanceof Component) { + node = generateComponent((Component) getElement()); } return node; @@ -219,22 +223,24 @@ node.setType(TreeNode.TYPE_FOLDER); - node.setColumns(generateStringArray("Application exploration", element - .getMetaData().getName(), element.getMetaData().getVersion() - .toString(), element, "export", "history", "delete")); + node.setColumns(generateStringArray("Application exploration", + getElement().getMetaData().getName(), getElement() + .getMetaData().getVersion().toString(), getElement(), + "export", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node1 = new TreeNode(); node1.setType(TreeNode.TYPE_FOLDER); node1.setColumns(generateStringArray("Components", "", "")); - node1.setChildren(generateComponents((ExplorationApplication) element)); + node1 + .setChildren(generateComponents((ExplorationApplication) getElement())); children.add(node1); TreeNode node2 = new TreeNode(); node2.setType(TreeNode.TYPE_FOLDER); node2.setColumns(generateStringArray("Explorations", "", "")); node2 - .setChildren(generateExplorations((ExplorationApplication) element)); + .setChildren(generateExplorations((ExplorationApplication) getElement())); children.add(node2); node.setChildren(children); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-25 15:44:03 UTC (rev 542) @@ -19,6 +19,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.util.Set; import com.healthmarketscience.rmiio.RemoteOutputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteOutputStream; @@ -30,11 +31,17 @@ public class ElementExport extends ElementPage { - public Object onDownloadXML() { + private String attachment; + public String getWindowTitle() { + return ""; + } + + public Object onActionFromDownloadXML() { + Object response; - MetaDataEntity mde = element.getMetaData(); + MetaDataEntity mde = getElement().getMetaData(); ByteArrayOutputStream bos = new ByteArrayOutputStream(); RemoteOutputStreamServer xmlRemoteOutputStream = new SimpleRemoteOutputStream( @@ -54,4 +61,18 @@ return response; } + public Set<String> getAttachments() { + Set<String> result = getElement().getMetaData().getAttachments() + .keySet(); + return result; + } + + public String getAttachment() { + return attachment; + } + + public void setAttachment(String attachment) { + this.attachment = attachment; + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-25 15:44:03 UTC (rev 542) @@ -55,6 +55,10 @@ } } + public String getWindowTitle() { + return ""; + } + /** * Headers of tree grid * Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-01-25 15:44:03 UTC (rev 542) @@ -29,7 +29,7 @@ public abstract class ElementPage extends UserPage { @Persist - protected LoggableElement element; + private LoggableElement element; /** * Prepare page @@ -48,4 +48,8 @@ } } + public LoggableElement getElement() { + return element; + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-01-25 15:44:03 UTC (rev 542) @@ -17,16 +17,265 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import org.apache.tapestry.ComponentResources; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; -import org.apache.tapestry.ioc.annotations.Inject; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; -import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; +import fr.cemagref.simexplorer.is.security.entities.Actor; +import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.Permission; +import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; +import fr.cemagref.simexplorer.is.ui.web.services.GroupValueEncoder; +import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; +import fr.cemagref.simexplorer.is.ui.web.services.UserValueEncoder; public class ElementRights extends ElementPage { + @Persist + private UserValueEncoder userEncoder; + + @Persist + private GroupValueEncoder groupEncoder; + + @Persist + private List<User> ownerUsers; + @Persist + private List<Group> ownerGroups; + + @Persist + private List<User> readUsers; + @Persist + private List<Group> readGroups; + + @Persist + private List<User> writeUsers; + @Persist + private List<Group> writeGroups; + + @Persist + private List<User> adminUsers; + @Persist + private List<Group> adminGroups; + + @InjectPage + private ElementDetail elementDetail; + + public String getWindowTitle() { + return ""; + } + @Override + public void setup(String uuid, String version) { + super.setup(uuid, version); + userEncoder = new UserValueEncoder(getToken()); + groupEncoder = new GroupValueEncoder(getToken()); + ownerUsers = new ArrayList<User>(); + ownerGroups = new ArrayList<Group>(); + + readUsers = new ArrayList<User>(); + readGroups = new ArrayList<Group>(); + + writeUsers = new ArrayList<User>(); + writeGroups = new ArrayList<Group>(); + + adminUsers = new ArrayList<User>(); + adminGroups = new ArrayList<Group>(); + + Permission[] permissions = RemoteSecurityService + .getAuthentificationService().getPermissions( + getElement().getMetaData().getUuid()); + for (Permission permission : permissions) { + if (permission.isOwner() && permission.getActor() instanceof User) { + ownerUsers.add((User) permission.getActor()); + } + if (permission.isCanRead() && permission.getActor() instanceof User) { + readUsers.add((User) permission.getActor()); + } + if (permission.isCanWrite() + && permission.getActor() instanceof User) { + writeUsers.add((User) permission.getActor()); + } + if (permission.isCanAdmin() + && permission.getActor() instanceof User) { + adminUsers.add((User) permission.getActor()); + } + + if (permission.isOwner() && permission.getActor() instanceof Group) { + ownerGroups.add((Group) permission.getActor()); + } + if (permission.isCanRead() + && permission.getActor() instanceof Group) { + readGroups.add((Group) permission.getActor()); + } + if (permission.isCanWrite() + && permission.getActor() instanceof Group) { + writeGroups.add((Group) permission.getActor()); + } + if (permission.isCanAdmin() + && permission.getActor() instanceof Group) { + adminGroups.add((Group) permission.getActor()); + } + } + + } + + private Permission getPermission(Actor actor, + Map<Actor, Permission> permissions) { + Permission permission = permissions.get(actor); + if (permission == null) { + permission = new Permission(); + permission.setActor(actor); + permission.setBusinessId(getElement().getMetaData().getUuid()); + permission.setOwner(false); + permission.setCanRead(false); + permission.setCanWrite(false); + permission.setCanAdmin(false); + permissions.put(actor, permission); + } + return permission; + } + + public Object onSuccess() { + Map<Actor, Permission> permissions = new HashMap<Actor, Permission>(); + + for (User user : ownerUsers) { + getPermission(user, permissions).setOwner(true); + } + for (User user : readUsers) { + getPermission(user, permissions).setCanRead(true); + } + for (User user : writeUsers) { + getPermission(user, permissions).setCanWrite(true); + } + for (User user : adminUsers) { + getPermission(user, permissions).setCanAdmin(true); + } + + for (Group group : ownerGroups) { + getPermission(group, permissions).setOwner(true); + } + for (Group group : readGroups) { + getPermission(group, permissions).setCanRead(true); + } + for (Group group : writeGroups) { + getPermission(group, permissions).setCanWrite(true); + } + for (Group group : adminGroups) { + getPermission(group, permissions).setCanAdmin(true); + } + + Permission[] permissionsArray = permissions.values().toArray( + new Permission[permissions.values().size()]); + + RemoteSecurityService.getAuthentificationService().setPermissions( + getElement().getMetaData().getUuid(), permissionsArray); + + return elementDetail; + } + + public List<User> getUsers() { + List<User> result = new ArrayList<User>(); + try { + User[] users = RemoteSecurityService.getAuthentificationService() + .getUsers(getToken()); + result.addAll(Arrays.asList(users)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + return result; + } + + public List<Group> getGroups() { + List<Group> result = new ArrayList<Group>(); + try { + Group[] groups = RemoteSecurityService.getAuthentificationService() + .getGroups(getToken()); + result.addAll(Arrays.asList(groups)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + + return result; + } + + public List<User> getOwnerUsers() { + return ownerUsers; + } + + public void setOwnerUsers(List<User> ownerUsers) { + this.ownerUsers = ownerUsers; + } + + public List<User> getReadUsers() { + return readUsers; + } + + public void setReadUsers(List<User> readUsers) { + this.readUsers = readUsers; + } + + public List<Group> getReadGroups() { + return readGroups; + } + + public void setReadGroups(List<Group> readGroups) { + this.readGroups = readGroups; + } + + public List<User> getWriteUsers() { + return writeUsers; + } + + public void setWriteUsers(List<User> writeUsers) { + this.writeUsers = writeUsers; + } + + public List<Group> getWriteGroups() { + return writeGroups; + } + + public void setWriteGroups(List<Group> writeGroups) { + this.writeGroups = writeGroups; + } + + public List<User> getAdminUsers() { + return adminUsers; + } + + public void setAdminUsers(List<User> adminUsers) { + this.adminUsers = adminUsers; + } + + public List<Group> getAdminGroups() { + return adminGroups; + } + + public void setAdminGroups(List<Group> adminGroups) { + this.adminGroups = adminGroups; + } + + public UserValueEncoder getUserEncoder() { + return userEncoder; + } + + public GroupValueEncoder getGroupEncoder() { + return groupEncoder; + } + + public List<Group> getOwnerGroups() { + return ownerGroups; + } + + public void setOwnerGroups(List<Group> ownerGroups) { + this.ownerGroups = ownerGroups; + } + } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-25 15:44:03 UTC (rev 542) @@ -54,6 +54,10 @@ @Persist private GroupValueEncoder groupEncoder; + public String getWindowTitle() { + return ""; + } + void setup(int groupId) { this.usersInGroup = new ArrayList<User>(); this.groupsInGroup = new ArrayList<Group>(); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-25 15:44:03 UTC (rev 542) @@ -49,6 +49,10 @@ @InjectPage private GroupEdit groupEdit; + public String getWindowTitle() { + return ""; + } + void pageLoaded() { model = beanModelSource.create(Group.class, true, resources); List<String> wantedProperties = new ArrayList<String>(); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-25 15:44:03 UTC (rev 542) @@ -63,6 +63,10 @@ private Group group; + public String getWindowTitle() { + return ""; + } + void pageLoaded() { groupModel = beanModelSource.create(Group.class, true, resources); List<String> wantedProperties = new ArrayList<String>(); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-25 15:44:03 UTC (rev 542) @@ -49,6 +49,10 @@ @InjectPage private UserEdit userEdit; + public String getWindowTitle() { + return ""; + } + void pageLoaded() { model = beanModelSource.create(User.class, true, resources); List<String> wantedProperties = new ArrayList<String>(); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-25 15:44:03 UTC (rev 542) @@ -81,6 +81,8 @@ abstract boolean hasAccessToPage(); + public abstract String getWindowTitle(); + public User getUserLogged() { return user; } Deleted: trunk/simexplorer-is-web/src/main/webapp/ApplicationExport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ApplicationExport.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/ApplicationExport.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,4 +0,0 @@ -<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> - -</t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ApplicationImport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ApplicationImport.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/ApplicationImport.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,5 +1,5 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> <t:form> <t:errors/> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,4 +1,10 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> + <p>${message:confirmdelete}</p> + <p><t:actionlink t:id="confirm">${message:confirm}</t:actionlink> - + <t:back label="${message:cancel}" /></p> + + <p><t:back label="${message:back}" /></p> + </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementDetail.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementDetail.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/ElementDetail.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,5 +1,5 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> <table t:type="cl/TreeGrid" source="nodes" columnHeaders="headers"> </table> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,7 +1,19 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> - <p><t:actionlink t:id="downloadXML">${message:downloadxml}</t:actionlink>* + <p><t:actionlink t:id="downloadXML">${message:downloadxml}</t:actionlink> </p> + <p> + <h2>${message:attachments}</h2> + <br /> + <table t:type="Grid" source="attachments" row="attachment"> + <t:parameter name="empty"> + ${message:noAttachment} + </t:parameter> + </table> + </p> + + <p><t:back label="${message:back}" /></p> + </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,7 +1,9 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> - <table t:type="cl/TreeGrid" source="versions" columnHeaders="headers"> - </table> - + <table t:type="cl/TreeGrid" source="versions" columnHeaders="headers"> + </table> + + <p><t:back label="${message:back}" /></p> + </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,4 +1,52 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> + <t:form> + + <p> + <h2>${message:properties}</h2> + </p> + <p></p> + <hr /> + + <p> + <h2>${message:owner}</h2> + </p> + <p><input t:type="Palette" model="users" selected="ownerUsers" + encoder="userEncoder" />${message:groups} :<input t:type="Palette" + model="groups" selected="ownerGroups" encoder="groupEncoder" /></p> + <hr /> + + <p> + <h2>${message:read}</h2> + </p> + <p>${message:users} :<input t:type="Palette" model="users" + selected="readUsers" encoder="userEncoder" />${message:groups} :<input + t:type="Palette" model="groups" selected="readGroups" + encoder="groupEncoder" /></p> + <hr /> + + <p> + <h2>${message:write}</h2> + </p> + <p>${message:users} :<input t:type="Palette" model="users" + selected="writeUsers" encoder="userEncoder" />${message:groups} :<input + t:type="Palette" model="groups" selected="writeGroups" + encoder="groupEncoder" /></p> + <hr /> + + <p> + <h2>${message:admin}</h2> + </p> + <p>${message:users} :<input t:type="Palette" model="users" + selected="adminUsers" encoder="userEncoder" />${message:groups} :<input + t:type="Palette" model="groups" selected="adminGroups" + encoder="groupEncoder" /></p> + <hr /> + + <p><input t:type="Submit" t:value="message:submit" /> <t:back + label="${message:back}" /></p> + + </t:form> + </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,11 +1,9 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> <t:form> <t:errors /> - <t:errors /> - <p>${message:name} : <input t:type="TextField" t:id="name" t:validate="required,minlength=3" t:value="group.name" size="30" /></p> Modified: trunk/simexplorer-is-web/src/main/webapp/GroupList.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,5 +1,5 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> <table t:type="Grid" source="groups" row="group" model="model"> <t:parameter name="editCell"> Modified: trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,5 +1,5 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> <t:form> <t:errors /> Modified: trunk/simexplorer-is-web/src/main/webapp/UserList.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/UserList.tml 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/main/webapp/UserList.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -1,5 +1,5 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" - title="message:windowtitle"> + title="${windowtitle}"> <table t:type="Grid" source="users" row="user" model="model"> Added: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties (rev 0) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-01-25 15:44:03 UTC (rev 542) @@ -0,0 +1,45 @@ +explorationapplication=Exploration application +library=Library + +back=Back +cancel=Cancel +confirm=Confirm +submit=Submit +modify=Modify +delete=Delete +add=Add +remove=Remove +login=Login +upload=Upload + +confirmdelete=Confirm delete? +resetPassword=Reset password + +name=Name +user=User +password=Password +firstname=First name +mail=Mail +properties=Properties + +groups=Groups + +userMembers=User members +groupMembers=Group members + +addgroup=Add group +adduser=Add user + +memberOf=Member of +ownerOf=Owner of +none=None +owner=Owner +read=Read +write=Write +admin=Admin +users=Users + +downloadxml=Download XML +noAttachment=No attachment +attachments=Attachments + Added: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Back.tml =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Back.tml (rev 0) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Back.tml 2008-01-25 15:44:03 UTC (rev 542) @@ -0,0 +1,5 @@ +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> +<body> +<t:pagelink page="ElementDetail">${label}</t:pagelink> +</body> +</html> \ No newline at end of file Deleted: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationExport.properties =================================================================== Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.properties 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.properties 2008-01-25 15:44:03 UTC (rev 542) @@ -1,4 +1 @@ windowtitle=Import -upload=Upload -explorationapplication=Exploration application -library=Library \ No newline at end of file Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties 2008-01-25 15:44:03 UTC (rev 542) @@ -1,6 +1 @@ windowtitle=Edit group -name=Name -userMembers=User members -groupMembers=Group members -cancel=Cancel -submit=Submit \ No newline at end of file Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.properties 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.properties 2008-01-25 15:44:03 UTC (rev 542) @@ -1,5 +1 @@ windowtitle=Manage groups -name=Name -modify=Modify -delete=Delete -addgroup=Add group \ No newline at end of file Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/Login.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/Login.properties 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/Login.properties 2008-01-25 15:44:03 UTC (rev 542) @@ -1,4 +1 @@ windowtitle=Login -user=User -password=Password -login=Login Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties 2008-01-25 15:44:03 UTC (rev 542) @@ -1,14 +1 @@ windowtitle=Edit user -name=Name -firstname=First name -mail=Mail -groups=Groups -add=Add -remove=Remove -submit=Submit -cancel=Cancel -password=Password -resetPassword=Reset password -memberOf=Member of -ownerOf=Owner of -none=None \ No newline at end of file Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserList.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserList.properties 2008-01-25 11:06:29 UTC (rev 541) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserList.properties 2008-01-25 15:44:03 UTC (rev 542) @@ -1,6 +1 @@ windowtitle=Manage users -name=Name -firstname=First name -modify=Modify -delete=Delete -adduser=Add user \ No newline at end of file

1 0

r541 - in trunk: simexplorer-is-ear simexplorer-is-web
by glandais＠users.labs.libre-entreprise.org 25 Jan '08

25 Jan '08

Author: glandais Date: 2008-01-25 11:06:29 +0000 (Fri, 25 Jan 2008) New Revision: 541 Modified: trunk/simexplorer-is-ear/pom.xml trunk/simexplorer-is-web/pom.xml Log: EAR size optimization Modified: trunk/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is-ear/pom.xml 2008-01-25 10:24:40 UTC (rev 540) +++ trunk/simexplorer-is-ear/pom.xml 2008-01-25 11:06:29 UTC (rev 541) @@ -36,7 +36,19 @@ </build> <dependencies> +  <dependency> + <groupId>tapestry5-treegrid</groupId> + <artifactId>tapestry5-treegrid</artifactId> + <version>0.0.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + <version>5.0.7</version> + </dependency> + + <dependency> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-service</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-01-25 10:24:40 UTC (rev 540) +++ trunk/simexplorer-is-web/pom.xml 2008-01-25 11:06:29 UTC (rev 541) @@ -27,6 +27,15 @@ <warSourceDirectory> ${basedir}/src/main/webapp </warSourceDirectory> + <warSourceExcludes> + WEB-INF/lib/*.jar + </warSourceExcludes> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> </configuration> </plugin>

1 0

r540 - in trunk: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/page
by glandais＠users.labs.libre-entreprise.org 25 Jan '08

25 Jan '08

Author: glandais Date: 2008-01-25 10:24:40 +0000 (Fri, 25 Jan 2008) New Revision: 540 Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityEqualsTestCase.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteService.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml Log: Better exception handling in web app Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-01-25 10:24:40 UTC (rev 540) @@ -25,55 +25,76 @@ @Remote public interface AuthenticationService { - public String loginUser(String login, String password); + public String loginUser(String login, String password) + throws SimExplorerServiceException; - public void closeSessionTimer(String token); + public void closeSessionTimer(String token) + throws SimExplorerServiceException; - public User requestAccount(String login, String mail); + public User requestAccount(String login, String mail) + throws SimExplorerServiceException; - public User saveUser(String token, String login, String mail); + public User saveUser(String token, String login, String mail) + throws SimExplorerServiceException; - public void resetPassword(String token, String login); + public void resetPassword(String token, String login) + throws SimExplorerServiceException; - public void changePassword(String token, String login, String password); + public void changePassword(String token, String login, String password) + throws SimExplorerServiceException; - public User getUser(String token, Integer id); + public User getUser(String token, Integer id) + throws SimExplorerServiceException; - public User getUser(String token, String login); + public User getUser(String token, String login) + throws SimExplorerServiceException; - public User updateUser(String token, User user); + public User updateUser(String token, User user) + throws SimExplorerServiceException; - public void deleteUser(String token, Integer id); + public void deleteUser(String token, Integer id) + throws SimExplorerServiceException; - public User[] getUsers(String token); + public User[] getUsers(String token) throws SimExplorerServiceException; - public User[] getUsersOfGroup(String token, Group group); + public User[] getUsersOfGroup(String token, Group group) + throws SimExplorerServiceException; public void setUsersOfGroup(String token, Group group, - Integer[] usersInGroup); + Integer[] usersInGroup) throws SimExplorerServiceException; - public void setGroupsOfGroup(String token, Group group, Integer[] groupsIds); + public void setGroupsOfGroup(String token, Group group, Integer[] groupsIds) + throws SimExplorerServiceException; - public Group[] getGroupsOfUser(String token, User user); + public Group[] getGroupsOfUser(String token, User user) + throws SimExplorerServiceException; - public Group[] getGroupsOfGroup(String token, Group group); + public Group[] getGroupsOfGroup(String token, Group group) + throws SimExplorerServiceException; - public void setGroupsOfUser(String token, User user, Integer[] groupsIds); + public void setGroupsOfUser(String token, User user, Integer[] groupsIds) + throws SimExplorerServiceException; - public Group saveGroup(String token, String name, User owner); + public Group saveGroup(String token, String name, User owner) + throws SimExplorerServiceException; - public Group getGroup(String token, Integer id); + public Group getGroup(String token, Integer id) + throws SimExplorerServiceException; - public Group getGroup(String token, String name); + public Group getGroup(String token, String name) + throws SimExplorerServiceException; - public Group updateGroup(String token, Group group); + public Group updateGroup(String token, Group group) + throws SimExplorerServiceException; - public void deleteGroup(String token, Integer id); + public void deleteGroup(String token, Integer id) + throws SimExplorerServiceException; - public Group[] getGroups(String token); + public Group[] getGroups(String token) throws SimExplorerServiceException; - public Group[] getGroupsOwnedBy(String token, User user); + public Group[] getGroupsOwnedBy(String token, User user) + throws SimExplorerServiceException; - public User getLoggedUser(String token); + public User getLoggedUser(String token) throws SimExplorerServiceException; } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-01-25 10:24:40 UTC (rev 540) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.service; import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -73,12 +74,12 @@ */ } - private String computeHash(String clearString) { + private String computeHash(String clearString) throws SimExplorerServiceException { MessageDigest messageDigest = null; try { messageDigest = MessageDigest.getInstance("SHA-1"); - } catch (Exception e) { - // TODO: handle exception + } catch (NoSuchAlgorithmException e) { + throw new SimExplorerServiceException(e); } messageDigest.reset(); messageDigest.update(clearString.getBytes()); @@ -137,7 +138,7 @@ return group; } - public User saveUser(String token, String login, String mail) { + public User saveUser(String token, String login, String mail) throws SimExplorerServiceException { User user = new User(); user.setLogin(login); user.setMail(mail); @@ -166,7 +167,7 @@ return loggedUser; } - private void checkSuperAdmin() { + private void checkSuperAdmin() throws SimExplorerServiceException { if (dao.getUser("superadmin") == null) { User user = new User(); user.setLogin("superadmin"); @@ -180,7 +181,7 @@ } } - public String loginUser(String login, String password) { + public String loginUser(String login, String password) throws SimExplorerServiceException { if (!superAdminCheck) { checkSuperAdmin(); superAdminCheck = true; @@ -210,7 +211,7 @@ dao.deleteToken(token); } - public User requestAccount(String login, String mail) { + public User requestAccount(String login, String mail) throws SimExplorerServiceException { User user = new User(); user.setLogin(login); user.setMail(mail); @@ -222,14 +223,14 @@ return user; } - public void changePassword(String token, String login, String password) { + public void changePassword(String token, String login, String password) throws SimExplorerServiceException { User user = getUser(token, login); String passwordHash = computeHash(password); user.setPasswordHash(passwordHash); dao.saveUser(user); } - public void resetPassword(String token, String login) { + public void resetPassword(String token, String login) throws SimExplorerServiceException { User user = getUser(token, login); String password = generatePassword(); sendMail(login, user.getMail(), password); Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityEqualsTestCase.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityEqualsTestCase.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityEqualsTestCase.java 2008-01-25 10:24:40 UTC (rev 540) @@ -44,7 +44,7 @@ } - public void testHashCode() { + public void testHashCode() throws SimExplorerServiceException { String token = authenticationService.loginUser("superadmin", "password"); User[] users1 = authenticationService.getUsers(token); User[] users2 = authenticationService.getUsers(token); Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java 2008-01-25 10:24:40 UTC (rev 540) @@ -45,7 +45,7 @@ } - public void testSecurityEntities() { + public void testSecurityEntities() throws SimExplorerServiceException { /* User user = authenticationService.getUser("user3"); Group[] groups = authenticationService.getGroupsOfUser(user); Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java 2008-01-25 10:24:40 UTC (rev 540) @@ -0,0 +1,40 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.web; + +public class SimExplorerWebException extends RuntimeException { + + private static final long serialVersionUID = 4644835311729988659L; + + public SimExplorerWebException() { + super(); + } + + public SimExplorerWebException(Throwable cause) { + super(cause); + } + + public SimExplorerWebException(String message) { + super(message); + } + + public SimExplorerWebException(String message, Throwable cause) { + super(message, cause); + } + +} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-01-25 10:24:40 UTC (rev 540) @@ -102,12 +102,12 @@ return elementList; } - public Object onActionFromApplicationList() throws Exception { + public Object onActionFromApplicationList() { elementList.searchQuery(null); return elementList; } - public Object onActionFromLogout() throws Exception { + public Object onActionFromLogout() { token = null; return elementList; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-01-25 10:24:40 UTC (rev 540) @@ -21,6 +21,8 @@ import org.apache.tapestry.grid.GridDataSource; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; /** @@ -85,9 +87,8 @@ result = RemoteStorageService.getStorageService() .findFullTextCount(token, query, false); } - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } return result; } @@ -111,19 +112,19 @@ */ public void prepare(int startIndex, int endIndex, PropertyModel sortModel, boolean ascending) { - try { - this.indexStart = startIndex; + this.indexStart = startIndex; - int dateOrder = 0; - if (sortModel != null - && "creationDate".equals(sortModel.getPropertyName())) { - if (ascending) { - dateOrder = 1; - } else { - dateOrder = -1; - } + int dateOrder = 0; + if (sortModel != null + && "creationDate".equals(sortModel.getPropertyName())) { + if (ascending) { + dateOrder = 1; + } else { + dateOrder = -1; } + } + try { if (query.equals("")) { entities = RemoteStorageService.getStorageService() .findApplications(token, false, startIndex, @@ -133,11 +134,8 @@ .findFullText(token, query, false, startIndex, 1 + endIndex - startIndex, dateOrder); } - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - this.indexStart = 0; - entities = new MetaDataEntity[0]; + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2008-01-25 10:24:40 UTC (rev 540) @@ -22,6 +22,7 @@ import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -46,12 +47,16 @@ this.fileLib = fileLib; } - public void onSuccess() throws Exception { + public void onSuccess() { if (fileEA != null) { RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( fileEA.getStream()); - RemoteStorageService.getStorageService().saveElement(getToken(), - zipRemoteStream.export()); + try { + RemoteStorageService.getStorageService().saveElement(getToken(), + zipRemoteStream.export()); + } catch (Exception e) { + throw new SimExplorerWebException(); + } } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-01-25 10:24:40 UTC (rev 540) @@ -25,36 +25,16 @@ import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; -public class ElementDelete extends UserPage { +public class ElementDelete extends ElementPage { - @Inject - private ComponentResources resources; - - @Persist - private LoggableElement element; - - /** - * Prepare page - * - * @param uuid - * Id of element to display - * @param version - * Version of element to display - * @throws Exception - */ - public void setup(String uuid, String version) throws Exception { - element = RemoteStorageService.getStorageService().getElement( - getToken(), uuid, version); - } - -// public Object onDelete() throws Exception { +// public Object onDelete() { // RemoteStorageService.getStorageService().deleteElement(getToken(), // element.getMetaData().getUuid(), // element.getMetaData().getVersion()); // return null; // } // -// public Object onDeleteAll() throws Exception { +// public Object onDeleteAll() { // RemoteStorageService.getStorageService().deleteElement(getToken(), // element.getMetaData().getUuid()); // return null; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-25 10:24:40 UTC (rev 540) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -29,14 +27,11 @@ import org.apache.tapestry.Link; import org.apache.tapestry.StreamResponse; import org.apache.tapestry.annotations.InjectPage; -import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; -import com.healthmarketscience.rmiio.RemoteOutputStreamServer; -import com.healthmarketscience.rmiio.SimpleRemoteOutputStream; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; @@ -48,19 +43,15 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.data.Structure; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; import fr.cemagref.simexplorer.is.ui.web.tools.AttachmentStreamResponse; -import fr.cemagref.simexplorer.is.ui.web.tools.XMLAttachment; -public class ElementDetail extends UserPage { +public class ElementDetail extends ElementPage { @Inject private ComponentResources resources; - @Persist - private LoggableElement element; - @InjectPage private ElementExport elementExport; @@ -74,20 +65,6 @@ private ElementRights elementRights; /** - * Prepare page - * - * @param uuid - * Id of element to display - * @param version - * Version of element to display - * @throws Exception - */ - public void setup(String uuid, String version) throws Exception { - element = RemoteStorageService.getStorageService().getElement( - getToken(), uuid, version); - } - - /** * Headers of tree grid * * @return Headers @@ -107,42 +84,23 @@ return nodes; } - private Object exportElement(String uuid, String version) throws Exception { - StreamResponse response; - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - RemoteOutputStreamServer xmlRemoteOutputStream = new SimpleRemoteOutputStream( - bos); - RemoteStorageService.getStorageService().exportElement(getToken(), - xmlRemoteOutputStream.export(), uuid, version); - - MetaDataEntity mde = RemoteStorageService.getStorageService() - .getMetadata(getToken(), uuid, version); - ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - response = new XMLAttachment(bis, mde.getType() + "." + mde.getUuid() - + ".v" + mde.getVersion()); - - return response; - } - - public Object onExport(String context) throws Exception { + public Object onExport(String context) { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); elementExport.setup(uuid, version); - // exportElement(uuid, version) return elementExport; } - public Object onHistory(String context) throws Exception { + public Object onHistory(String context) { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); - elementHistory.setup(uuid); + elementHistory.setup(uuid, version); return elementHistory; } - public Object onDelete(String context) throws Exception { + public Object onDelete(String context) { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); @@ -150,7 +108,7 @@ return elementDelete; } - public Object onRights(String context) throws Exception { + public Object onRights(String context) { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); @@ -158,21 +116,25 @@ return elementRights; } - private Object downloadElement(String uuid, String version) - throws Exception { + private Object downloadElement(String uuid, String version) { StreamResponse response; - MetaDataEntity mde = RemoteStorageService.getStorageService() - .getMetadata(getToken(), uuid, version); - RemoteInputStream ris = RemoteStorageService.getStorageService() - .retrieveData(getToken(), uuid, version, "_xml"); - InputStream stream = RemoteInputStreamClient.wrap(ris); - response = new AttachmentStreamResponse(stream, "_xml"); + try { + MetaDataEntity mde = RemoteStorageService.getStorageService() + .getMetadata(getToken(), uuid, version); + RemoteInputStream ris = RemoteStorageService.getStorageService() + .retrieveData(getToken(), uuid, version, "_xml"); + InputStream stream = RemoteInputStreamClient.wrap(ris); + response = new AttachmentStreamResponse(stream, "_xml"); + } catch (Exception e) { + throw new SimExplorerWebException(e); + } + return response; } - public Object onDownload(String context) throws Exception { + public Object onDownload(String context) { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-25 10:24:40 UTC (rev 540) @@ -17,34 +17,41 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import org.apache.tapestry.ComponentResources; -import org.apache.tapestry.annotations.Persist; -import org.apache.tapestry.ioc.annotations.Inject; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; +import com.healthmarketscience.rmiio.RemoteOutputStreamServer; +import com.healthmarketscience.rmiio.SimpleRemoteOutputStream; + +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; +import fr.cemagref.simexplorer.is.ui.web.tools.XMLAttachment; -public class ElementExport extends UserPage { +public class ElementExport extends ElementPage { - @Inject - private ComponentResources resources; + public Object onDownloadXML() { - @Persist - private LoggableElement element; + Object response; - /** - * Prepare page - * - * @param uuid - * Id of element to display - * @param version - * Version of element to display - * @throws Exception - */ - public void setup(String uuid, String version) throws Exception { - element = RemoteStorageService.getStorageService().getElement( - getToken(), uuid, version); + MetaDataEntity mde = element.getMetaData(); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + RemoteOutputStreamServer xmlRemoteOutputStream = new SimpleRemoteOutputStream( + bos); + try { + RemoteStorageService.getStorageService().exportElement(getToken(), + xmlRemoteOutputStream.export(), mde.getUuid(), + mde.getVersion().toString()); + } catch (Exception e) { + throw new SimExplorerWebException(e); + } + + ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); + response = new XMLAttachment(bis, mde.getType() + "." + mde.getUuid() + + ".v" + mde.getVersion()); + + return response; } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-25 10:24:40 UTC (rev 540) @@ -27,10 +27,10 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; -public class ElementHistory extends UserPage { +public class ElementHistory extends ElementPage { public class MetadataVersionComparator implements Comparator<MetaDataEntity> { @@ -44,9 +44,15 @@ @Persist private MetaDataEntity[] versions; - public void setup(String uuid) throws Exception { - versions = RemoteStorageService.getStorageService().getVersions( - getToken(), uuid); + @Override + public void setup(String uuid, String version) { + super.setup(uuid, version); + try { + versions = RemoteStorageService.getStorageService().getVersions( + getToken(), uuid); + } catch (Exception e) { + throw new SimExplorerWebException(e); + } } /** Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-01-25 10:24:40 UTC (rev 540) @@ -105,7 +105,7 @@ return result; } - public Object onActionFromDetailElement(String context) throws Exception { + public Object onActionFromDetailElement(String context) { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-01-25 10:24:40 UTC (rev 540) @@ -0,0 +1,51 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.web.pages; + +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.ioc.annotations.Inject; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; +import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; +import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; + +public abstract class ElementPage extends UserPage { + + @Persist + protected LoggableElement element; + + /** + * Prepare page + * + * @param uuid + * Id of element to display + * @param version + * Version of element to display + */ + public void setup(String uuid, String version) { + try { + element = RemoteStorageService.getStorageService().getElement( + getToken(), uuid, version); + } catch (Exception e) { + throw new SimExplorerWebException(e); + } + } + +} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-01-25 10:24:40 UTC (rev 540) @@ -25,26 +25,8 @@ import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; -public class ElementRights extends UserPage { +public class ElementRights extends ElementPage { - @Inject - private ComponentResources resources; + - @Persist - private LoggableElement element; - - /** - * Prepare page - * - * @param uuid - * Id of element to display - * @param version - * Version of element to display - * @throws Exception - */ - public void setup(String uuid, String version) throws Exception { - element = RemoteStorageService.getStorageService().getElement( - getToken(), uuid, version); - } - } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-25 10:24:40 UTC (rev 540) @@ -18,17 +18,17 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import java.util.Arrays; -import javax.naming.NamingException; - import org.apache.tapestry.ValueEncoder; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.GroupValueEncoder; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; @@ -54,54 +54,66 @@ @Persist private GroupValueEncoder groupEncoder; - void setup(int groupId) throws Exception { + void setup(int groupId) { this.usersInGroup = new ArrayList<User>(); this.groupsInGroup = new ArrayList<Group>(); if (groupId == -1) { this.group = new Group(); this.group.setOwner(getUserLogged()); } else { - this.group = RemoteSecurityService.getAuthentificationService() - .getGroup(getToken(), groupId); + try { + this.group = RemoteSecurityService.getAuthentificationService() + .getGroup(getToken(), groupId); - User[] users = RemoteSecurityService.getAuthentificationService() - .getUsersOfGroup(getToken(), group); - this.usersInGroup.addAll(Arrays.asList(users)); + User[] users = RemoteSecurityService + .getAuthentificationService().getUsersOfGroup( + getToken(), group); + this.usersInGroup.addAll(Arrays.asList(users)); - Group[] groups = RemoteSecurityService.getAuthentificationService() - .getGroupsOfGroup(getToken(), group); - this.groupsInGroup.addAll(Arrays.asList(groups)); + Group[] groups = RemoteSecurityService + .getAuthentificationService().getGroupsOfGroup( + getToken(), group); + this.groupsInGroup.addAll(Arrays.asList(groups)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + } userEncoder = new UserValueEncoder(getToken()); groupEncoder = new GroupValueEncoder(getToken()); } - public Object onSuccess() throws Exception { - if (group.getId() == null) { - group = RemoteSecurityService.getAuthentificationService() - .saveGroup(getToken(), group.getName(), getUserLogged()); - } else { - group = RemoteSecurityService.getAuthentificationService() - .updateGroup(getToken(), group); - } + public Object onSuccess() { + try { + if (group.getId() == null) { + group = RemoteSecurityService + .getAuthentificationService() + .saveGroup(getToken(), group.getName(), getUserLogged()); + } else { + group = RemoteSecurityService.getAuthentificationService() + .updateGroup(getToken(), group); + } - Integer[] usersIds = new Integer[usersInGroup.size()]; - int i = 0; - for (User user : usersInGroup) { - usersIds[i] = user.getId(); - i++; - } - RemoteSecurityService.getAuthentificationService().setUsersOfGroup( - getToken(), group, usersIds); + Integer[] usersIds = new Integer[usersInGroup.size()]; + int i = 0; + for (User user : usersInGroup) { + usersIds[i] = user.getId(); + i++; + } + RemoteSecurityService.getAuthentificationService().setUsersOfGroup( + getToken(), group, usersIds); - Integer[] groupsIds = new Integer[groupsInGroup.size()]; - i = 0; - for (Group group : groupsInGroup) { - groupsIds[i] = group.getId(); - i++; + Integer[] groupsIds = new Integer[groupsInGroup.size()]; + i = 0; + for (Group group : groupsInGroup) { + groupsIds[i] = group.getId(); + i++; + } + RemoteSecurityService.getAuthentificationService() + .setGroupsOfGroup(getToken(), group, groupsIds); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } - RemoteSecurityService.getAuthentificationService().setGroupsOfGroup( - getToken(), group, groupsIds); return groupList; } @@ -110,19 +122,28 @@ return groupList; } - public List<User> getUsers() throws Exception { - User[] users = RemoteSecurityService.getAuthentificationService() - .getUsers(getToken()); + public List<User> getUsers() { List<User> result = new ArrayList<User>(); - result.addAll(Arrays.asList(users)); + try { + User[] users = RemoteSecurityService.getAuthentificationService() + .getUsers(getToken()); + result.addAll(Arrays.asList(users)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } return result; } - public List<Group> getGroups() throws Exception { - Group[] groups = RemoteSecurityService.getAuthentificationService() - .getGroups(getToken()); + public List<Group> getGroups() { List<Group> result = new ArrayList<Group>(); - result.addAll(Arrays.asList(groups)); + try { + Group[] groups = RemoteSecurityService.getAuthentificationService() + .getGroups(getToken()); + result.addAll(Arrays.asList(groups)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + return result; } @@ -138,11 +159,11 @@ return isUserSuperAdmin(); } - public List<User> getUsersInGroup() throws NamingException { + public List<User> getUsersInGroup() { return usersInGroup; } - public void setUsersInGroup(List<User> usersInGroup) throws NamingException { + public void setUsersInGroup(List<User> usersInGroup) { this.usersInGroup = usersInGroup; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-25 10:24:40 UTC (rev 540) @@ -28,6 +28,8 @@ import org.apache.tapestry.services.BeanModelSource; import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; @@ -61,28 +63,42 @@ model.add("delete", null); } - public Group[] getGroups() throws Exception { + public Group[] getGroups() { Group[] groups; - if (isUserSuperAdmin()) { - groups = RemoteSecurityService.getAuthentificationService().getGroups(getToken()); - } else { - groups = RemoteSecurityService.getAuthentificationService() - .getGroupsOwnedBy(getToken(),getUserLogged()); + + try { + + if (isUserSuperAdmin()) { + groups = RemoteSecurityService.getAuthentificationService() + .getGroups(getToken()); + } else { + groups = RemoteSecurityService.getAuthentificationService() + .getGroupsOwnedBy(getToken(), getUserLogged()); + } + + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } + return groups; } - public Object onActionFromDelete(Integer context) throws Exception { - RemoteSecurityService.getAuthentificationService().deleteGroup(getToken(),context); + public Object onActionFromDelete(Integer context) { + try { + RemoteSecurityService.getAuthentificationService().deleteGroup( + getToken(), context); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } return null; } - public Object onActionFromEdit(Integer context) throws Exception { + public Object onActionFromEdit(Integer context) { groupEdit.setup(context); return groupEdit; } - public Object onActionFromAdd() throws Exception { + public Object onActionFromAdd() { groupEdit.setup(-1); return groupEdit; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-01-25 10:24:40 UTC (rev 540) @@ -20,8 +20,9 @@ import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; -import org.apache.tapestry.ioc.annotations.Inject; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; public class Login { @@ -36,14 +37,20 @@ @ApplicationState private String token; - public Object onSuccess() throws Exception { + public Object onSuccess() { Object result = null; - token = RemoteSecurityService.getAuthentificationService().loginUser(user, - password); - if (token != null) { - RemoteSecurityService.getAuthentificationService().closeSessionTimer(token); - result = elementList; + try { + token = RemoteSecurityService.getAuthentificationService() + .loginUser(user, password); + if (token != null) { + RemoteSecurityService.getAuthentificationService() + .closeSessionTimer(token); + result = elementList; + } + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } + return result; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-25 10:24:40 UTC (rev 540) @@ -18,8 +18,8 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import java.util.Arrays; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.ValueEncoder; @@ -32,6 +32,8 @@ import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.GroupValueEncoder; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; @@ -73,53 +75,71 @@ } } - void setup(int groupId) throws Exception { + void setup(int groupId) { this.groupsOfUser = new ArrayList<Group>(); if (groupId == -1) { this.user = new User(); } else { - this.user = RemoteSecurityService.getAuthentificationService() - .getUser(getToken(), groupId); - Group[] groups = RemoteSecurityService.getAuthentificationService() - .getGroupsOfUser(getToken(), this.user); - groupsOfUser.addAll(Arrays.asList(groups)); + try { + this.user = RemoteSecurityService.getAuthentificationService() + .getUser(getToken(), groupId); + Group[] groups = RemoteSecurityService + .getAuthentificationService().getGroupsOfUser( + getToken(), this.user); + groupsOfUser.addAll(Arrays.asList(groups)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + } groupEncoder = new GroupValueEncoder(getToken()); } - public Object onSuccess() throws Exception { + public Object onSuccess() { + try { + if (user.getId() == null) { + user = RemoteSecurityService.getAuthentificationService() + .saveUser(getToken(), user.getLogin(), user.getMail()); + } else { + user = RemoteSecurityService.getAuthentificationService() + .updateUser(getToken(), user); + } - if (user.getId() == null) { - user = RemoteSecurityService.getAuthentificationService().saveUser( - getToken(), user.getLogin(), user.getMail()); - } else { - user = RemoteSecurityService.getAuthentificationService() - .updateUser(getToken(), user); + Integer[] groupsIds = new Integer[groupsOfUser.size()]; + int i = 0; + for (Group group : groupsOfUser) { + groupsIds[i] = group.getId(); + i++; + } + RemoteSecurityService.getAuthentificationService().setGroupsOfUser( + getToken(), user, groupsIds); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } - Integer[] groupsIds = new Integer[groupsOfUser.size()]; - int i = 0; - for (Group group : groupsOfUser) { - groupsIds[i] = group.getId(); - i++; - } - RemoteSecurityService.getAuthentificationService().setGroupsOfUser( - getToken(), user, groupsIds); - return userList; } - public List<Group> getGroups() throws Exception { - Group[] groups = RemoteSecurityService.getAuthentificationService() - .getGroups(getToken()); + public List<Group> getGroups() { + Group[] groups; + try { + groups = RemoteSecurityService.getAuthentificationService() + .getGroups(getToken()); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } List<Group> result = new ArrayList<Group>(); result.addAll(Arrays.asList(groups)); return result; } - public Group[] getOwnedGroups() throws Exception { - return RemoteSecurityService.getAuthentificationService() - .getGroupsOwnedBy(getToken(), user); + public Group[] getOwnedGroups() { + try { + return RemoteSecurityService.getAuthentificationService() + .getGroupsOwnedBy(getToken(), user); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } } public ValueEncoder getGroupEncoder() { Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-25 10:24:40 UTC (rev 540) @@ -28,6 +28,8 @@ import org.apache.tapestry.services.BeanModelSource; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; @@ -65,23 +67,34 @@ model.add("delete", null); } - public User[] getUsers() throws Exception { + public User[] getUsers() { User[] users; - users = RemoteSecurityService.getAuthentificationService().getUsers(getToken()); + try { + users = RemoteSecurityService.getAuthentificationService() + .getUsers(getToken()); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + return users; } - public Object onActionFromDelete(Integer context) throws Exception { - RemoteSecurityService.getAuthentificationService().deleteUser(getToken(),context); + public Object onActionFromDelete(Integer context) { + try { + RemoteSecurityService.getAuthentificationService().deleteUser( + getToken(), context); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } return null; } - public Object onActionFromEdit(Integer context) throws Exception { + public Object onActionFromEdit(Integer context) { userEdit.setup(context); return userEdit; } - public Object onActionFromAdd() throws Exception { + public Object onActionFromAdd() { userEdit.setup(-1); return userEdit; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-25 10:24:40 UTC (rev 540) @@ -19,9 +19,10 @@ import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Persist; -import org.apache.tapestry.ioc.annotations.Inject; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; public abstract class ProtectedPage { @@ -71,8 +72,8 @@ try { loggedUser = RemoteSecurityService.getAuthentificationService() .getLoggedUser(token); - } catch (Exception e) { - // TODO: handle exception + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } } return loggedUser; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java 2008-01-25 10:24:40 UTC (rev 540) @@ -20,6 +20,8 @@ import org.apache.tapestry.ValueEncoder; import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; public class GroupValueEncoder implements ValueEncoder<Group> { @@ -37,10 +39,10 @@ public Group toValue(String arg0) { Group group = null; try { - group = RemoteSecurityService.getAuthentificationService() - .getGroup(token, Integer.decode(arg0)); - } catch (Exception e) { - // TODO: handle exception + group = RemoteSecurityService.getAuthentificationService().getGroup( + token, Integer.decode(arg0)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } return group; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java 2008-01-25 10:24:40 UTC (rev 540) @@ -21,8 +21,7 @@ public class RemoteSecurityService extends RemoteService { - public static AuthenticationService getAuthentificationService() - throws Exception { + public static AuthenticationService getAuthentificationService() { return (AuthenticationService) getService("AuthenticationService"); } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteService.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteService.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteService.java 2008-01-25 10:24:40 UTC (rev 540) @@ -25,12 +25,15 @@ import javax.naming.InitialContext; import javax.naming.NamingException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; + public abstract class RemoteService { protected static Map<String, Object> services = new HashMap<String, Object>(); - protected static Object getService(String serviceName) - throws NamingException { + protected static Object getService(String serviceName) { + Object service = null; + if (services.get(serviceName) == null) { Properties properties = (Properties) System.getProperties().clone(); properties.put("java.naming.provider.url", "jnp://localhost:1099"); @@ -39,15 +42,21 @@ properties .put("java.naming.factory.url.pkgs", "org.jnp.interfaces"); - Context context; try { - context = new InitialContext(properties); - } catch (Exception e) { - context = new InitialContext(); + Context context; + try { + context = new InitialContext(properties); + } catch (Exception e) { + context = new InitialContext(); + } + services.put(serviceName, context.lookup(serviceName)); + } catch (NamingException e) { + throw new SimExplorerWebException(e); } - services.put(serviceName, context.lookup(serviceName)); } - return services.get(serviceName); + service = services.get(serviceName); + + return service; } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java 2008-01-25 10:24:40 UTC (rev 540) @@ -21,7 +21,7 @@ public class RemoteStorageService extends RemoteService { - public static StorageService getStorageService() throws Exception { + public static StorageService getStorageService() { return (StorageService) getService("StorageService"); } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java 2008-01-25 10:24:40 UTC (rev 540) @@ -20,6 +20,8 @@ import org.apache.tapestry.ValueEncoder; import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; public class UserValueEncoder implements ValueEncoder<User> { @@ -39,8 +41,8 @@ try { user = RemoteSecurityService.getAuthentificationService().getUser( token, Integer.decode(arg0)); - } catch (Exception e) { - // TODO: handle exception + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); } return user; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java 2008-01-25 10:24:40 UTC (rev 540) @@ -41,7 +41,7 @@ return contentType; } - public InputStream getStream() throws IOException { + public InputStream getStream() { return is; } Modified: trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-01-24 23:48:04 UTC (rev 539) +++ trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-01-25 10:24:40 UTC (rev 540) @@ -1,4 +1,7 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="message:windowtitle"> + <p><t:actionlink t:id="downloadXML">${message:downloadxml}</t:actionlink>* + </p> + </t:layout>

1 0

r539 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 23:48:04 +0000 (Thu, 24 Jan 2008) New Revision: 539 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java Log: icons Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-24 23:47:42 UTC (rev 538) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-24 23:48:04 UTC (rev 539) @@ -39,7 +39,7 @@ name = "simexplorer.action.show.local", shortDescription = "simexplorer.action.show.local.tooltip", longDescription = "simexplorer.action.show.local.help", - //smallIcon = "action/local.png", + smallIcon = "action/local.png", mnemonic = 'A', hideActionText = false ) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-24 23:47:42 UTC (rev 538) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-24 23:48:04 UTC (rev 539) @@ -39,7 +39,7 @@ name = "simexplorer.action.show.remote", shortDescription = "simexplorer.action.show.remote.tooltip", longDescription = "simexplorer.action.show.remote.help", - //smallIcon = "action/remote.png", + smallIcon = "action/remote.png", mnemonic = 'p', hideActionText = false ) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java 2008-01-24 23:47:42 UTC (rev 538) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleLocalTabAction.java 2008-01-24 23:48:04 UTC (rev 539) @@ -26,7 +26,7 @@ name = "simexplorer.action.show.local", shortDescription = "simexplorer.action.show.local.tooltip", longDescription = "simexplorer.action.show.local.help", - //smallIcon = "action/show-local.png", + smallIcon = "action/local.png", mnemonic = 'A', name2 = "simexplorer.action.hide.local", shortDescription2 = "simexplorer.action.hide.local.tooltip", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java 2008-01-24 23:47:42 UTC (rev 538) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleRemoteTabAction.java 2008-01-24 23:48:04 UTC (rev 539) @@ -26,7 +26,7 @@ name = "simexplorer.action.show.remote", shortDescription = "simexplorer.action.show.remote.tooltip", longDescription = "simexplorer.action.show.remote.help", - //smallIcon = "action/show-remote.png", + smallIcon = "action/remote.png", mnemonic = 'P', name2 = "simexplorer.action.hide.remote", shortDescription2 = "simexplorer.action.hide.remote.tooltip",

1 0

r538 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 23:47:42 +0000 (Thu, 24 Jan 2008) New Revision: 538 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: ajout action delete Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 23:47:31 UTC (rev 537) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 23:47:42 UTC (rev 538) @@ -113,6 +113,7 @@ public void valueChanged(TreeSelectionEvent e) { TreePath path = e.getNewLeadSelectionPath(); boolean download = false; + boolean delete = false; boolean export = false; boolean detail = false; boolean history = false; @@ -125,7 +126,7 @@ download = true; } if (node.isLoggableElement()) { - detail = history = true; + delete = detail = history = true; } if (node.isRoot()) { export = true; @@ -138,6 +139,13 @@ ui.getDownload().setToolTipText(null); } + ui.getDelete().setEnabled(delete); + if (delete) { + ui.getDelete().setToolTipText(_("simexplorer.action.delete2",node.getUserObject())); + } else { + ui.getDelete().setToolTipText(null); + } + ui.getExportApplication().setEnabled(export); if (detail) { showDetail(node);

1 0

r537 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 23:47:31 +0000 (Thu, 24 Jan 2008) New Revision: 537 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DeleteAction.java Log: ajout action delete Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DeleteAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DeleteAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DeleteAction.java 2008-01-24 23:47:31 UTC (rev 537) @@ -0,0 +1,99 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.swing.action.application; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; + +import javax.swing.JTree; +import java.awt.event.ActionEvent; +import java.io.File; + +/** + * Action pour downloader un résultat ou une librairie + * + * @author chemit + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "delete", + name = "simexplorer.action.application.delete", + shortDescription = "simexplorer.action.application.delete.tooltip", + longDescription = "simexplorer.action.application.delete.help", + smallIcon = "action/delete.png", + mnemonic = 'x', + hideActionText = false +) +public class DeleteAction extends SimExplorerAbstractTabAction { + + private static final long serialVersionUID = 7535647131305304738L; + + + JTree tree; + LoggableElementTreeNode node; + File file; + LoggableElement element; + String uuid; + Version version; + + public DeleteAction(String name) { + super(name); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + tree = ui.getTree(); + node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); + boolean result; + result = node != null && node.isLoggableElement(); + if (result) { + // ask user confirmation of node to delete + element = (LoggableElement) node.getUserObject(); + uuid = element.getMetaData().getUuid(); + version = element.getMetaData().getVersion(); + } + result = false; + return result; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + //StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); + //TODO + } + + @Override + protected void clear() { + super.clear(); + tree = null; + node = null; + file = null; + element = null; + version = null; + uuid = null; + } +} \ No newline at end of file

1 0

r536 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 23:47:23 +0000 (Thu, 24 Jan 2008) New Revision: 536 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: ajout action delete Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-24 23:47:15 UTC (rev 535) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-24 23:47:23 UTC (rev 536) @@ -7,7 +7,8 @@ <JButton id='expandAllApplication' enabled='false'/> <JButton id='exportApplication' enabled='false'/> <JButton id='download' enabled='false'/> - </JToolBar> + <JButton id='delete' enabled='false'/> + </JToolBar> </cell> </row> <row fill="both" weightx="1" weighty="1">

1 0