Author: glandais Date: 2008-03-18 20:03:52 +0000 (Tue, 18 Mar 2008) New Revision: 1402 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-service/pom.xml trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is/simexplorer-is-web/pom.xml trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java Log: Removed orm.xml Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-03-18 20:03:23 UTC (rev 1401) +++ trunk/simexplorer-is/pom.xml 2008-03-18 20:03:52 UTC (rev 1402) @@ -95,14 +95,14 @@ http://lutinbuilder.labs.libre-entreprise.org/maven2 </url> </pluginRepository> - <!--pluginRepository> - <id>evolvis-release-repository</id> - <name>evolvis.org release repository</name> - <url>http://maven-repo.evolvis.org/releases</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository--> + <!--pluginRepository> + <id>evolvis-release-repository</id> + <name>evolvis.org release repository</name> + <url>http://maven-repo.evolvis.org/releases</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository--> </pluginRepositories> <!--Tracking--> Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-03-18 20:03:23 UTC (rev 1401) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-03-18 20:03:52 UTC (rev 1402) @@ -86,6 +86,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.4</version> Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-18 20:03:23 UTC (rev 1401) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-18 20:03:52 UTC (rev 1402) @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.UUID; @@ -195,7 +196,7 @@ if (group.getOwner().getId().equals(loggedUser.getId())) { return true; } - List<Group> groups = group.getGroups(); + Collection<Group> groups = group.getGroups(); for (Group parent : groups) { if (userOwnerOfGroup(loggedUser, parent)) { return true; @@ -222,7 +223,7 @@ } if (loggedUser.isAdmin()) { User user = daoActor.getUser(id); - List<Group> groups = user.getGroups(); + Collection<Group> groups = user.getGroups(); for (Group group : groups) { if (canAdminGroup(token, group.getId())) { return true; @@ -557,14 +558,14 @@ superAdminCheck = true; } String token = null; - // le password est deja haché + // le password est deja haché // User loggedUser = daoActor.loginUser(login, AuthenticationServiceHelper.computeHash(password)); User loggedUser = daoActor.loginUser(login, password); if (loggedUser != null) { daoActor.deleteTokens(loggedUser, 24 * 60 * 60 * 1000); LoginAction loginAction = new LoginAction(); loginAction.setLoggedUser(loggedUser); - loginAction.setLoginDate(new Date()); + loginAction.setLoginDate((new Date()).getTime()); loginAction.setToken(UUID.randomUUID().toString()); daoActor.saveToken(loginAction); token = loginAction.getToken(); @@ -749,7 +750,7 @@ if (container.getId().equals(contained.getId())) { return true; } - List<Group> groups = container.getGroups(); + Collection<Group> groups = container.getGroups(); for (Group group : groups) { if (isContaining(group, contained)) { return true; @@ -839,4 +840,4 @@ { I18n.initISO88591("fr", "FR"); } -} \ No newline at end of file +} Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-18 20:03:23 UTC (rev 1401) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-18 20:03:52 UTC (rev 1402) @@ -126,6 +126,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>5.1</version> Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-18 20:03:23 UTC (rev 1401) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-18 20:03:52 UTC (rev 1402) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -147,7 +148,7 @@ private TreeNode buildNode(Group group) { TreeNode node = new TreeNode(); - List<Group> children = group.getGroups(); + Collection<Group> children = group.getGroups(); if (children.size() == 0) { node.setType(TreeNode.TYPE_DOCUMENT); } else { @@ -190,7 +191,7 @@ usage.put(group, 0); } for (Group group : groups) { - List<Group> children = group.getGroups(); + Collection<Group> children = group.getGroups(); for (Group child : children) { usage.put(child, usage.get(child) + 1); }