- Nuiton-web-commits - mailman.cloud.codelutin.com

10 Oct '12

Author: echatellier Date: 2012-10-10 17:30:37 +0200 (Wed, 10 Oct 2012) New Revision: 211 Url: http://nuiton.org/repositories/revision/nuiton-web/211 Log: Add new secu module Added: branches/nuiton-web-1.11-security/nuiton-secu/ branches/nuiton-web-1.11-security/nuiton-secu/LICENSE.txt branches/nuiton-web-1.11-security/nuiton-secu/README.txt branches/nuiton-web-1.11-security/nuiton-secu/changelog.txt branches/nuiton-web-1.11-security/nuiton-secu/pom.xml branches/nuiton-web-1.11-security/nuiton-secu/src/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/AbstractSecuAction.java branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuMatrix.java branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuRole.java branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuUser.java branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-login.jsp branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-matrix.jsp branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-role.jsp branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-user.jsp branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/i18n/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/i18n/nuiton-secu_en_GB.properties branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/i18n/nuiton-secu_fr_FR.properties branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/i18n/secu-lib_fr_FR.properties branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/struts.xml branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/ branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/secu.properties branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/secu.zargo Modified: branches/nuiton-web-1.11-security/pom.xml Property changes on: branches/nuiton-web-1.11-security/nuiton-secu ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings Added: branches/nuiton-web-1.11-security/nuiton-secu/LICENSE.txt =================================================================== Added: branches/nuiton-web-1.11-security/nuiton-secu/README.txt =================================================================== Added: branches/nuiton-web-1.11-security/nuiton-secu/changelog.txt =================================================================== Added: branches/nuiton-web-1.11-security/nuiton-secu/pom.xml =================================================================== (Binary files differ) Property changes on: branches/nuiton-web-1.11-security/nuiton-secu/pom.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/AbstractSecuAction.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/AbstractSecuAction.java (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/AbstractSecuAction.java 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,68 @@ +package org.nuiton.web.secu.actions; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts2.interceptor.ParameterAware; +import org.apache.struts2.interceptor.ServletRequestAware; +import org.nuiton.topia.TopiaContext; +import org.nuiton.web.filter.TopiaTransactionFilter; + +import com.opensymphony.xwork2.ActionSupport; + +public class AbstractSecuAction extends ActionSupport implements ServletRequestAware, ParameterAware { + + /** serialVersionUID. */ + private static final long serialVersionUID = -1097798007319592593L; + + /** Topia context associated with request. */ + protected TopiaContext transaction; + + protected Map<String, String[]> actionParameters; + + @Override + public void setParameters(Map<String, String[]> parameters) { + this.actionParameters = parameters; + } + + @Override + public void setServletRequest(HttpServletRequest request) { + transaction = TopiaTransactionFilter.getTransaction(request); + } + + /** + * Renvoie la valeur d'un paramètre de la request. Cette méthode peut + * être appelée pour récupérer la valeur d'un paramètre avant que + * l'intercepteur pousse les valeurs saisies dans un formulaire. + * + * @param parameterKey l'identifiant du paramètre + * @return sa valeur + */ + public String getParameter(String parameterKey) { + String result = null; + if (actionParameters != null) { + String[] parameterValues = actionParameters.get(parameterKey); + if (parameterValues != null && parameterValues.length >= 1) { + result = parameterValues[0]; + } + } + return result; + } + + /** + * Renvoie la valeur d'un paramètre de la request. Cette méthode peut + * être appelée pour récupérer la valeur d'un paramètre avant que + * l'intercepteur pousse les valeurs saisies dans un formulaire. + * + * @param parameterKey l'identifiant du paramètre + * @return sa valeur + */ + public String[] getParameters(String parameterKey) { + String[] result = null; + if (actionParameters != null) { + result = actionParameters.get(parameterKey); + } + return result; + } +} Property changes on: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/AbstractSecuAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuMatrix.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuMatrix.java (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuMatrix.java 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,89 @@ +package org.nuiton.web.secu.actions; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + +import org.nuiton.web.SecuDAOHelper; +import org.nuiton.web.filter.TopiaTransactionFilter; +import org.nuiton.web.secu.SecuRole; +import org.nuiton.web.secu.SecuRoleDAO; +import org.nuiton.web.secu.SecuUser; +import org.nuiton.web.secu.SecuUserDAO; + +import com.opensymphony.xwork2.Preparable; + +public class SecuMatrix extends AbstractSecuAction implements Preparable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1L; + + protected SecuUserDAO secuUserDAO; + + protected SecuRoleDAO secuRoleDAO; + + protected List<SecuUser> users; + + protected List<SecuRole> roles; + + protected List<String> userIds; + + @Override + public void setServletRequest(HttpServletRequest request) { + transaction = TopiaTransactionFilter.getTransaction(request); + } + + @Override + public void prepare() throws Exception { + secuUserDAO = SecuDAOHelper.getSecuUserDAO(transaction); + secuRoleDAO = SecuDAOHelper.getSecuRoleDAO(transaction); + } + + @Override + public String input() throws Exception { + users = secuUserDAO.findAllWithOrder(SecuUser.LOGIN); + roles = secuRoleDAO.findAllWithOrder(SecuRole.NAME); + return super.input(); + } + + public List<SecuUser> getUsers() { + return users; + } + + public List<SecuRole> getRoles() { + return roles; + } + + public void setUserIds(List<String> userIds) { + this.userIds = userIds; + } + + @Override + public String execute() throws Exception { + String result = super.execute(); + + if (userIds == null) { + result = input(); + } else { + try { + for (String userId : userIds) { + SecuUser secuUser = secuUserDAO.findByTopiaId(userId); + secuUser.clearPermissions(); + + String[] permissions = getParameters("permissions-" + userId); + if (permissions != null) { + for (String permission : permissions) { + SecuRole secuRole = secuRoleDAO.findByTopiaId(permission); + secuUser.addPermissions(secuRole); + } + } + } + transaction.commitTransaction(); + } catch (Exception ex) { + addActionError(ex.getMessage()); + result = input(); + } + } + return result; + } +} Property changes on: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuMatrix.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuRole.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuRole.java (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuRole.java 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,76 @@ +package org.nuiton.web.secu.actions; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.web.SecuDAOHelper; +import org.nuiton.web.filter.TopiaTransactionFilter; +import org.nuiton.web.secu.SecuRoleDAO; +import org.nuiton.web.secu.SecuRoleImpl; + +import com.opensymphony.xwork2.Preparable; + +public class SecuRole extends AbstractSecuAction implements Preparable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1L; + + /** Topia context associated with request. */ + protected TopiaContext transaction; + + protected SecuRoleDAO secuRoleDAO; + + protected org.nuiton.web.secu.SecuRole role; + + @Override + public void setServletRequest(HttpServletRequest request) { + transaction = TopiaTransactionFilter.getTransaction(request); + } + + @Override + public void prepare() throws Exception { + secuRoleDAO = SecuDAOHelper.getSecuRoleDAO(transaction); + } + + @Override + public String input() throws Exception { + return super.input(); + } + + public org.nuiton.web.secu.SecuRole getRole() { + if (role == null) { + String roleId = getParameter("roleId"); + if (StringUtils.isNotBlank(roleId)) { + try { + role = secuRoleDAO.findByTopiaId(roleId); + } catch (TopiaException ex) { + throw new TopiaRuntimeException(ex); + } + } else { + role = new SecuRoleImpl(); + } + } + return role; + } + + @Override + public String execute() throws Exception { + String result = super.execute(); + + try { + if (role.getTopiaId() == null) { + secuRoleDAO.create(role); + } else { + secuRoleDAO.update(role); + } + transaction.commitTransaction(); + } catch (Exception ex) { + addActionError(ex.getMessage()); + result = input(); + } + return result; + } +} Property changes on: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuRole.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuUser.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuUser.java (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuUser.java 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,76 @@ +package org.nuiton.web.secu.actions; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.web.SecuDAOHelper; +import org.nuiton.web.filter.TopiaTransactionFilter; +import org.nuiton.web.secu.SecuUserDAO; +import org.nuiton.web.secu.SecuUserImpl; + +import com.opensymphony.xwork2.Preparable; + +public class SecuUser extends AbstractSecuAction implements Preparable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1L; + + /** Topia context associated with request. */ + protected TopiaContext transaction; + + protected SecuUserDAO secuUserDAO; + + protected org.nuiton.web.secu.SecuUser user; + + @Override + public void setServletRequest(HttpServletRequest request) { + transaction = TopiaTransactionFilter.getTransaction(request); + } + + @Override + public void prepare() throws Exception { + secuUserDAO = SecuDAOHelper.getSecuUserDAO(transaction); + } + + @Override + public String input() throws Exception { + return super.input(); + } + + public org.nuiton.web.secu.SecuUser getUser() { + if (user == null) { + String roleId = getParameter("userId"); + if (StringUtils.isNotBlank(roleId)) { + try { + user = secuUserDAO.findByTopiaId(roleId); + } catch (TopiaException ex) { + throw new TopiaRuntimeException(ex); + } + } else { + user = new SecuUserImpl(); + } + } + return user; + } + + @Override + public String execute() throws Exception { + String result = super.execute(); + + try { + if (user.getTopiaId() == null) { + secuUserDAO.create(user); + } else { + secuUserDAO.update(user); + } + transaction.commitTransaction(); + } catch (Exception ex) { + addActionError(ex.getMessage()); + result = input(); + } + return result; + } +} Property changes on: branches/nuiton-web-1.11-security/nuiton-secu/src/main/java/org/nuiton/web/secu/actions/SecuUser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-login.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-login.jsp (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-login.jsp 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,22 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title>Sécurité</title> + </head> + + <body> + + <h1>Sécurité</h1> + + <h2>Utilisateur</h2> + + <s:form action="secu-login" namespace="/secu"> + <s:actionerror /> + <s:textfield label="Identifiant" name="login" /> + <s:password label="Mot de passe" name="password" /> + <s:submit label="Connexion" /> + </s:form> + </body> +</html> \ No newline at end of file Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-matrix.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-matrix.jsp (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-matrix.jsp 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,72 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title>Sécurité</title> + </head> + + <body> + + <h1>Sécurité</h1> + + <h2>Permission</h2> + + <form action="<s:url action="secu-matrix" namespace="/secu" />" method="post"> + <table class="secu-roletable"> + <tr> + <td colspan="2" class="empty"/> + <s:if test="!roles.empty"> + <th colspan="<s:property value="roles.size()" />">Rôles</th> + </s:if> + </tr> + <tr> + <td colspan="2" class="empty"/> + <s:iterator value="roles"> + <td> + <a href="<s:url action='secu-role!input' namespace='/secu'> + <s:param name="roleId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="name" /> + </a> + </td> + </s:iterator> + </tr> + <s:iterator value="users" var="user" status="userStatus"> + <input type="hidden" name="userIds" value="<s:property value="topiaId" />" /> + <tr> + <s:if test="#userStatus.first"> + <th rowspan="<s:property value="users.size()" />" class="vertical">Utilisateurs</th> + </s:if> + <td> + <a href="<s:url action='secu-user!input' namespace='/secu'> + <s:param name="userId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="login" /> + </a> + </td> + <s:iterator value="roles" var="role"> + <td> + <input id="<s:property value="#user.topiaId" /><s:property value="#user.topiaId" />" + type="checkbox" name="permissions-<s:property value="#user.topiaId" />" value="<s:property value="#role.topiaId" />" + <s:if test="#user.permissions.contains(#role)" > + checked="checked" + </s:if> /> + </td> + </s:iterator> + </tr> + </s:iterator> + </table> + <input type="submit" value="Valider" /> + </form> + + <h2>Gestion</h2> + + <div class="secu-newuser"> + <a href="<s:url action='secu-user!input' namespace='/secu' />">Nouvel utilisateur</a> + </div> + <div class="secu-newrole"> + <a href="<s:url action='secu-role!input' namespace='/secu' />">Nouveau rôle</a> + </div> + </body> +</html> \ No newline at end of file Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-role.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-role.jsp (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-role.jsp 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,22 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title>Sécurité</title> + </head> + + <body> + + <h1>Sécurité</h1> + + <h2>Role</h2> + + <s:form action="secu-role" namespace="/secu"> + <s:actionerror /> + <s:hidden name="roleId" value="%{role.topiaId}" /> + <s:textfield label="Nom" name="role.name" value="%{role.name}"/> + <s:submit label="Valider" /> + </s:form> + </body> +</html> \ No newline at end of file Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-user.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-user.jsp (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/WEB-INF/secu/secu-user.jsp 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,21 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title>Secu</title> + </head> + + <body> + + <h1>Sécurité</h1> + + <s:form action="secu-user" namespace="/secu"> + <s:actionerror /> + <s:hidden name="userId" value="%{user.topiaId}" /> + <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> + <s:password label="Mot de passe" name="user.password" value="%{user.password}" /> + <s:submit label="Valider" /> + </s:form> + </body> +</html> \ No newline at end of file Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/i18n/nuiton-secu_en_GB.properties =================================================================== Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/i18n/nuiton-secu_fr_FR.properties =================================================================== Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/i18n/secu-lib_fr_FR.properties =================================================================== Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/struts.xml =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/struts.xml (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/resources/struts.xml 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1,34 @@ +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" + "http://struts.apache.org/dtds/struts-2.3.dtd"> +<struts> + + <package name="secu" abstract="true" extends="struts-default"> + + </package> + + + <package name="org.nuiton.web.secu.actions" namespace="/secu" extends="secu"> + <default-action-ref name="secu-matrix"/> + + <action name="secu-matrix" class="org.nuiton.web.secu.actions.SecuMatrix"> + <result name="input">/WEB-INF/secu/secu-matrix.jsp</result> + <result name="success" type="redirectAction"> + <param name="actionName">secu-matrix</param> + </result> + </action> + <action name="secu-role" class="org.nuiton.web.secu.actions.SecuRole"> + <result name="input">/WEB-INF/secu/secu-role.jsp</result> + <result name="success" type="redirectAction"> + <param name="actionName">secu-matrix</param> + </result> + </action> + <action name="secu-user" class="org.nuiton.web.secu.actions.SecuUser"> + <result name="input">/WEB-INF/secu/secu-user.jsp</result> + <result name="success" type="redirectAction"> + <param name="actionName">secu-matrix</param> + </result> + </action> + </package> + +</struts> Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/secu.properties =================================================================== --- branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/secu.properties (rev 0) +++ branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/secu.properties 2012-10-10 15:30:37 UTC (rev 211) @@ -0,0 +1 @@ +model.tagvalue.String=text Added: branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/secu.zargo =================================================================== (Binary files differ) Property changes on: branches/nuiton-web-1.11-security/nuiton-secu/src/main/xmi/secu.zargo ___________________________________________________________________ Added: svn:mime-type + application/zip Modified: branches/nuiton-web-1.11-security/pom.xml =================================================================== --- branches/nuiton-web-1.11-security/pom.xml 2012-10-10 14:24:32 UTC (rev 210) +++ branches/nuiton-web-1.11-security/pom.xml 2012-10-10 15:30:37 UTC (rev 211) @@ -23,6 +23,7 @@ <module>nuiton-tapestry</module> <module>nuiton-rss</module> <module>nuiton-gwt</module> + <module>nuiton-secu</module> </modules> <dependencyManagement>

