This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit 6c3c9bdf6e742e867a86839fc3e60b77dffaf7c9 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Jun 26 21:05:53 2016 +0200 fixes #3954: Update libs fixes #3953: Update topia 3.1.1 --- nuiton-security/pom.xml | 1 + .../nuiton/web/security/SecurityShiroFilter.java | 17 ++++------- .../nuiton/web/security/TopiaSecurityRealm.java | 4 +-- pom.xml | 34 +++++++++++----------- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/nuiton-security/pom.xml b/nuiton-security/pom.xml index eae0394..6cfb24d 100644 --- a/nuiton-security/pom.xml +++ b/nuiton-security/pom.xml @@ -122,6 +122,7 @@ <fullPackagePath>org.nuiton.web</fullPackagePath> <defaultPackage>org.nuiton.web</defaultPackage> <templates>org.nuiton.topia.templates.TopiaMetaTransformer</templates> + <failIfUnsafe>false</failIfUnsafe> </configuration> <goals> <goal>generate</goal> diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java b/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java index 7f156b8..747218f 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java @@ -91,7 +91,6 @@ public class SecurityShiroFilter extends AbstractShiroFilter { } // get topia root context - config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); Properties props = config.getFlatOptions(); rootContext = TopiaApplicationContextCache.getContext(props, CREATE_SECURITY_APPLICATION_CONTEXT); initSchema(rootContext); @@ -112,26 +111,22 @@ public class SecurityShiroFilter extends AbstractShiroFilter { protected static void initSchema(SecurityTopiaApplicationContext rootContext) throws TopiaException { SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); - boolean testTable = TopiaUtil.isSchemaExist(transaction.getHibernateSupport(), SecurityUserImpl.class.getName()); - transaction.close(); - if (!testTable) { + SecurityUserTopiaDao securityUserDAO = transaction.getSecurityUserDao(); + if (securityUserDAO.count() == 0) { if (log.isInfoEnabled()) { - log.info("Create database schema"); + log.info("Create anon user"); } - rootContext.createSchema(); // create anon user - SecurityTopiaPersistenceContext transaction2 = rootContext.newPersistenceContext(); - SecurityUserTopiaDao securityUserDAO = transaction2.getSecurityUserDao(); SecurityUser anonUser = securityUserDAO.create(); anonUser.setLogin(ANON_LOGIN); - transaction2.commit(); - transaction2.close(); + transaction.commit(); } else { if (log.isDebugEnabled()) { - log.debug("Table SecurityUser found, skip schema creation"); + log.debug("At least one user found, skip anon user creation"); } } + transaction.close(); } @Override diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java b/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java index ce19e15..433599f 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java @@ -131,7 +131,7 @@ public class TopiaSecurityRealm extends AuthorizingRealm implements CredentialsM if (login.equals(SecurityShiroFilter.ANON_LOGIN) && securityUserDAO.count() == 1) { result.addStringPermission("*"); if (log.isDebugEnabled()) { - log.debug("Grant all rigth (*) because no user exists"); + log.debug("Grant all right (*) because no user exists"); } } @@ -182,7 +182,7 @@ public class TopiaSecurityRealm extends AuthorizingRealm implements CredentialsM transaction = rootContext.newPersistenceContext(); SecurityUserTopiaDao securityUserDAO = transaction.getSecurityUserDao(); - SecurityUser securityUser = securityUserDAO.forLoginEquals(login).findUnique(); + SecurityUser securityUser = securityUserDAO.forLoginEquals(login).findUniqueOrNull(); if (securityUser != null) { if (login.equals(SecurityShiroFilter.ANON_LOGIN)) { result = new SimpleAuthenticationInfo(securityUser.getLogin(), diff --git a/pom.xml b/pom.xml index 1d6b7b2..81dae3b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ License along with this program. If not, see <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>5</version> + <version>1.5</version> </parent> <groupId>org.nuiton.web</groupId> @@ -104,9 +104,9 @@ License along with this program. If not, see </modules> <scm> - <connection>scm:git:git@gitlab.nuiton.org:nuiton/nuiton-web.git</connection> - <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/nuiton-web.git</developerConnection> - <url>https://gitlab.nuiton.org/nuiton/nuiton-web</url> + <connection>scm:git:http://git.nuiton.org/nuiton-web.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-web.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-web.git</url> </scm> <distributionManagement> @@ -121,30 +121,30 @@ License along with this program. If not, see <!-- redmine project Id --> <projectId>nuiton-web</projectId> - <eugeneVersion>2.13</eugeneVersion> + <eugeneVersion>3.0-alpha-5</eugeneVersion> - <nuitonConfigVersion>3.0-rc-1</nuitonConfigVersion> - <nuitonI18nVersion>3.3</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-rc-7</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-rc-4</nuitonConfigVersion> + <nuitonI18nVersion>3.5</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-12</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-beta-12</topiaVersion> + <topiaVersion>3.1.1</topiaVersion> <!-- Tapestry --> <tapestryVersion>5.2.4</tapestryVersion> <!-- Do not upgrade to 5.3.x because on some incompatibilities --> - <slf4jVersion>1.7.5</slf4jVersion> + <slf4jVersion>1.7.21</slf4jVersion> <!-- GWT --> <gwtVersion>2.2.0</gwtVersion> <gwtPluginVersion>2.2.0</gwtPluginVersion> <!-- Strust 2 --> - <struts2Version>2.3.16</struts2Version> + <struts2Version>2.3.29</struts2Version> - <shiroVersion>1.2.2</shiroVersion> + <shiroVersion>1.2.5</shiroVersion> <servletApiVersion>3.0.1</servletApiVersion> - <jettyVersion>9.3.6.v20151106</jettyVersion> + <jettyVersion>9.3.10.v20160621</jettyVersion> <!--Multilanguage maven-site --> <locales>fr</locales> @@ -163,13 +163,13 @@ License along with this program. If not, see <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>3.4</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <dependency> @@ -193,7 +193,7 @@ License along with this program. If not, see <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> + <version>19.0</version> </dependency> <!-- WarLaunchers --> @@ -374,7 +374,7 @@ License along with this program. If not, see <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.