r1742 - in trunk: . wao-persistence/src/main/java/fr/ifremer/wao wao-web/src/main/java/fr/ifremer/wao/web
Author: tchemit Date: 2014-03-25 11:57:36 +0100 (Tue, 25 Mar 2014) New Revision: 1742 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1742 Log: fix hibernate version Modified: trunk/pom.xml trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-25 10:36:04 UTC (rev 1741) +++ trunk/pom.xml 2014-03-25 10:57:36 UTC (rev 1742) @@ -106,7 +106,7 @@ <bootstrapPluginVersion>1.7.0</bootstrapPluginVersion> <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.6</slf4jVersion> - <hibernateVersion>4.3.1.Final</hibernateVersion> + <hibernateVersion>4.2.8.Final</hibernateVersion> <mockitoVersion>1.9.5</mockitoVersion> <postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion> <commonsEmailVersion>1.3.2</commonsEmailVersion> Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-25 10:36:04 UTC (rev 1741) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-25 10:57:36 UTC (rev 1742) @@ -68,6 +68,7 @@ protected Set<String> orderByArguments; + //FIXME Remove this protected boolean estimatedTides; public ObsProgram getObsProgram() { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 10:36:04 UTC (rev 1741) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 10:57:36 UTC (rev 1742) @@ -80,7 +80,7 @@ if (waoSession.getAuthenticatedWaoUser() == null) { - boolean loginCheat = false; + boolean loginCheat = true; if (loginCheat) { // login à l'arrache WaoUser admin = serviceContext.getPersistenceContext().getWaoUserDao().forLoginEquals("admin").findUnique();
participants (1)
-
tchemit@users.forge.codelutin.com