1 0

r210 - branches
by echatellier＠users.nuiton.org 10 Oct '12

10 Oct '12

Author: echatellier Date: 2012-10-10 16:24:32 +0200 (Wed, 10 Oct 2012) New Revision: 210 Url: http://nuiton.org/repositories/revision/nuiton-web/210 Log: Create new branche to test new security module based on struts Added: branches/nuiton-web-1.11-security/

1 0

r209 - trunk
by tchemit＠users.nuiton.org 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:43:55 +0200 (Thu, 30 Aug 2012) New Revision: 209 Url: http://nuiton.org/repositories/revision/nuiton-web/209 Log: Update mavenpom4redmineAndCentral to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 18:55:19 UTC (rev 208) +++ trunk/pom.xml 2012-08-30 14:43:55 UTC (rev 209) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.6</version> + <version>3.3.7</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r208 - trunk
by tchemit＠users.nuiton.org 14 Aug '12

14 Aug '12

Author: tchemit Date: 2012-08-14 20:55:19 +0200 (Tue, 14 Aug 2012) New Revision: 208 Url: http://nuiton.org/repositories/revision/nuiton-web/208 Log: Update mavenpom4redmineAndCentral to 3.3.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-07 07:51:26 UTC (rev 207) +++ trunk/pom.xml 2012-08-14 18:55:19 UTC (rev 208) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r207 - trunk
by tchemit＠users.nuiton.org 07 Aug '12

