Nuiton-web-commits

Download

nuiton-web-commits@list.nuiton.org

June 2014

1 participants
1 discussions

r325 - in trunk: . nuiton-security/src/main/java/org/nuiton/web/security nuiton-security/src/main/java/org/nuiton/web/security/actions nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter nuiton-web/src/main/java/org/nuiton/web/filter
by dralagen＠users.nuiton.org 04 Jun '14

04 Jun '14

Author: dralagen Date: 2014-06-04 11:24:23 +0200 (Wed, 04 Jun 2014) New Revision: 325 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/325 Log: fixes #3247 replace closeContext to close 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/RoleAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java trunk/pom.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 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2014-06-04 09:24:23 UTC (rev 325) @@ -115,7 +115,7 @@ protected static void initSchema(SecurityTopiaApplicationContext rootContext) throws TopiaException { SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); boolean testTable = TopiaUtil.isSchemaExist(transaction.getHibernateSupport(), SecurityUserImpl.class.getName()); - transaction.closeContext(); + transaction.close(); if (!testTable) { if (log.isInfoEnabled()) { log.info("Create database schema"); @@ -128,7 +128,7 @@ SecurityUser anonUser = securityUserDAO.create(); anonUser.setLogin(ANON_LOGIN); transaction2.commit(); - transaction2.closeContext(); + transaction2.close(); } else { if (log.isDebugEnabled()) { log.debug("Table SecurityUser found, skip schema creation"); @@ -237,7 +237,7 @@ if (rootContext != null) { try { - rootContext.closeContext(); + rootContext.close(); } catch (TopiaException ex) { if (log.isErrorEnabled()) { log.error("Can't close root context", ex); 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 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2014-06-04 09:24:23 UTC (rev 325) @@ -156,7 +156,7 @@ } } finally { if (transaction != null) { - transaction.closeContext(); + transaction.close(); } } } else { @@ -200,7 +200,7 @@ } finally { if (transaction != null) { - transaction.closeContext(); + transaction.close(); } } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2014-06-04 09:24:23 UTC (rev 325) @@ -50,7 +50,7 @@ SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); securityRoleDAO = transaction.getSecurityRoleDao(); role = securityRoleDAO.findByTopiaId(roleId); - transaction.closeContext(); + transaction.close(); } else { role = new SecurityRoleImpl(); } @@ -67,7 +67,7 @@ SecurityRole role = securityRoleDAO.findByTopiaId(roleId); securityRoleDAO.delete(role); transaction.commit(); - transaction.closeContext(); + transaction.close(); } } catch (Exception ex) { @@ -92,7 +92,7 @@ securityRoleDAO.update(getRole()); } transaction.commit(); - transaction.closeContext(); + transaction.close(); } catch (Exception ex) { addActionError(ex.getMessage()); result = input(); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2014-06-04 09:24:23 UTC (rev 325) @@ -62,7 +62,7 @@ SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); securityRoleDAO = transaction.getSecurityRoleDao(); roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.NAME).findAll(); - transaction.closeContext(); + transaction.close(); categories = new HashMap<String, String>(); permissions = new HashMap<String, String>(); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-06-04 09:24:23 UTC (rev 325) @@ -56,7 +56,7 @@ SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); securityUserDAO = transaction.getSecurityUserDao(); user = securityUserDAO.findByTopiaId(roleId); - transaction.closeContext(); + transaction.close(); } else { user = new SecurityUserImpl(); } @@ -81,7 +81,7 @@ SecurityUser user = securityUserDAO.findByTopiaId(roleId); securityUserDAO.delete(user); transaction.commit(); - transaction.closeContext(); + transaction.close(); } } catch (Exception ex) { if (log.isErrorEnabled()) { @@ -120,7 +120,7 @@ securityUserDAO.update(user); } transaction.commit(); - transaction.closeContext(); + transaction.close(); } catch (Exception ex) { addActionError(ex.getMessage()); result = input(); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2014-06-04 09:24:23 UTC (rev 325) @@ -54,7 +54,7 @@ securityRoleDAO = transaction.getSecurityRoleDao(); users = securityUserDAO.newQueryBuilder().setOrderByArguments(SecurityUser.LOGIN).findAll(); roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.NAME).findAll(); - transaction.closeContext(); + transaction.close(); return super.input(); } @@ -94,7 +94,7 @@ } } transaction.commit(); - transaction.closeContext(); + transaction.close(); } catch (Exception ex) { addActionError(ex.getMessage()); result = input(); Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2014-06-04 09:24:23 UTC (rev 325) @@ -77,7 +77,7 @@ if (log.isDebugEnabled()) { log.debug("close transaction " + transaction); } - transaction.closeContext(); + transaction.close(); } } } Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2014-06-04 09:24:23 UTC (rev 325) @@ -107,14 +107,14 @@ public static final String[] DEFAULT_EXCLUDE_METHODS = { "beginTransaction", - "closeContext", + "close", "clear" }; public static final String[] DEFAULT_UNUSED_METHODS = { "toString", "isClosed", - "closeContext", + "close", "clear", "equals", "hashCode", @@ -304,7 +304,7 @@ } tx.rollback(); } - transaction.closeContext(); + transaction.close(); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-17 16:22:47 UTC (rev 324) +++ trunk/pom.xml 2014-06-04 09:24:23 UTC (rev 325) @@ -89,14 +89,14 @@  <projectId>nuiton-web</projectId> - <eugeneVersion>2.7.4</eugeneVersion> + <eugeneVersion>2.10</eugeneVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-alpha-10</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0