March 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r1403 - in trunk/simexplorer-is/simexplorer-is-security/src/test: . com com/bm com/bm/introspectors com/bm/introspectors/relations
by glandais＠users.labs.libre-entreprise.org 19 Mar '08

19 Mar '08

Author: glandais Date: 2008-03-19 18:05:45 +0000 (Wed, 19 Mar 2008) New Revision: 1403 Added: trunk/simexplorer-is/simexplorer-is-security/src/test/com/ trunk/simexplorer-is/simexplorer-is-security/src/test/com/bm/ trunk/simexplorer-is/simexplorer-is-security/src/test/com/bm/introspectors/ trunk/simexplorer-is/simexplorer-is-security/src/test/com/bm/introspectors/relations/ trunk/simexplorer-is/simexplorer-is-security/src/test/com/bm/introspectors/relations/GlobalPrimaryKeyStore.java Log: Patch to ejb3unit Added: trunk/simexplorer-is/simexplorer-is-security/src/test/com/bm/introspectors/relations/GlobalPrimaryKeyStore.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/com/bm/introspectors/relations/GlobalPrimaryKeyStore.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/com/bm/introspectors/relations/GlobalPrimaryKeyStore.java 2008-03-19 18:05:45 UTC (rev 1403) @@ -0,0 +1,74 @@ +package com.bm.introspectors.relations; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import com.bm.introspectors.PrimaryKeyInfo; +import com.bm.introspectors.Property; + +/** + * Global store for storing the primary key properties of entity classes. + * Such a global store is necessary to avoid cyclic dependencies while processing relations. + * + * @author Peter Doornbosch + */ +public class GlobalPrimaryKeyStore { + + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + .getLog(GlobalPrimaryKeyStore.class); + + private static final GlobalPrimaryKeyStore singleton = new GlobalPrimaryKeyStore(); + + private Map<Class, Map<Property, PrimaryKeyInfo>> store = new HashMap<Class, Map<Property, PrimaryKeyInfo>>(); + + private GlobalPrimaryKeyStore() { + // singleton constructor + } + + /** + * Returns the singleton instance. + * + * @return - the singleton instance + */ + public static GlobalPrimaryKeyStore getStore() { + return singleton; + } + + /** + * Stores primary key info of a given entity class. + * @param entityClass the entity class + * @param pkFieldInfo the primary key property and field info; usually the map will contain + * just one entry, but it might contain more entries in case of a composite primary key. + */ + public void put(Class entityClass, Map<Property, PrimaryKeyInfo> pkFieldInfo) { + log.info(entityClass); + log.info(pkFieldInfo); + store.put(entityClass, pkFieldInfo); + } + + private Map<Property, PrimaryKeyInfo> getPkInfo(Class entityClass) { + Map<Property, PrimaryKeyInfo> pkInfo = store.get(entityClass); + if (pkInfo == null && entityClass != null) { + pkInfo = getPkInfo(entityClass.getSuperclass()); + } + return pkInfo; + } + + /** + * Retrieves primary key info. + * @param entityClass + * @return one or more (in case of a composite primary key) properties that specify the + * primary key(s), or null if no primary key info is registered for the given class. + */ + public Set<Property> getPrimaryKeyInfo(Class entityClass) { + log.info(entityClass); + Map<Property, PrimaryKeyInfo> pkInfo = getPkInfo(entityClass); //store.get(entityClass); + if (pkInfo == null) { + return null; + } + else { + return pkInfo.keySet(); + } + } +}

1 0

r1402 - in trunk/simexplorer-is: . simexplorer-is-service simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-web simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

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> -  +  </pluginRepositories>  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); }

1 0