07 Aug '12

Author: tchemit Date: 2012-08-07 09:51:26 +0200 (Tue, 07 Aug 2012) New Revision: 207 Url: http://nuiton.org/repositories/revision/nuiton-web/207 Log: Update mavenpom4redmine to 3.3.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 10:21:38 UTC (rev 206) +++ trunk/pom.xml 2012-08-07 07:51:26 UTC (rev 207) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.4</version> + <version>3.3.5</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r206 - trunk
by tchemit＠users.nuiton.org 09 Jul '12

09 Jul '12

Author: tchemit Date: 2012-07-09 12:21:38 +0200 (Mon, 09 Jul 2012) New Revision: 206 Url: http://nuiton.org/repositories/revision/nuiton-web/206 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-30 15:57:13 UTC (rev 205) +++ trunk/pom.xml 2012-07-09 10:21:38 UTC (rev 206) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.2</version> + <version>3.3.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r205 - trunk
by tchemit＠users.nuiton.org 30 May '12

30 May '12

Author: tchemit Date: 2012-05-30 17:57:13 +0200 (Wed, 30 May 2012) New Revision: 205 Url: http://nuiton.org/repositories/revision/nuiton-web/205 Log: fix bad dep Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-30 15:52:05 UTC (rev 204) +++ trunk/pom.xml 2012-05-30 15:57:13 UTC (rev 205) @@ -240,7 +240,7 @@  <projectId>nuiton-web</projectId> - <nuitonI18nVersion>2.4.2</nuitonI18nVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion>

