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

r261 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 15:05:12 +0200 (Mon, 29 Apr 2013) New Revision: 261 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/261 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/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 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-gwt/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-rss/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-struts2/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-tapestry/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-web/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12</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.12 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r260 - in tags: . nuiton-web-1.12
by maven-release＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 15:05:10 +0200 (Mon, 29 Apr 2013) New Revision: 260 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/260 Log: [maven-release-plugin] copy for tag nuiton-web-1.12 Added: tags/nuiton-web-1.12/ Property changes on: tags/nuiton-web-1.12 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r259 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 15:05:08 +0200 (Mon, 29 Apr 2013) New Revision: 259 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/259 Log: [maven-release-plugin] prepare release nuiton-web-1.12 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/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 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-gwt/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-rss/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-struts2/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-tapestry/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-web/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r258 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org 22 Mar '13

22 Mar '13

Author: bleny Date: 2013-03-22 12:16:53 +0100 (Fri, 22 Mar 2013) New Revision: 258 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/258 Log: refs #2593 Introduce JpaTransactionFilter: getTransaction() must not be called without saving reference, let DAO layer deal with it Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-20 14:33:52 UTC (rev 257) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-22 11:16:53 UTC (rev 258) @@ -360,8 +360,6 @@ // first time entityManager is required, create its entityManager = createEntityManager(request); - entityManager.getTransaction().begin(); - if (log.isDebugEnabled()) { log.debug("created entityManager " + entityManager); }

1 0

r257 - in trunk/nuiton-security/src/main: java/org/nuiton/web/security java/org/nuiton/web/security/actions resources
by echatellier＠users.nuiton.org 20 Mar '13

20 Mar '13