r1401 - in trunk/simexplorer-is/simexplorer-is-security: . src/test src/test/fr src/test/fr/cemagref src/test/fr/cemagref/simexplorer src/test/fr/cemagref/simexplorer/is src/test/fr/cemagref/simexplorer/is/security src/test/fr/cemagref/simexplorer/is/security/credentials src/test/fr/cemagref/simexplorer/is/security/entities
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 20:03:23 +0000 (Tue, 18 Mar 2008) New Revision: 1401 Added: trunk/simexplorer-is/simexplorer-is-security/src/test/ejb3unit.properties trunk/simexplorer-is/simexplorer-is-security/src/test/fr/ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerTestbase.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/GroupTest.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/LoginActionTest.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/PermissionTest.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTests.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/UserTest.java Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml Log: ejb3unit tests Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/pom.xml 2008-03-18 20:02:53 UTC (rev 1400) +++ trunk/simexplorer-is/simexplorer-is-security/pom.xml 2008-03-18 20:03:23 UTC (rev 1401) @@ -44,6 +44,17 @@ </plugins> </build--> + <repositories> + <repository> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>ejb3unit</id> + <name>ejb3unit repository</name> + <url>http://ejb3unit.sourceforge.net/maven2</url> + </repository> + </repositories> + <dependencies> <dependency> <groupId>javax.persistence</groupId> @@ -68,11 +79,13 @@ <artifactId>h2</artifactId> <version>1.0.64</version> </dependency> -  + + <dependency> + <groupId>com.bm</groupId> + <artifactId>ejb3unit</artifactId> + <version>1.2</version> + <scope>test</scope> + </dependency> + </dependencies> </project> Added: trunk/simexplorer-is/simexplorer-is-security/src/test/ejb3unit.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/ejb3unit.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/ejb3unit.properties 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,3 @@ +### The ejb3unit configuration file ### +ejb3unit.inMemoryTest=true +ejb3unit.show_sql=false Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,279 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.credentials; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.EntityTransaction; + +import com.bm.introspectors.EntityBeanIntrospector; +import com.bm.testsuite.dataloader.EntityInitialDataSet; +import com.bm.utils.UndoScriptGenerator; + +import fr.cemagref.simexplorer.is.security.entities.Actor; +import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.LoginAction; +import fr.cemagref.simexplorer.is.security.entities.Permission; +import fr.cemagref.simexplorer.is.security.entities.User; + +public class CredentialDataSet extends EntityInitialDataSet { + + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + .getLog(CredentialDataSet.class); + + protected EntityManager entityManager = null; + + private User user3; + + public static final int N_PERMISSIONS_USER3 = 378; + + public CredentialDataSet() { + // ... + super(Actor.class); + } + + public CredentialDataSet(Class entityType) { + super(entityType); + throw new IllegalStateException(); + } + + public void setEntityManager(EntityManager em) { + this.entityManager = em; + } + + @Override + public void cleanup(EntityManager em) { + EntityTransaction tx = entityManager.getTransaction(); + tx.begin(); + List resultList = entityManager.createQuery("SELECT a FROM Actor a").getResultList(); + for (Object object : resultList) { + Actor actor = (Actor) object; + actor.getGroups().clear(); + entityManager.merge(actor); + } + tx.commit(); + + tx.begin(); + entityManager.createQuery("DELETE FROM LoginAction").executeUpdate(); + entityManager.createQuery("DELETE FROM Permission").executeUpdate(); + entityManager.createQuery("DELETE FROM Group").executeUpdate(); + entityManager.createQuery("DELETE FROM User").executeUpdate(); + entityManager.createQuery("DELETE FROM Actor").executeUpdate(); + tx.commit(); + } + + @Override + public void create() { + User user1 = new User(); + user1.setAdmin(false); + user1.setSuperAdmin(false); + user1.setGroups(new ArrayList<Group>()); + user1.setLogin("user1"); + user1.setMail("user1 at user.user"); + user1.setVisible(true); + entityManager.persist(user1); + + User user2 = new User(); + user2.setAdmin(false); + user2.setSuperAdmin(false); + user2.setGroups(new ArrayList<Group>()); + user2.setLogin("user2"); + user2.setMail("user2 at user.user"); + user2.setVisible(true); + entityManager.persist(user2); + + user3 = new User(); + user3.setAdmin(false); + user3.setSuperAdmin(false); + user3.setGroups(new ArrayList<Group>()); + user3.setLogin("user3"); + user3.setMail("user3 at user.user"); + user3.setVisible(true); + entityManager.persist(user3); + + User user4 = new User(); + user4.setAdmin(false); + user4.setSuperAdmin(false); + user4.setGroups(new ArrayList<Group>()); + user4.setLogin("user4"); + user4.setMail("user4 at user.user"); + user4.setVisible(true); + entityManager.persist(user4); + + User admin = new User(); + admin.setAdmin(true); + admin.setSuperAdmin(false); + admin.setGroups(new ArrayList<Group>()); + admin.setLogin("admin"); + admin.setMail("admin at admin.admin"); + admin.setVisible(true); + entityManager.persist(admin); + + User superadmin = new User(); + superadmin.setAdmin(true); + superadmin.setSuperAdmin(true); + superadmin.setGroups(new ArrayList<Group>()); + superadmin.setLogin("superadmin"); + superadmin.setMail("superadmin at superadmin.superadmin"); + superadmin.setVisible(true); + entityManager.persist(superadmin); + + LoginAction loginActionUser1 = new LoginAction(); + loginActionUser1.setLoggedUser(user1); + loginActionUser1.setLoginDate((new Date()).getTime()); + loginActionUser1.setToken("user1"); + entityManager.persist(loginActionUser1); + + LoginAction loginActionUser2 = new LoginAction(); + loginActionUser2.setLoggedUser(user2); + loginActionUser2.setLoginDate((new Date()).getTime()); + loginActionUser2.setToken("user2"); + entityManager.persist(loginActionUser2); + + LoginAction loginActionUser4 = new LoginAction(); + loginActionUser4.setLoggedUser(user4); + loginActionUser4.setLoginDate((new Date()).getTime()); + loginActionUser4.setToken("user4"); + entityManager.persist(loginActionUser4); + + LoginAction loginActionAdmin = new LoginAction(); + loginActionAdmin.setLoggedUser(admin); + loginActionAdmin.setLoginDate((new Date()).getTime()); + loginActionAdmin.setToken("admin"); + entityManager.persist(loginActionAdmin); + + LoginAction loginActionSuperAdmin = new LoginAction(); + loginActionSuperAdmin.setLoggedUser(superadmin); + loginActionSuperAdmin.setLoginDate((new Date()).getTime()); + loginActionSuperAdmin.setToken("superadmin"); + entityManager.persist(loginActionSuperAdmin); + + Group groupA = new Group(); + groupA.setGroups(new ArrayList<Group>()); + groupA.setName("groupA"); + groupA.setOwner(admin); + groupA.setVisible(true); + entityManager.persist(groupA); + + Group groupB = new Group(); + groupB.setGroups(new ArrayList<Group>()); + groupB.setName("groupB"); + groupB.setOwner(admin); + groupB.setVisible(true); + entityManager.persist(groupB); + + user1.getGroups().add(groupA); + entityManager.merge(user1); + + user2.getGroups().add(groupB); + entityManager.merge(user2); + + user4.getGroups().add(groupB); + entityManager.merge(user4); + + Group groupC = new Group(); + groupC.setGroups(new ArrayList<Group>()); + groupC.setName("groupC"); + groupC.setOwner(admin); + groupC.setVisible(true); + entityManager.persist(groupC); + + groupB.getGroups().add(groupC); + entityManager.merge(groupB); + + Permission[] p = new Permission[6]; + int i = 0; + + p[i] = new Permission(); + p[i].setActor(user1); + p[i].setBusinessId("b" + i); + p[i].setCanRead(true); + p[i].setCanAdmin(true); + p[i].setCanWrite(true); + p[i].setOwner(true); + + i++; + p[i] = new Permission(); + p[i].setActor(user2); + p[i].setBusinessId("b" + i); + p[i].setCanRead(true); + p[i].setCanAdmin(true); + p[i].setCanWrite(true); + p[i].setOwner(true); + + i++; + p[i] = new Permission(); + p[i].setActor(groupA); + p[i].setBusinessId("b" + i); + p[i].setCanRead(true); + p[i].setCanAdmin(true); + p[i].setCanWrite(true); + p[i].setOwner(true); + + i++; + p[i] = new Permission(); + p[i].setActor(groupB); + p[i].setBusinessId("b" + i); + p[i].setCanRead(true); + p[i].setCanAdmin(true); + p[i].setCanWrite(true); + p[i].setOwner(true); + + i++; + p[i] = new Permission(); + p[i].setActor(groupC); + p[i].setBusinessId("b" + i); + p[i].setCanRead(true); + p[i].setCanAdmin(true); + p[i].setCanWrite(true); + p[i].setOwner(true); + + i++; + p[i] = new Permission(); + p[i].setActor(user4); + p[i].setBusinessId("b" + i); + p[i].setCanRead(true); + p[i].setCanAdmin(true); + p[i].setCanWrite(true); + p[i].setOwner(true); + + for (Permission permission : p) { + entityManager.persist(permission); + } + + for (int j = 0; j < N_PERMISSIONS_USER3; j++) { + Permission permission = new Permission(); + permission.setActor(user3); + permission.setBusinessId("u3_" + j); + permission.setCanRead(true); + permission.setCanAdmin(true); + permission.setCanWrite(true); + permission.setOwner(true); + entityManager.persist(permission); + } + + } + + public User getUser3() { + return user3; + } + +} Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerTestbase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerTestbase.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerTestbase.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,153 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.credentials; + +import java.util.Collection; +import java.util.List; + +import com.bm.testsuite.BaseSessionBeanFixture; + +import fr.cemagref.simexplorer.is.security.entities.Actor; +import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.LoginAction; +import fr.cemagref.simexplorer.is.security.entities.Permission; +import fr.cemagref.simexplorer.is.security.entities.User; + +/** + * The Class CredentialManagerTestbase. + */ +public class CredentialManagerTestbase extends BaseSessionBeanFixture<CredentialManagerImpl> { + + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + .getLog(CredentialManagerTestbase.class); + + /** The Constant usedEntityBeans. */ + private static final Class<?>[] usedEntityBeans = { Permission.class, User.class, Group.class, Actor.class, + LoginAction.class }; + + private static CredentialDataSet credentialDataSet = new CredentialDataSet(); + + /** + * Instantiates a new credential manager testbase. + */ + public CredentialManagerTestbase() { + super(CredentialManagerImpl.class, usedEntityBeans, credentialDataSet); + } + + private CredentialManager getCredentialManager() { + return (CredentialManager) getBeanToTest(); + } + + private static void assertPermissionOk(Permission p, boolean onlyOwner) { + log.info(p); + if (!onlyOwner) { + assertTrue(p.isCanRead()); + assertTrue(p.isCanWrite()); + assertTrue(p.isCanAdmin()); + } + assertTrue(p.isOwner()); + } + + public void testGetPermission() { + assertPermissionOk(getCredentialManager().getPermission("user1", "b0"), false); + assertPermissionOk(getCredentialManager().getPermission("user2", "b1"), false); + assertPermissionOk(getCredentialManager().getPermission("user1", "b2"), false); + assertPermissionOk(getCredentialManager().getPermission("user2", "b3"), false); + assertPermissionOk(getCredentialManager().getPermission("user2", "b4"), false); + } + + public void testGetPermissions() { + Permission[] permissions; + for (int i = 0; i < 5; i++) { + permissions = getCredentialManager().getPermissions("b" + i); + assertEquals(permissions.length, 1); + } + } + + public void testSaveElement() { + getCredentialManager().saveElement("user1", "s0"); + assertPermissionOk(getCredentialManager().getPermission("user1", "s0"), true); + } + + public void testSetPermissions() { + getEntityManager().getTransaction().begin(); + getCredentialManager().saveElement("user1", "s1"); + getCredentialManager().saveElement("user2", "s1"); + getEntityManager().getTransaction().commit(); + Permission[] permissions = getCredentialManager().getPermissions("s1"); + for (Permission permission : permissions) { + permission.setOwner(false); + permission.setCanAdmin(false); + permission.setCanWrite(false); + permission.setCanRead(true); + } + + getEntityManager().getTransaction().begin(); + getCredentialManager().setPermissions("s1", permissions); + getEntityManager().getTransaction().commit(); + + for (int i = 1; i < 3; i++) { + Permission permission = getCredentialManager().getPermission("user" + i, "s1"); + assertFalse(permission.isCanAdmin()); + assertFalse(permission.isCanWrite()); + assertFalse(permission.isOwner()); + assertTrue(permission.isCanRead()); + } + } + + public void testGetPermissionsOwnedBy() { + List<Permission> permissionsOwnedBy = getCredentialManager().getPermissionsOwnedBy( + credentialDataSet.getUser3(), 0, credentialDataSet.N_PERMISSIONS_USER3); + for (Permission permission : permissionsOwnedBy) { + assertTrue(credentialDataSet.getUser3().equals(permission.getActor())); + assertPermissionOk(permission, false); + } + } + + public void testGetPermissionsOwnedByCount() { + int permissionsOwnedByCount = getCredentialManager().getPermissionsOwnedByCount(credentialDataSet.getUser3()); + assertEquals(permissionsOwnedByCount, credentialDataSet.N_PERMISSIONS_USER3); + } + + public void testGetElementsVisibleBy() { + Collection<String> elementsVisibleBy = getCredentialManager().getElementsVisibleBy("user4"); + assertTrue(elementsVisibleBy.contains("b3")); + assertTrue(elementsVisibleBy.contains("b4")); + assertTrue(elementsVisibleBy.contains("b5")); + assertEquals(elementsVisibleBy.size(), 3); + } + + public void testGetUserFilter() { + assertNotNull(getCredentialManager().getUserFilter("user1")); + assertNotNull(getCredentialManager().getUserFilter("user2")); + assertNotNull(getCredentialManager().getUserFilter("admin")); + assertNotNull(getCredentialManager().getUserFilter("superadmin")); + } + + public void testIsCacheValidFor() { + getCredentialManager().saveElement("user1", "c1"); + assertFalse(getCredentialManager().isCacheValidFor("user1")); + getCredentialManager().getElementsVisibleBy("user1"); + assertTrue(getCredentialManager().isCacheValidFor("user1")); + Permission[] permissions = new Permission[0]; + getCredentialManager().setPermissions("c1", permissions); + assertFalse(getCredentialManager().isCacheValidFor("user1")); + getCredentialManager().getElementsVisibleBy("user1"); + assertTrue(getCredentialManager().isCacheValidFor("user1")); + } +} Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/GroupTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/GroupTest.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/GroupTest.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,32 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.entities; + +/** + * The Class GroupTest. + */ +public class GroupTest extends SecurityEntityTest { + + /** + * Instantiates a new group test. + */ + public GroupTest() { + super(Group.class, SPECIAL_GENERATORS); + } + +} Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/LoginActionTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/LoginActionTest.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/LoginActionTest.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,32 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.entities; + +/** + * The Class LoginActionTest. + */ +public class LoginActionTest extends SecurityEntityTest { + + /** + * Instantiates a new login action test. + */ + public LoginActionTest() { + super(LoginAction.class, SPECIAL_GENERATORS); + } + +} Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/PermissionTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/PermissionTest.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/PermissionTest.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,32 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.entities; + +/** + * The Class PermissionTest. + */ +public class PermissionTest extends SecurityEntityTest { + + /** + * Instantiates a new permission test. + */ + public PermissionTest() { + super(Permission.class, SPECIAL_GENERATORS); + } + +} Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,139 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.entities; + +import java.util.List; + +import com.bm.datagen.Generator; +import com.bm.datagen.annotations.GeneratorType; +import com.bm.datagen.relation.BeanCollectionGenerator; +import com.bm.datagen.relation.SingleBeanGenerator; +import com.bm.testsuite.BaseEntityFixture; + +/** + * The Class SecurityEntityTest. + */ + at SuppressWarnings("unchecked") +public abstract class SecurityEntityTest extends BaseEntityFixture { + + /** The Constant SPECIAL_GENERATORS. */ + protected static final Generator<?>[] SPECIAL_GENERATORS = { new GroupCreator(), new GroupsCreator(), + new ActorCreator(), new UserCreator(), new LoginActionCreator(), new PermissionCreator() }; + + /** + * Should not be called... + */ + public SecurityEntityTest() { + super(null); + } + + /** + * Instantiates a new security entity test. + * + * @param entityToTest the entity to test + * @param additionalGenerators the additional generators + */ + public SecurityEntityTest(Class<?> entityToTest, Generator<?>[] additionalGenerators) { + super(entityToTest, additionalGenerators); + } + + /** + * The Class GroupCreator. + */ + @GeneratorType(className = Group.class) + protected static final class GroupCreator extends SingleBeanGenerator<Group> { + + /** + * Instantiates a new group creator. + */ + protected GroupCreator() { + super(Group.class); + } + } + + /** + * The Class GroupsCreator. + */ + @GeneratorType(className = List.class, field = "groups") + protected static final class GroupsCreator extends BeanCollectionGenerator<Group> { + + /** + * Instantiates a new groups creator. + */ + protected GroupsCreator() { + super(Group.class, 10); + } + } + + /** + * The Class UserCreator. + */ + @GeneratorType(className = User.class) + protected static final class UserCreator extends SingleBeanGenerator<User> { + + /** + * Instantiates a new user creator. + */ + protected UserCreator() { + super(User.class); + } + } + + /** + * The Class UserCreator. + */ + @GeneratorType(className = Actor.class) + protected static final class ActorCreator extends SingleBeanGenerator { + + /** + * Instantiates a new user creator. + */ + protected ActorCreator() { + super(User.class); + } + } + + /** + * The Class LoginActionCreator. + */ + @GeneratorType(className = LoginAction.class) + protected static final class LoginActionCreator extends SingleBeanGenerator<LoginAction> { + + /** + * Instantiates a new login action creator. + */ + protected LoginActionCreator() { + super(LoginAction.class); + } + } + + /** + * The Class PermissionCreator. + */ + @GeneratorType(className = Permission.class) + protected static final class PermissionCreator extends SingleBeanGenerator<Permission> { + + /** + * Instantiates a new permission creator. + */ + protected PermissionCreator() { + super(Permission.class); + } + } + +} Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTests.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTests.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTests.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,46 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.entities; + +import fr.cemagref.simexplorer.is.security.credentials.CredentialManagerTestbase; +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * The Class SecurityEntityTests. + */ +public class SecurityEntityTests { + + /** + * Suite. + * + * @return the test + */ + public static Test suite() { + TestSuite suite = new TestSuite("Test for fr.cemagref.simexplorer.is.security.entities"); + // $JUnit-BEGIN$ + suite.addTestSuite(CredentialManagerTestbase.class); + suite.addTestSuite(UserTest.class); + suite.addTestSuite(GroupTest.class); + suite.addTestSuite(PermissionTest.class); + suite.addTestSuite(LoginActionTest.class); + // $JUnit-END$ + return suite; + } + +} Added: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/UserTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/UserTest.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/UserTest.java 2008-03-18 20:03:23 UTC (rev 1401) @@ -0,0 +1,32 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.security.entities; + +/** + * The Class UserTest. + */ +public class UserTest extends SecurityEntityTest { + + /** + * Instantiates a new user test. + */ + public UserTest() { + super(User.class, SPECIAL_GENERATORS); + } + +}