1 0

r204 - in trunk: . nuiton-rss/src/site nuiton-struts2/src/site nuiton-web/src/site src/site
by tchemit＠users.nuiton.org 30 May '12

30 May '12

Author: tchemit Date: 2012-05-30 17:52:05 +0200 (Wed, 30 May 2012) New Revision: 204 Url: http://nuiton.org/repositories/revision/nuiton-web/204 Log: updates to mavenpom 3.3.2 + updates some libs Modified: trunk/nuiton-rss/src/site/site_fr.xml trunk/nuiton-struts2/src/site/site_fr.xml trunk/nuiton-web/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/nuiton-rss/src/site/site_fr.xml =================================================================== --- trunk/nuiton-rss/src/site/site_fr.xml 2012-04-06 17:01:06 UTC (rev 203) +++ trunk/nuiton-rss/src/site/site_fr.xml 2012-05-30 15:52:05 UTC (rev 204) @@ -58,5 +58,23 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/nuiton-struts2/src/site/site_fr.xml =================================================================== --- trunk/nuiton-struts2/src/site/site_fr.xml 2012-04-06 17:01:06 UTC (rev 203) +++ trunk/nuiton-struts2/src/site/site_fr.xml 2012-05-30 15:52:05 UTC (rev 204) @@ -58,5 +58,23 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/nuiton-web/src/site/site_fr.xml =================================================================== --- trunk/nuiton-web/src/site/site_fr.xml 2012-04-06 17:01:06 UTC (rev 203) +++ trunk/nuiton-web/src/site/site_fr.xml 2012-05-30 15:52:05 UTC (rev 204) @@ -60,5 +60,23 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-06 17:01:06 UTC (rev 203) +++ trunk/pom.xml 2012-05-30 15:52:05 UTC (rev 204) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.2</version> + <version>3.3.2</version> </parent> <groupId>org.nuiton.web</groupId> @@ -240,11 +240,11 @@  <projectId>nuiton-web</projectId> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> + <nuitonI18nVersion>2.4.2</nuitonI18nVersion> + <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.6.9</topiaVersion> + <topiaVersion>2.6.10</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> @@ -255,7 +255,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.1.2</struts2Version> + <struts2Version>2.3.4</struts2Version> <servletApiVersion>2.5</servletApiVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> @@ -332,4 +332,45 @@ </site> </distributionManagement> + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + + </profile> + </profiles> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-06 17:01:06 UTC (rev 203) +++ trunk/src/site/site_fr.xml 2012-05-30 15:52:05 UTC (rev 204) @@ -27,11 +27,35 @@ <project name="${project.name}"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <publishDate position="right" /> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> @@ -39,8 +63,14 @@ <body> + <links> + <item name="Nuiton.org" href="http://www.nuiton.org"/> + <item name="Chorem.org" href="http://www.chorem.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + </links> + <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/nuiton-web/index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> </breadcrumbs> <menu ref="modules"/> @@ -51,5 +81,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>