Author: echatellier Date: 2013-03-20 15:33:52 +0100 (Wed, 20 Mar 2013) New Revision: 257 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/257 Log: fixes #2618: Redirect user to referer page if user ask for login page by himself fixes #2617: Cache user shiro autorization Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/resources/struts.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-20 14:33:52 UTC (rev 257) @@ -66,9 +66,9 @@ public static final String ROOT_CONTEXT_CONTEXT = SecurityShiroFilter.class.getName() + "#" + TopiaContext.class.getName(); public static final String ANON_LOGIN = "anonymous"; - - public static final String SESSION_SAVED_URL = "savedUrl"; + public static final String SESSION_REQUESTED_URL = "securityRequestedUrl"; + protected ApplicationConfig config; protected TopiaContext rootContext; @@ -138,14 +138,20 @@ } // to have permission, a user must be authenticated - if (!subjectUser.isAuthenticated()) { + // can't use !subjectUser.isAuthenticated() here (for cache purpose) + if (subjectUser.getPrincipal() == null) { subjectUser.login(new UsernamePasswordToken(ANON_LOGIN, "")); } + // configuration + String loginUrl = config.getOption("topia.security.loginurl"); + // get permission from requested uri without context path HttpServletRequest httpServletRequest = ((HttpServletRequest)servletRequest); String contextPath = httpServletRequest.getContextPath(); String uri = httpServletRequest.getRequestURI(); + // removing jsession id from url + uri = uri.replaceFirst(";(jsessionid|JSESSIONID)=[\\w-]*", ""); if (uri.startsWith(contextPath)) { uri = uri.substring(contextPath.length()); } @@ -160,13 +166,22 @@ // dans ca cas, il faut sauvegarder la page d'avant comme url // de retour (seulement s'il n'y a pas deja une valeur de retour) Session session = subjectUser.getSession(); - if (uri.equals(config.getOption("topia.security.loginurl"))) { - if (session.getAttribute(SESSION_SAVED_URL) == null) { - String referrer = httpServletRequest.getHeader("referer"); - session.setAttribute(SESSION_SAVED_URL, referrer); + if (uri.equals(loginUrl)) { + // il ne faut pas ecraser l'url intercepter lors + // de la redirection vers la page de login + if (session.getAttribute(SESSION_REQUESTED_URL) == null) { + String referer = httpServletRequest.getHeader("referer"); + if (referer != null) { + // removing jsession id from url + referer = referer.replaceFirst(";(jsessionid|JSESSIONID)=[\\w-]*", ""); + if (!referer.endsWith(loginUrl)) { + if (log.isDebugEnabled()) { + log.debug("Remembering referer as " + referer); + } + session.setAttribute(SESSION_REQUESTED_URL, referer); + } + } } - } else { - session.removeAttribute(SESSION_SAVED_URL); } // on devrait appeler simplement super.doFilterInternal(servletRequest, servletResponse, chain); @@ -187,8 +202,9 @@ if (log.isDebugEnabled()) { log.debug("User is NOT permitted to access " + perm); } - // anon n'est pas considéré comme authenticated - if (ANON_LOGIN.equals(subjectUser.getPrincipal())) { + if (subjectUser.isAuthenticated()) { + ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); + } else { if (log.isDebugEnabled()) { log.debug("Redirecting user to login page"); } @@ -198,11 +214,9 @@ if (httpServletRequest.getQueryString() != null) { requestURL.append('?').append(httpServletRequest.getQueryString()); } - session.setAttribute(SESSION_SAVED_URL, requestURL.toString()); + session.setAttribute(SESSION_REQUESTED_URL, requestURL.toString()); String redirect = contextPath + config.getOption("topia.security.loginurl"); ((HttpServletResponse)servletResponse).sendRedirect(redirect); - } else { - ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); } } } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-20 14:33:52 UTC (rev 257) @@ -24,6 +24,8 @@ package org.nuiton.web.security; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; import org.apache.commons.lang3.StringUtils; @@ -42,8 +44,8 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.util.StringUtil; import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; /** @@ -59,10 +61,13 @@ protected ApplicationConfig config; + /** Authorization cache (invalidated at login). */ + protected transient Map<String, SimpleAuthorizationInfo> authorizationCache; + public TopiaSecurityRealm(TopiaContext rootContext, ApplicationConfig config) { this.rootContext = rootContext; this.config = config; - + authorizationCache = new HashMap<String, SimpleAuthorizationInfo>(); setCredentialsMatcher(this); } @@ -79,42 +84,43 @@ @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - SimpleAuthorizationInfo result = null; - - Properties props = config.getFlatOptions(); - TopiaContext transaction = null; - try { - String login = (String) principals.getPrimaryPrincipal(); - transaction = rootContext.beginTransaction(); - SecurityUserDAO securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); - - if (log.isDebugEnabled()) { - log.debug("Build autorisation list for user : " + login); - } - - SecurityUser securityUser = securityUserDAO.findByLogin(login); - result = new SimpleAuthorizationInfo(); - for (SecurityRole role : securityUser.getSecurityRole()) { - for (String permission : role.getPermissions()) { - //result.addStringPermission(permission); - if (log.isDebugEnabled()) { - log.debug("- add permission : " + permission); - } - - for (String prop : props.stringPropertyNames()) { - if (prop.startsWith("topia.security.permission.")) { - String endProp = StringUtils.removeStart(prop, "topia.security.permission."); - String[] subs = endProp.split("\\."); - if (subs.length == 3) { - if (subs[2].equals("perm")) { - if (subs[1].equals(permission)) { - String perms = props.getProperty(prop); - // use ; separator because shiro use , - String[] permTab = perms.split("\\s*\\;\\s*"); - for (String perm : permTab) { - result.addStringPermission(perm); - if (log.isDebugEnabled()) { - log.debug(" string permission : " + perm); + String login = (String) principals.getPrimaryPrincipal(); + SimpleAuthorizationInfo result = authorizationCache.get(login); + if (result == null) { + Properties props = config.getFlatOptions(); + TopiaContext transaction = null; + try { + transaction = rootContext.beginTransaction(); + SecurityUserDAO securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + + if (log.isDebugEnabled()) { + log.debug("Build autorisation list for user : " + login); + } + + SecurityUser securityUser = securityUserDAO.findByLogin(login); + result = new SimpleAuthorizationInfo(); + for (SecurityRole role : securityUser.getSecurityRole()) { + for (String permission : role.getPermissions()) { + //result.addStringPermission(permission); + if (log.isDebugEnabled()) { + log.debug("- add permission : " + permission); + } + + for (String prop : props.stringPropertyNames()) { + if (prop.startsWith("topia.security.permission.")) { + String endProp = StringUtils.removeStart(prop, "topia.security.permission."); + String[] subs = endProp.split("\\."); + if (subs.length == 3) { + if (subs[2].equals("perm")) { + if (subs[1].equals(permission)) { + String perms = props.getProperty(prop); + // use ; separator because shiro use , + String[] permTab = perms.split("\\s*\\;\\s*"); + for (String perm : permTab) { + result.addStringPermission(perm); + if (log.isDebugEnabled()) { + log.debug(" string permission : " + perm); + } } } } @@ -123,40 +129,47 @@ } } } - } + + // si seul l'utilisateur anon existe + // on lui offre une promotion + if (login.equals(SecurityShiroFilter.ANON_LOGIN) && securityUserDAO.count() == 1) { + result.addStringPermission("*"); + if (log.isDebugEnabled()) { + log.debug("Grant all rigth (*) because no user exists"); + } + } + + // si la securité est desactivee, + if (config.getOptionAsBoolean("topia.security.disable")) { + result.addStringPermission("*"); + } + + // ajout de l'url de login et logout quand meme !!! + result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.loginurl"), + config.getOption("topia.security.separators"))); + result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.logouturl"), + config.getOption("topia.security.separators"))); - // si seul l'utilisateur anon existe - // on lui offre une promotion - if (login.equals(SecurityShiroFilter.ANON_LOGIN) && securityUserDAO.count() == 1) { - result.addStringPermission("*"); - if (log.isDebugEnabled()) { - log.debug("Grant all rigth (*) because no user exists"); + // cache authorization + authorizationCache.put(login, result); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't get user permission", ex); } + } finally { + if (transaction != null) { + try { + transaction.closeContext(); + } catch (TopiaException ex) { + throw new TopiaRuntimeException(ex); + } + } } - - // si la securité est desactivee, - if (config.getOptionAsBoolean("topia.security.disable")) { - result.addStringPermission("*"); + } else { + if (log.isTraceEnabled()) { + log.trace("Using autorisation from cache for " + login); } - - // ajout de l'url de login et logout quand meme !!! - result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.loginurl"), - config.getOption("topia.security.separators"))); - result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.logouturl"), - config.getOption("topia.security.separators"))); - - } catch (Exception ex) { - - } finally { - if (transaction != null) { - try { - transaction.closeContext(); - } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); - } - } } - return result; } @@ -186,6 +199,9 @@ result = new SimpleAuthenticationInfo(securityUser.getLogin(), securityUser.getPassword(), getName()); } + + // invalidate cache for login + authorizationCache.remove(login); } } catch (TopiaException ex) { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2013-03-20 14:33:52 UTC (rev 257) @@ -26,9 +26,6 @@ import static org.nuiton.i18n.I18n._; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.SecurityUtils; @@ -40,11 +37,9 @@ import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; -import org.apache.struts2.interceptor.ServletRequestAware; -import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.web.security.SecurityShiroFilter; -public class LoginAction extends AbstractAction implements ServletRequestAware, ServletResponseAware { +public class LoginAction extends AbstractAction { private static final Log log = LogFactory.getLog(LoginAction.class); @@ -55,19 +50,8 @@ protected String password; - protected HttpServletRequest request; - protected HttpServletResponse response; + protected String savedUrl; - @Override - public void setServletRequest(HttpServletRequest request) { - this.request = request; - } - - @Override - public void setServletResponse(HttpServletResponse response) { - this.response = response; - } - public void setLogin(String login) { this.login = login; } @@ -78,7 +62,7 @@ @Override public String execute() throws Exception { - String result = null; + String result = SUCCESS; if (login == null || password == null) { result = input(); @@ -87,18 +71,19 @@ Subject currentUser = SecurityUtils.getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(login, password); currentUser.login(token); - result = SUCCESS; - + // marche pas :( //SavedRequest savedRequest = WebUtils.getAndClearSavedRequest(request); Session session = currentUser.getSession(); - String requestURL = (String)session.getAttribute(SecurityShiroFilter.SESSION_SAVED_URL); - if (request != null) { // can be + savedUrl = (String)session.getAttribute(SecurityShiroFilter.SESSION_REQUESTED_URL); + if (savedUrl != null) { // can be if (log.isDebugEnabled()) { - log.debug("Redirecting to saved url " + requestURL); + log.debug("Redirecting to saved url " + savedUrl); } - session.removeAttribute(SecurityShiroFilter.SESSION_SAVED_URL); - response.sendRedirect(requestURL); + session.removeAttribute(SecurityShiroFilter.SESSION_REQUESTED_URL); + result = "redirect"; + } else { + result = SUCCESS; } } catch (UnknownAccountException ex) { addActionError(_("Identifiant ou mot de passe invalide !")); @@ -125,4 +110,8 @@ return result; } + public String getSavedUrl() { + return savedUrl; + } + } Modified: trunk/nuiton-security/src/main/resources/struts.xml =================================================================== --- trunk/nuiton-security/src/main/resources/struts.xml 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/resources/struts.xml 2013-03-20 14:33:52 UTC (rev 257) @@ -58,6 +58,7 @@ <result name="success" type="redirectAction"> <param name="actionName">user-roles</param> </result> + <result name="redirect" type="redirect">${savedUrl}</result> </action> <action name="logout" class="org.nuiton.web.security.actions.LogoutAction"> <result name="success" type="redirectAction">