1 0

r1400 - in trunk/simexplorer-is/simexplorer-is-security/src: java/fr/cemagref/simexplorer/is/security/credentials java/fr/cemagref/simexplorer/is/security/dao java/fr/cemagref/simexplorer/is/security/entities resources/META-INF
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 20:02:53 +0000 (Tue, 18 Mar 2008) New Revision: 1400 Removed: trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/orm.xml Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/LoginAction.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/persistence.xml Log: Removed orm.xml Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -77,7 +77,7 @@ if (actor.equals(permission.getActor())) { return 0; } - List<Group> groups = actor.getGroups(); + Collection<Group> groups = actor.getGroups(); for (Group group : groups) { int levelGroup = getRelativeLevel(group, permission); if (levelGroup >= 0) { @@ -114,6 +114,7 @@ p = permission; minLevel = relativeLevel; } + // TODO if minLevel == relativeLevel do OR } } } else { @@ -237,7 +238,7 @@ */ private void getActors(Actor actor, Collection<Actor> actors) { actors.add(actor); - List<Group> groups = actor.getGroups(); + Collection<Group> groups = actor.getGroups(); for (Group group : groups) { getActors(group, actors); } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -184,7 +184,7 @@ "select la from LoginAction la where la.token=:token").setParameter("token", token)); if (loginAction != null) { loggedUser = loginAction.getLoggedUser(); - loginAction.setLoginDate(new Date()); + loginAction.setLoginDate((new Date()).getTime()); em.merge(loginAction); } return loggedUser; @@ -213,8 +213,9 @@ public void deleteTokens(Actor actor, long before) { Date now = new Date(); Date date = new Date(now.getTime() - before); + long dateLimit = date.getTime(); em.createQuery("delete from LoginAction la where la.loggedUser = :actor and la.loginDate < :dateLimit") - .setParameter("dateLimit", date).setParameter("actor", actor).executeUpdate(); + .setParameter("dateLimit", dateLimit).setParameter("actor", actor).executeUpdate(); } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -61,14 +61,14 @@ @Override public List<Permission> getPermissionsOwnedBy(Actor actor, int indexStart, int count) { List<Permission> permissions = CollectionUtil.toGenericList(em.createQuery( - "select p from Permission p where p.actor=:actor and p.owner = true").setParameter("actor", actor) + "select p from Permission p where p.actor=:actor and p.isOwner = true").setParameter("actor", actor) .setFirstResult(indexStart).setMaxResults(count).getResultList(), Permission.class); return permissions; } public int getPermissionsOwnedByCount(Actor actor) { Object singleResult = em.createQuery( - "select count(p) from Permission p where p.actor=:actor and p.owner = true").setParameter("actor", + "select count(p) from Permission p where p.actor=:actor and p.isOwner = true").setParameter("actor", actor).getSingleResult(); int result = ((Number) singleResult).intValue(); return result; @@ -106,7 +106,7 @@ public List<String> getBusinessIdsVisibleBy(Collection<Actor> actors) { StringBuffer query = new StringBuffer(); query.append("select p.businessId from Permission p").append( - " where (p.canRead = true or p.canAdmin = true or p.owner = true)").append(" and p.actor in (:actors)"); + " where (p.canRead = true or p.canAdmin = true or p.isOwner = true)").append(" and p.actor in (:actors)"); List<String> businessIds = CollectionUtil.toGenericList(em.createQuery(query.toString()).setParameter("actors", actors).getResultList(), String.class); return businessIds; Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -19,24 +19,46 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.ManyToMany; +import javax.persistence.Table; +import javax.persistence.Transient; + /** * The Class Actor. */ + at Entity + at Table(name = "ACTORS") + at Inheritance(strategy = InheritanceType.JOINED) public class Actor implements Serializable { - + /** The Constant serialVersionUID. */ + @Transient private static final long serialVersionUID = 1; /** The id. */ + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) protected Integer id; /** The groups. */ - private List<Group> groups; + @ManyToMany(fetch = FetchType.EAGER, targetEntity = Group.class) + //@Cascade(value = {CascadeType.ALL}) + private Collection<Group> groups; /** The visible. */ + @Basic private boolean visible; /** @@ -82,7 +104,7 @@ * * @return the groups */ - public List<Group> getGroups() { + public Collection<Group> getGroups() { if (groups == null) { groups = new ArrayList<Group>(); } @@ -107,7 +129,7 @@ * * @return the int */ - private int hashCodeGroups(List<Group> hashedGroups) { + private int hashCodeGroups(Collection<Group> hashedGroups) { final int prime = 31; int result = 1; result = prime * result + hashedGroups.size(); @@ -139,7 +161,7 @@ * * @return true, if successful */ - private boolean equalsGroups(List<Group> groups1, List<Group> groups2) { + private boolean equalsGroups(Collection<Group> groups1, Collection<Group> groups2) { if (groups1 == groups2) return true; if (groups2 == null) Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -17,18 +17,32 @@ * ##% */ package fr.cemagref.simexplorer.is.security.entities; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + /** * The Class Group. */ + at Entity + at Table(name = "GROUPS") public class Group extends Actor { /** The Constant serialVersionUID. */ + @Transient private static final long serialVersionUID = 1; /** The name. */ + @Basic + @Column(unique = true) private String name; /** The owner. */ + @OneToOne(fetch = FetchType.EAGER) private User owner; /** Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/LoginAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/LoginAction.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/LoginAction.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -18,26 +18,47 @@ package fr.cemagref.simexplorer.is.security.entities; import java.io.Serializable; -import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + /** * The Class LoginAction. */ + at Entity + at Table(name = "LOGINS") public class LoginAction implements Serializable { + /** The Constant log. */ + private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + .getLog(LoginAction.class); + /** The Constant serialVersionUID. */ + @Transient private static final long serialVersionUID = 1; /** The id. */ + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) private Integer id; /** The time. */ - private Date loginDate; + @Basic + private long loginDate; /** The logged user. */ + @OneToOne(fetch = FetchType.EAGER) private User loggedUser; /** The token. */ + @Basic private String token; /** @@ -63,7 +84,7 @@ * * @return the login date */ - public Date getLoginDate() { + public long getLoginDate() { return loginDate; } @@ -72,7 +93,7 @@ * * @param loginDate the new login date */ - public void setLoginDate(Date loginDate) { + public void setLoginDate(long loginDate) { this.loginDate = loginDate; } @@ -112,4 +133,44 @@ this.token = token; } + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((loggedUser == null) ? 0 : loggedUser.hashCode()); + result = prime * result + (int) (loginDate ^ (loginDate >>> 32)); + result = prime * result + ((token == null) ? 0 : token.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final LoginAction other = (LoginAction) obj; + if (loggedUser == null) { + if (other.loggedUser != null) + return false; + } else if (!loggedUser.equals(other.loggedUser)) + return false; + if (loginDate != other.loginDate) + return false; + if (token == null) { + if (other.token != null) + return false; + } else if (!token.equals(other.token)) + return false; + return true; + } + } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Permission.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -19,35 +19,59 @@ import java.io.Serializable; +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + /** * The Class Permission. */ + at Entity + at Table(name = "PERMISSIONS") public class Permission implements Serializable { /** The Constant serialVersionUID. */ + @Transient private static final long serialVersionUID = 1; /** The id. */ + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) private Integer id; /** The business id. */ + @Basic private String businessId; /** The actor. */ + @OneToOne(fetch = FetchType.EAGER) private Actor actor; /** The can read. */ + @Basic private boolean canRead; /** The can write. */ + @Basic private boolean canWrite; /** The can admin. */ + @Basic private boolean canAdmin; /** The is owner. */ + @Basic private boolean isOwner; + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ @Override public String toString() { StringBuffer sb = new StringBuffer(); @@ -188,4 +212,53 @@ this.isOwner = isOwner; } + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((actor == null) ? 0 : actor.hashCode()); + result = prime * result + ((businessId == null) ? 0 : businessId.hashCode()); + result = prime * result + (canAdmin ? 1231 : 1237); + result = prime * result + (canRead ? 1231 : 1237); + result = prime * result + (canWrite ? 1231 : 1237); + result = prime * result + (isOwner ? 1231 : 1237); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final Permission other = (Permission) obj; + if (actor == null) { + if (other.actor != null) + return false; + } else if (!actor.equals(other.actor)) + return false; + if (businessId == null) { + if (other.businessId != null) + return false; + } else if (!businessId.equals(other.businessId)) + return false; + if (canAdmin != other.canAdmin) + return false; + if (canRead != other.canRead) + return false; + if (canWrite != other.canWrite) + return false; + if (isOwner != other.isOwner) + return false; + return true; + } + } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-18 20:02:53 UTC (rev 1400) @@ -17,27 +17,42 @@ * ##% */ package fr.cemagref.simexplorer.is.security.entities; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + /** * The Class User. */ + at Entity + at Table(name = "USERS") public class User extends Actor { /** The Constant serialVersionUID. */ + @Transient private static final long serialVersionUID = 1; /** The login. */ + @Basic + @Column(unique = true) private String login; /** The mail. */ + @Basic private String mail; /** The password hash. */ + @Basic private String passwordHash; /** The admin. */ + @Basic private boolean admin; /** The super admin. */ + @Basic private boolean superAdmin; /** Deleted: trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/orm.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/orm.xml 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/orm.xml 2008-03-18 20:02:53 UTC (rev 1400) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" - version="1.0"> - - <persistence-unit-metadata> - <xml-mapping-metadata-complete /> - </persistence-unit-metadata> - - <package>fr.cemagref.simexplorer.is.security.entities</package> - - <entity class="Actor"> - <table name="ACTORS" /> - <inheritance strategy="JOINED" /> - <attributes> - <id name="id"> - <generated-value strategy="SEQUENCE" /> - </id> - <basic name="visible"></basic> - <many-to-many name="groups" target-entity="Group" - fetch="EAGER"> - <cascade> - <cascade-all /> - </cascade> - </many-to-many> - </attributes> - </entity> - - <entity class="Group"> - <table name="GROUPS" /> - <attributes> - <basic name="name"> - <column unique="true" /> - </basic> - <one-to-one name="owner" fetch="EAGER" /> - </attributes> - </entity> - - <entity class="User"> - <table name="USERS" /> - <attributes> - <basic name="login"> - <column unique="true" /> - </basic> - <basic name="mail"></basic> - <basic name="passwordHash"></basic> - <basic name="admin"></basic> - <basic name="superAdmin"></basic> - </attributes> - </entity> - - <entity class="LoginAction"> - <table name="LOGINS" /> - <attributes> - <id name="id"> - <generated-value strategy="SEQUENCE" /> - </id> - <basic name="token" /> - <basic name="loginDate"> - <temporal>DATE</temporal> - </basic> - <one-to-one name="loggedUser" fetch="EAGER" /> - </attributes> - </entity> - - <entity class="Permission"> - <table name="PERMISSIONS" /> - <attributes> - <id name="id"> - <generated-value strategy="SEQUENCE" /> - </id> - <basic name="businessId" /> - <basic name="canRead" /> - <basic name="canWrite" /> - <basic name="canAdmin" /> - <basic name="isOwner" /> - <one-to-one name="actor" fetch="EAGER" /> - </attributes> - </entity> - -</entity-mappings> Modified: trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/persistence.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/persistence.xml 2008-03-18 17:42:04 UTC (rev 1399) +++ trunk/simexplorer-is/simexplorer-is-security/src/resources/META-INF/persistence.xml 2008-03-18 20:02:53 UTC (rev 1400) @@ -10,8 +10,6 @@  <jta-data-source>java:/h2datasource</jta-data-source> - <mapping-file>META-INF/orm.xml</mapping-file> - <properties> <!-- logs SQL Hibernate <property name="hibernate.show_sql" value="true"/>

1 0

r1399 - in trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities: . attachment composite metadata
by tchemit＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: tchemit Date: 2008-03-18 17:42:04 +0000 (Tue, 18 Mar 2008) New Revision: 1399 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java Log: add annotation I18nable on i18n java file to be treated by maven-i18n-plugin. Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -19,10 +19,11 @@ /** * Une enum pour definir les differents types d'entities rencontres dans le projet. <p/> On ajoute ici une clef i18n * pour pouvoir traduire plus tard ces types. <p/> Note: on n'utilise pas directement les traductions pour permettre le - * mécanisme de changement de langue (voir module swing et web). + * mÃ©canisme de changement de langue (voir module swing et web). * * @author chemit */ + at org.codelutin.i18n.I18nable public enum EntityTypeEnum { /** The Attachment. */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -22,6 +22,7 @@ /** * The Enum SimExplorerPage. */ + at org.codelutin.i18n.I18nable public enum SimExplorerPage { /** The Element delete. */ @@ -77,4 +78,4 @@ return captionKey; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -28,6 +28,7 @@ * * @author landais */ + at org.codelutin.i18n.I18nable public class RawType implements ContentType { /** The Constant serialVersionUID. */ @@ -58,4 +59,4 @@ return "text/text"; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -29,6 +29,7 @@ /** * The Class Attachments. */ + at org.codelutin.i18n.I18nable public final class Attachments extends SimpleComposite<Attachment> { /** The Constant serialVersionUID. */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -26,6 +26,7 @@ /** * The Class Codes. */ + at org.codelutin.i18n.I18nable public final class Codes extends SimpleComposite<Code> { /** The Constant serialVersionUID. */ @@ -42,4 +43,4 @@ return row; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -26,6 +26,7 @@ /** * The Class ConstantValues. */ + at org.codelutin.i18n.I18nable public final class ConstantValues extends SimpleComposite<ConstantValue> { /** The Constant serialVersionUID. */ @@ -41,4 +42,4 @@ row.add(_("simexplorer.common.constantvalue.value")); return row; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -26,6 +26,7 @@ /** * The Class Constants. */ + at org.codelutin.i18n.I18nable public final class Constants extends SimpleComposite<Constant> { /** The Constant serialVersionUID. */ @@ -42,4 +43,4 @@ return row; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -27,6 +27,7 @@ /** * The Class Descriptors. */ + at org.codelutin.i18n.I18nable public final class Descriptors extends SimpleComposite<Descriptor> { /** The Constant serialVersionUID. */ @@ -48,4 +49,4 @@ return row; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-18 17:25:35 UTC (rev 1398) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-18 17:42:04 UTC (rev 1399) @@ -30,6 +30,7 @@ * The Class MetaData. Used by IS to store relative data of a LoggableElement. SimExplorer should not set properties of * this class. */ + at org.codelutin.i18n.I18nable public class MetaData extends Leaf { /** The Constant serialVersionUID. */ @@ -314,4 +315,4 @@ return getEntityType().getLibelle(); } -} +} \ No newline at end of file

1 0

r1398 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: tchemit Date: 2008-03-18 17:25:35 +0000 (Tue, 18 Mar 2008) New Revision: 1398 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/StorageServiceClient.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: add annotation I18nable on i18n java file to be treated by maven-i18n-plugin. 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 17:09:57 UTC (rev 1397) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-18 17:25:35 UTC (rev 1398) @@ -64,6 +64,7 @@ @Remote(AuthenticationService.class) @RemoteBinding(jndiBinding = "AuthenticationService") @TransactionAttribute(TransactionAttributeType.REQUIRED) + at org.codelutin.i18n.I18nable public class AuthenticationServiceImpl implements AuthenticationService { /** The Constant log. */ @@ -556,7 +557,7 @@ 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) { @@ -838,4 +839,4 @@ { I18n.initISO88591("fr", "FR"); } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-03-18 17:09:57 UTC (rev 1397) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-03-18 17:25:35 UTC (rev 1398) @@ -25,17 +25,18 @@ import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; /** The Class StorageServiceClient. */ + at org.codelutin.i18n.I18nable public class StorageServiceClient extends StorageServiceCommon { /** The storage engine. */ private StorageEngine storageEngine; /** - * la localisation du fichier de configuration à lire, si null utilisera le - * fichier par défaut (properties/config.properties) + * la localisation du fichier de configuration Ã lire, si null utilisera le + * fichier par dÃ©faut (properties/config.properties) */ private String configFile; - /** le prefixe à supprimera chaque clef de la configuration. (voir Config) * */ + /** le prefixe Ã supprimera chaque clef de la configuration. (voir Config) * */ private String prefixKey; public StorageServiceClient() { @@ -91,4 +92,4 @@ return result; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-03-18 17:09:57 UTC (rev 1397) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-03-18 17:25:35 UTC (rev 1398) @@ -60,6 +60,7 @@ /** * The Class StorageServiceCommon. */ + at org.codelutin.i18n.I18nable public abstract class StorageServiceCommon implements StorageService { /** The Constant FILE_XML. */ @@ -835,4 +836,4 @@ return element; } -} +} \ No newline at end of file

1 0

r1397 - trunk/simexplorer-is/simexplorer-is-swing-generated
by tchemit＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: tchemit Date: 2008-03-18 17:09:57 +0000 (Tue, 18 Mar 2008) New Revision: 1397 Modified: trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml Log: i18n pour jaxx ne requiere pas d'ea, il faut donc le distinguer du parsing du code java => 2 executions i18n Modified: trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-03-18 13:30:41 UTC (rev 1396) +++ trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-03-18 17:09:57 UTC (rev 1397) @@ -119,11 +119,30 @@ <executions> <execution> <phase>process-classes</phase> + <id>jaxx</id> <goals> + <goal>parserJaxx</goal> + </goals> + </execution> + <execution> + <phase>process-classes</phase> + <id>commandline</id> + <goals> <goal>parserJava</goal> - <goal>parserJaxx</goal> <goal>gen</goal> </goals> + <configuration> + <ea>true</ea> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> + <entry> + <basedir>${maven.src.dir}/java</basedir> + <excludes> + <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/**\/*</param> + </excludes> + </entry> + </entries> + </configuration> </execution> </executions> </plugin>

1 0

r1396 - trunk/simexplorer-is
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 13:30:41 +0000 (Tue, 18 Mar 2008) New Revision: 1396 Modified: trunk/simexplorer-is/ Log: Ignore .classpath Property changes on: trunk/simexplorer-is ___________________________________________________________________ Name: svn:ignore - target .project *.iml *.ipr *.iws + target .project *.iml *.ipr *.iws .classpath

1 0

r1395 - trunk/simexplorer-is/simexplorer-is-web/src/resources
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 13:29:57 +0000 (Tue, 18 Mar 2008) New Revision: 1395 Added: trunk/simexplorer-is/simexplorer-is-web/src/resources/log4j.properties Log: Configure web app log (not laucnhed from jboss) Added: trunk/simexplorer-is/simexplorer-is-web/src/resources/log4j.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/resources/log4j.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-web/src/resources/log4j.properties 2008-03-18 13:29:57 UTC (rev 1395) @@ -0,0 +1,13 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.fr.cemagref.simexplorer.is=ERROR +log4j.logger.org.apache.tapestry=ERROR +log4j.logger.org.codelutin=ERROR + +

1 0

r1394 - trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 13:29:08 +0000 (Tue, 18 Mar 2008) New Revision: 1394 Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java Log: Test query Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java 2008-03-18 13:23:11 UTC (rev 1393) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/SecurityTestCase.java 2008-03-18 13:29:08 UTC (rev 1394) @@ -43,21 +43,26 @@ super.setUp(); Properties properties = (Properties) System.getProperties().clone(); properties.put("java.naming.provider.url", "jnp://localhost:1099"); - properties.put("java.naming.factory.initial", - "org.jnp.interfaces.NamingContextFactory"); + properties.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); properties.put("java.naming.factory.url.pkgs", "org.jnp.interfaces"); Context context = new InitialContext(properties); - authenticationService = (AuthenticationService) context - .lookup("AuthenticationService"); + authenticationService = (AuthenticationService) context.lookup("AuthenticationService"); } +/* + public void testQuery() throws SimExplorerException { + //String query = "select distinct group from Actor actor join actor.groups as group where actor = :actor and group.visible = true"; + String query = "select distinct g from Group g, Actor actor where g member of actor.groups and g.visible = true"; + System.out.println(authenticationService.debugQuery(query, 1)); + } +*/ + /** * Test security entities. * - * @throws SimExplorerException - * the sim explorer service exception + * @throws SimExplorerException the sim explorer service exception */ public void testSecurityEntities() throws SimExplorerException { /* @@ -67,6 +72,8 @@ System.out.println(group.getName()); } */ + + /* String token = authenticationService .loginUser("superadmin", "password"); @@ -106,6 +113,7 @@ authenticationService.updateUser(token, simpleUsers[j]); } } + */ /* User superAdminUser = authenticationService.saveUser(token,

1 0