1 0

r203 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: maven-release Date: 2012-04-06 19:01:06 +0200 (Fri, 06 Apr 2012) New Revision: 203 Url: http://nuiton.org/repositories/revision/nuiton-web/203 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-04-06 17:01:04 UTC (rev 202) +++ trunk/nuiton-gwt/pom.xml 2012-04-06 17:01:06 UTC (rev 203) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.11</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-04-06 17:01:04 UTC (rev 202) +++ trunk/nuiton-rss/pom.xml 2012-04-06 17:01:06 UTC (rev 203) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.11</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-04-06 17:01:04 UTC (rev 202) +++ trunk/nuiton-struts2/pom.xml 2012-04-06 17:01:06 UTC (rev 203) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.11</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-04-06 17:01:04 UTC (rev 202) +++ trunk/nuiton-tapestry/pom.xml 2012-04-06 17:01:06 UTC (rev 203) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.11</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-04-06 17:01:04 UTC (rev 202) +++ trunk/nuiton-web/pom.xml 2012-04-06 17:01:06 UTC (rev 203) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.11</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-06 17:01:04 UTC (rev 202) +++ trunk/pom.xml 2012-04-06 17:01:06 UTC (rev 203) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.11</version> + <version>1.12-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -318,11 +318,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.11</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.11 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.11</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r202 - tags
by maven-release＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: maven-release Date: 2012-04-06 19:01:04 +0200 (Fri, 06 Apr 2012) New Revision: 202 Url: http://nuiton.org/repositories/revision/nuiton-web/202 Log: [maven-release-plugin] copy for tag nuiton-web-1.11 Added: tags/nuiton-web-1.11/

1 0