1 0

r256 - in trunk/nuiton-security/src/main: java/org/nuiton/web/security resources resources/WEB-INF/security
by echatellier＠users.nuiton.org 19 Mar '13

19 Mar '13

Author: echatellier Date: 2013-03-19 18:14:04 +0100 (Tue, 19 Mar 2013) New Revision: 256 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/256 Log: Correction de l'?\195?\169tat 'connect?\195?\169' de l'utilisateur annonyme. Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp trunk/nuiton-security/src/main/resources/struts.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -52,6 +52,11 @@ import org.nuiton.util.config.ApplicationConfig; import org.nuiton.web.SecurityDAOHelper; +/** + * Servlet filter used to filter requested url. + * + * @author Eric Chatellier + */ public class SecurityShiroFilter extends AbstractShiroFilter { private static final Log log = LogFactory.getLog(SecurityShiroFilter.class); @@ -151,6 +156,19 @@ log.debug("User is permitted to access " + perm); } + // on peu demander explicitement la page de login + // dans ca cas, il faut sauvegarder la page d'avant comme url + // de retour (seulement s'il n'y a pas deja une valeur de retour) + Session session = subjectUser.getSession(); + if (uri.equals(config.getOption("topia.security.loginurl"))) { + if (session.getAttribute(SESSION_SAVED_URL) == null) { + String referrer = httpServletRequest.getHeader("referer"); + session.setAttribute(SESSION_SAVED_URL, referrer); + } + } else { + session.removeAttribute(SESSION_SAVED_URL); + } + // on devrait appeler simplement super.doFilterInternal(servletRequest, servletResponse, chain); // mais on ne peut pas car il recreer un nouveau Subject // et n'utilise pas le notre :( Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -34,8 +34,12 @@ import org.apache.shiro.subject.SubjectContext; import org.apache.shiro.web.mgt.DefaultWebSubjectFactory; import org.apache.shiro.web.subject.WebSubjectContext; -import org.apache.shiro.web.subject.support.WebDelegatingSubject; +/** + * Redefine subject factory method to instanciate {@link TopiaWebSubject}. + * + * @author Eric Chatellier + */ public class SecuritySubjectFactory extends DefaultWebSubjectFactory { @Override @@ -50,16 +54,11 @@ PrincipalCollection principals = wsc.resolvePrincipals(); boolean authenticated = wsc.resolveAuthenticated(); - // dans le cas du module securité, on va dire que non - if (authenticated && SecurityShiroFilter.ANON_LOGIN.equals(principals.getPrimaryPrincipal())) { - authenticated = false; - } - String host = wsc.resolveHost(); ServletRequest request = wsc.resolveServletRequest(); ServletResponse response = wsc.resolveServletResponse(); - return new WebDelegatingSubject(principals, authenticated, host, session, sessionEnabled, + return new TopiaWebSubject(principals, authenticated, host, session, sessionEnabled, request, response, securityManager); } } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -24,6 +24,11 @@ package org.nuiton.web.security; +/** + * Security related utils method. + * + * @author Eric Chatellier + */ public class SecurityUtil { /** Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -46,6 +46,11 @@ import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; +/** + * Topia shiro realm finding user in database. + * + * @author Eric Chatellier + */ public class TopiaSecurityRealm extends AuthorizingRealm implements CredentialsMatcher { private static final Log log = LogFactory.getLog(TopiaSecurityRealm.class); Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java (rev 0) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java 2013-03-19 17:14:04 UTC (rev 256) @@ -0,0 +1,54 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.web.security; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.apache.shiro.mgt.SecurityManager; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.PrincipalCollection; +import org.apache.shiro.web.subject.support.WebDelegatingSubject; + +/** + * Classe redefinie pour surcharger la methode {@code isAuthenticated()} + * car la methode login() la passe obligatoirement a {@code true}. + * + * @author Eric Chatellier + */ +public class TopiaWebSubject extends WebDelegatingSubject { + + public TopiaWebSubject(PrincipalCollection principals, boolean authenticated, + String host, Session session, boolean sessionEnabled, + ServletRequest request, ServletResponse response, + SecurityManager securityManager) { + super(principals, authenticated, host, session, sessionEnabled, request, response, securityManager); + } + + @Override + public boolean isAuthenticated() { + boolean result = super.isAuthenticated() && !SecurityShiroFilter.ANON_LOGIN.equals(principals.getPrimaryPrincipal()); + return result; + } +} Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -42,21 +42,23 @@ <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> </s:iterator> <table class="security-table"> - <tr> - <td class="security-empty" /> - <s:iterator value="roles"> - <td><a href="<s:url action='role!input' namespace='/security'> - <s:param name="roleId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="name" /> - </a></td> - </s:iterator> - </tr> <s:iterator value="categories.keys" var="category"> <s:set name="categoryName" value="categories.get(#category)" /> <tr> <th colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></th> </tr> + + <tr class="security-roles"> + <td class="security-empty" /> + <s:iterator value="roles"> + <td><a href="<s:url action='role!input' namespace='/security'> + <s:param name="roleId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="name" /> + </a></td> + </s:iterator> + </tr> + <s:iterator value="categoryPermissions.get(#category)" var="categoryPermission"> <s:set name="permissionName" value="permissions.get(#categoryPermission)" /> <tr> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,13 +39,13 @@ <form action="<s:url action="user-roles" namespace="/security" />" method="post" class="security-form"> <table class="security-table"> <tr> - <td colspan="2" class="security-empty"/> + <td class="security-empty"/> <s:if test="!roles.empty"> <th colspan="<s:property value="roles.size()" />">Rôles</th> </s:if> </tr> <tr> - <td colspan="2" class="security-empty"/> + <th class="vertical">Utilisateurs</th> <s:iterator value="roles"> <td> <a href="<s:url action='role!input' namespace='/security'> @@ -59,9 +59,6 @@ <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> <s:if test="login == @org.nuiton.web.security.SecurityShiroFilter@ANON_LOGIN"> <s:property value="login" /> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-security/src/main/resources/struts.xml =================================================================== --- trunk/nuiton-security/src/main/resources/struts.xml 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/struts.xml 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -27,7 +27,7 @@ <struts> <package name="org.nuiton.web.secu.actions" namespace="/security" extends="struts-default"> - <default-action-ref name="user-roles"/> + <default-action-ref name="user-roles"/> <action name="user-roles" class="org.nuiton.web.security.actions.UserRolesAction"> <result name="input">/WEB-INF/security/user-roles.jsp</result>

1 0

r255 - trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 11:55:58 +0100 (Mon, 18 Mar 2013) New Revision: 255 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/255 Log: Fix deprecated code Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2013-03-18 09:45:21 UTC (rev 254) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2013-03-18 10:55:58 UTC (rev 255) @@ -31,7 +31,7 @@ import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.util.ServletContextAware; import org.nuiton.topia.TopiaContext; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.web.security.SecurityShiroFilter; import com.opensymphony.xwork2.ActionSupport;

1 0

r254 - in trunk: . nuiton-security nuiton-security/src/main/java/org/nuiton/web/security nuiton-struts2
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 10:45:21 +0100 (Mon, 18 Mar 2013) New Revision: 254 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/254 Log: Fix dependencies and deprecated code Modified: trunk/nuiton-security/pom.xml trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-struts2/pom.xml trunk/pom.xml Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-18 09:45:21 UTC (rev 254) @@ -49,7 +49,7 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaUtil; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.web.SecurityDAOHelper; public class SecurityShiroFilter extends AbstractShiroFilter { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 09:45:21 UTC (rev 254) @@ -42,7 +42,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-struts2/pom.xml 2013-03-18 09:45:21 UTC (rev 254) @@ -36,11 +36,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> @@ -56,11 +51,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/pom.xml 2013-03-18 09:45:21 UTC (rev 254) @@ -79,7 +79,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>${slf4jVersion}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency>  @@ -130,6 +130,11 @@ <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency>  <dependency>

1 0

r253 - trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 10:41:31 +0100 (Mon, 18 Mar 2013) New Revision: 253 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/253 Log: Fix deprecated code Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java 2013-03-18 09:37:08 UTC (rev 252) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java 2013-03-18 09:41:31 UTC (rev 253) @@ -24,16 +24,17 @@ */ package org.nuiton.web.struts2; -import com.opensymphony.xwork2.LocaleProvider; -import junit.framework.Assert; +import java.util.Arrays; +import java.util.Locale; + import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; -import java.util.Arrays; -import java.util.Locale; +import com.opensymphony.xwork2.LocaleProvider; public class I18nTextProviderTest {

1 0

r252 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 10:37:08 +0100 (Mon, 18 Mar 2013) New Revision: 252 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/252 Log: fixes #2611: Remove deprected FilterPagerUtil from nuiton-struts Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java 2013-03-18 09:34:18 UTC (rev 251) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java 2013-03-18 09:37:08 UTC (rev 252) @@ -1,356 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.web.struts2; - -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.util.PagerUtil; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -/** - * Will me removed soon, do not use this class. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.9.2 - * @deprecated since 1.11, was moved in ToPIA project at org.nuiton.topia.persistence.TopiaFilterPagerUtil. - */ -@Deprecated -public class FilterPagerUtil extends PagerUtil { - - protected FilterPagerUtil() { - } - - public static TopiaQuery addPagerToQuery(TopiaQuery query, - FilterPagerBean pager) { - PagerUtil.computeRecordIndexesAndPagesNumber(pager); - query.setLimit(pager.getRecordStartIndex(), - pager.getRecordEndIndex() - 1); - - if (StringUtils.isNotEmpty(pager.getSortColumn())) { - if (pager.isSortAscendant()) { - query.addOrder(pager.getSortColumn()); - } else { - query.addOrderDesc(pager.getSortColumn()); - } - } - return query; - } - - public static <E> List<E> getPageFromList(List<E> elements, - FilterPagerBean pager) { - - PagerUtil.computeRecordIndexesAndPagesNumber(pager); - List<E> subList = getPage(elements, pager.getPageIndex(), pager.getPageSize()); - List<E> result = new ArrayList<E>(subList); - - return result; - } - - public static FilterPagerBean newFilterPagerBean() { - return new FilterPagerBean(); - } - - public static class FilterPagerBean extends PagerBean { - - private static final long serialVersionUID = 1L; - - // sorting order - asc or desc - protected boolean sortAscendant; - - // get index row - i.e. user click to sort. - protected String sortColumn; - - protected FilterOperationGroup groupOp; - - private List<FilterRule> rules; - - public boolean canFilter() { - return groupOp != null && CollectionUtils.isNotEmpty(rules); - } - - public FilterOperationGroup getGroupOp() { - return groupOp; - } - - public void setGroupOp(FilterOperationGroup groupOp) { - this.groupOp = groupOp; - } - - public List<FilterRule> getRules() { - return rules; - } - - public void setRules(List<FilterRule> rules) { - this.rules = rules; - } - - public boolean isSortAscendant() { - return sortAscendant; - } - - public void setSortAscendant(boolean sortAscendant) { - this.sortAscendant = sortAscendant; - } - - public String getSortColumn() { - return sortColumn; - } - - public void setSortColumn(String sortColumn) { - this.sortColumn = sortColumn; - } - } - - public static class FilterRule implements Serializable { - - private static final long serialVersionUID = 1L; - - protected final FilterOperation op; - - protected final String field; - - protected final String data; - - public FilterRule(FilterOperation op, - String field, - String data) { - this.op = op; - this.field = field; - this.data = data; - } - - public FilterOperation getOp() { - return op; - } - - public String getField() { - return field; - } - - public String getData() { - return data; - } - } - - public enum FilterOperationGroup { - OR, AND - } - - public enum FilterOperation { - /** Equals operator. */ - eq { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " = :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Not equals operator. */ - ne { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " != :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Contains operator. */ - cn { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " like :" + paramName; - filterParams.put(paramName, "%" + data + "%"); - return ruleFilter; - } - }, - /** Not contains operator. */ - nc { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " not like :" + paramName; - filterParams.put(paramName, "%" + data + "%"); - return ruleFilter; - } - }, - /** Begins with operator. */ - bw { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " like :" + paramName; - filterParams.put(paramName, data + "%"); - return ruleFilter; - } - }, - /** Not between with operator. */ - bn { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " not like :" + paramName; - filterParams.put(paramName, data + "%"); - return ruleFilter; - } - }, - /** Ends with operator. */ - ew { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " like :" + paramName; - filterParams.put(paramName, "%" + data); - return ruleFilter; - } - }, - /** Not End with operator. */ - en { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " not like :" + paramName; - filterParams.put(paramName, "%" + data); - return ruleFilter; - } - }, - /** Lesser than operator. */ - lt { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " < :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Lesser or equals operator. */ - le { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " <= :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Greater than operator. */ - gt { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " > :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Greater or equals operator. */ - ge { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " >= :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Is null operator. */ - nu { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " is null"; - return ruleFilter; - } - }, - /** Is not null operator. */ - nn { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " is not null"; - return ruleFilter; - } - }, - /** Is among operator. */ - in { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - throw new UnsupportedOperationException(); - } - }, - /** Not is among operator. */ - ni { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - throw new UnsupportedOperationException(); - } - }; - - public abstract String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams); - } - - - public static FilterPagerBeanBuilder newFilterPagerBeanBuilder(String operationGroup) { - FilterOperationGroup operationGroup1 = FilterOperationGroup.valueOf(operationGroup); - FilterPagerBeanBuilder builder = new FilterPagerBeanBuilder(operationGroup1); - return builder; - } - - public static class FilterPagerBeanBuilder { - - protected final FilterOperationGroup groupOp; - - protected final List<FilterRule> rules; - - public FilterPagerBeanBuilder(FilterOperationGroup groupOp) { - this.groupOp = groupOp; - rules = new LinkedList<FilterRule>(); - } - - public FilterPagerBeanBuilder addOperations(Collection<Map<String, String>> operations) { - for (Map<String, String> operation : operations) { - addRule(operation); - } - return this; - } - - public FilterPagerBeanBuilder addRule(Map<String, String> ruleMap) { - String op = ruleMap.get("op"); - String property = ruleMap.get("field"); - String value = ruleMap.get("data"); - FilterOperation operator = FilterOperation.valueOf(op); - return addRule(new FilterRule(operator, property, value)); - } - - public FilterPagerBeanBuilder addRule(FilterRule rule) { - rules.add(rule); - return this; - } - - public void flush(FilterPagerBean bean) { - bean.setGroupOp(groupOp); - bean.setRules(rules); - } - - - } -}

1 0