- Topia-commits - mailman.cloud.codelutin.com

r2121 - trunk
by tchemit＠users.nuiton.org 25 Sep '10

25 Sep '10

Author: tchemit Date: 2010-09-25 11:21:55 +0200 (Sat, 25 Sep 2010) New Revision: 2121 Url: http://nuiton.org/repositories/revision/topia/2121 Log: Evolution #893: Update nuiton-utils to 1.4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-25 09:20:08 UTC (rev 2120) +++ trunk/pom.xml 2010-09-25 09:21:55 UTC (rev 2121) @@ -231,7 +231,7 @@  <eugene.version>2.2-SNAPSHOT</eugene.version> - <lutinutil.version>1.4.1</lutinutil.version> + <lutinutil.version>1.4.2-SNAPSHOT</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version>

1 0

r2120 - trunk
by tchemit＠users.nuiton.org 25 Sep '10

25 Sep '10

Author: tchemit Date: 2010-09-25 11:20:08 +0200 (Sat, 25 Sep 2010) New Revision: 2120 Url: http://nuiton.org/repositories/revision/topia/2120 Log: Evolution #891: Update to Eugene 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-25 00:02:41 UTC (rev 2119) +++ trunk/pom.xml 2010-09-25 09:20:08 UTC (rev 2120) @@ -230,7 +230,7 @@ <projectId>topia</projectId>  - <eugene.version>2.1.3-SNAPSHOT</eugene.version> + <eugene.version>2.2-SNAPSHOT</eugene.version> <lutinutil.version>1.4.1</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version>

1 0

r2119 - trunk
by tchemit＠users.nuiton.org 25 Sep '10

25 Sep '10

Author: tchemit Date: 2010-09-25 02:02:41 +0200 (Sat, 25 Sep 2010) New Revision: 2119 Url: http://nuiton.org/repositories/revision/topia/2119 Log: Update eugene to 2.1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-17 19:22:26 UTC (rev 2118) +++ trunk/pom.xml 2010-09-25 00:02:41 UTC (rev 2119) @@ -230,7 +230,7 @@ <projectId>topia</projectId>  - <eugene.version>2.1.2</eugene.version> + <eugene.version>2.1.3-SNAPSHOT</eugene.version> <lutinutil.version>1.4.1</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version>

1 0

r2118 - trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 17 Sep '10

17 Sep '10

Author: tchemit Date: 2010-09-17 21:22:26 +0200 (Fri, 17 Sep 2010) New Revision: 2118 Url: http://nuiton.org/repositories/revision/topia/2118 Log: reformat Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2010-09-17 19:21:52 UTC (rev 2117) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2010-09-17 19:22:26 UTC (rev 2118) @@ -199,7 +199,7 @@ detectEntities(new Class<?>[]{Company.class, Department.class}, new int[]{1, 1}, department); detectEntityIds(new Class<?>[]{Company.class, Department.class}, new int[]{1, 1}, department); - + //TODO faire des tests avec des entites avec cycles }

1 0

r2117 - trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 17 Sep '10

17 Sep '10

Author: tchemit Date: 2010-09-17 21:21:52 +0200 (Fri, 17 Sep 2010) New Revision: 2117 Url: http://nuiton.org/repositories/revision/topia/2117 Log: improve test Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2010-09-13 12:17:04 UTC (rev 2116) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2010-09-17 19:21:52 UTC (rev 2117) @@ -25,19 +25,15 @@ package org.nuiton.topia.persistence.util; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; -import static org.junit.Assert.*; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaId; import org.nuiton.topiatest.Company; import org.nuiton.topiatest.CompanyImpl; import org.nuiton.topiatest.Department; @@ -49,13 +45,20 @@ import org.nuiton.topiatest.PersonneAbstract; import org.nuiton.topiatest.PersonneImpl; -/** - * - * @author tchemit <chemit(a)codelutin.com> - */ +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +/** @author tchemit <chemit(a)codelutin.com> */ public class TopiaEntityHelperTest { static TopiaEntityEnum[] contracts; + final Set<Class<? extends TopiaEntity>> contractsClass; public TopiaEntityHelperTest() { @@ -75,9 +78,7 @@ contracts = null; } - /** - * Test of getContractClass method, of class TopiaEntityHelper. - */ + /** Test of getContractClass method, of class TopiaEntityHelper. */ @Test public void testgetContract() { @@ -88,7 +89,6 @@ expResult = Employe.class; - getContractClass(expResult, EmployeImpl.class); getContractClass(expResult, EmployeAbstract.class); getContractClass(expResult, Employe.class); @@ -100,9 +100,7 @@ getContractClass(expResult, Personne.class); } - /** - * Test of retainContracts method, of class TopiaEntityHelper. - */ + /** Test of retainContracts method, of class TopiaEntityHelper. */ @Test public void testRetainContracts() { Set<Class<? extends TopiaEntity>> classes = new HashSet<Class<? extends TopiaEntity>>(); @@ -141,6 +139,7 @@ /** * Test of detectTypes method, of class TopiaEntityHelper. + * * @throws TopiaException */ @Test @@ -167,31 +166,46 @@ public void testDetector() throws Exception { Company company = new CompanyImpl(); - EmployeImpl employe = new EmployeImpl(); + company.setTopiaId(TopiaId.create(Company.class)); + Employe employe = new EmployeImpl(); + employe.setTopiaId(TopiaId.create(Employe.class)); Department department = new DepartmentImpl(); + department.setTopiaId(TopiaId.create(Department.class)); detectEntities(new Class<?>[]{Company.class, Employe.class, Department.class}, new int[]{1, 1, 1}, company, employe, department); + detectEntityIds(new Class<?>[]{Company.class, Employe.class, Department.class}, new int[]{1, 1, 1}, company, employe, department); company.addEmploye(employe); detectEntities(new Class<?>[]{Company.class, Employe.class}, new int[]{1, 1, 1}, company); + detectEntityIds(new Class<?>[]{Company.class, Employe.class}, new int[]{1, 1, 1}, company); company.addDepartment(department); department.setCompany(company); detectEntities(new Class<?>[]{Company.class, Employe.class, Department.class}, new int[]{1, 1, 1}, company); + detectEntityIds(new Class<?>[]{Company.class, Employe.class, Department.class}, new int[]{1, 1, 1}, company); company.removeEmploye(employe); company.removeDepartment(department); detectEntities(new Class<?>[]{Company.class}, new int[]{1}, company); + detectEntityIds(new Class<?>[]{Company.class}, new int[]{1}, company); detectEntities(new Class<?>[]{Company.class}, new int[]{2}, company, new CompanyImpl()); + detectEntityIds(new Class<?>[]{Company.class}, new int[]{2}, company, new CompanyImpl()); + department.setCompany(company); + + detectEntities(new Class<?>[]{Company.class, Department.class}, new int[]{1, 1}, department); + detectEntityIds(new Class<?>[]{Company.class, Department.class}, new int[]{1, 1}, department); + //TODO faire des tests avec des entites avec cycles } - protected void detectEntities(Class<?>[] expected, int[] sizes, TopiaEntity... data) throws TopiaException { + protected void detectEntities(Class<?>[] expected, + int[] sizes, + TopiaEntity... data) throws TopiaException { Map<Class<? extends TopiaEntity>, List<TopiaEntity>> actual = null; @@ -212,6 +226,32 @@ } } + protected void detectEntityIds(Class<?>[] expected, + int[] sizes, + TopiaEntity... data) throws TopiaException { + + TopiaEntityIdsMap actual = null; + + try { + actual = TopiaEntityHelper.detectEntityIds(contracts, + contractsClass, + data + ); + + Assert.assertEquals(expected.length, actual.size()); + int index = 0; + for (Class<?> c : expected) { + List<String> value = actual.get(c); + int expectedSize = sizes[index++]; + Assert.assertEquals(expectedSize, value.size()); + } + } finally { + if (actual != null) { + actual.clear(); + } + } + } + protected void detectTypes(Class<?>[] expected, TopiaEntity... data) throws TopiaException { Set<String> fqns = new HashSet<String>(expected.length); Set<Class<? extends TopiaEntity>> actual = null;

1 0

r2116 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 13 Sep '10

13 Sep '10

Author: tchemit Date: 2010-09-13 14:17:04 +0200 (Mon, 13 Sep 2010) New Revision: 2116 Url: http://nuiton.org/repositories/revision/topia/2116 Log: Evolution #863: Change log level when impl are not generate Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-09-13 12:12:13 UTC (rev 2115) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-09-13 12:17:04 UTC (rev 2116) @@ -172,7 +172,8 @@ } // Generate Entity Implementation class - if (isGenerateImpl(input, input.getOperations())) { + boolean generateImpl = isGenerateImpl(input, input.getOperations()); + if (generateImpl) { generateImpl(input); } @@ -273,18 +274,14 @@ if (fileLocation != null) { // there is already a existing file in class-path, skip - if (isVerbose()) { - log.info("Will not generate [" + fqn + "], found existing file in class-path : " + fileLocation); - } + log.info("Will not generate [" + fqn + "], found existing file in class-path : " + fileLocation); return false; } // On ne génère pas le impl si l'entité a des opérations if (!operations.isEmpty()) { - if (isVerbose()) { - log.info("Will not generate [" + fqn + "], there is some operations to manually implement"); - } + log.info("Will not generate [" + fqn + "], there is some operations to manually implement"); return false; } @@ -292,9 +289,7 @@ // superclasses non implémentées for (ObjectModelOperation otherOp : input.getAllOtherOperations(false)) { if (otherOp.isAbstract()) { - if (isVerbose()) { - log.info("Will not generate [" + fqn + "], there is a abstract operation [" + otherOp.getName() + "] in allOtherOperations."); - } + log.info("Will not generate [" + fqn + "], there is an abstract operation [" + otherOp.getName() + "] in allOtherOperations."); return false; } } @@ -644,7 +639,8 @@ } } - protected void addMultipleAddOperation(ObjectModelAttribute attribute, String collectionImpl) { + protected void addMultipleAddOperation(ObjectModelAttribute attribute, + String collectionImpl) { String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); @@ -715,7 +711,8 @@ setOperationBody(implOperation, body.toString()); } - protected void addMultipleAddAllOperation(ObjectModelAttribute attribute, String collectionInterface) { + protected void addMultipleAddAllOperation(ObjectModelAttribute attribute, + String collectionInterface) { String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); @@ -755,7 +752,9 @@ ); } - protected void addMultipleSetOperation(ObjectModelAttribute attribute, String collectionInterface, String collectionImpl) { + protected void addMultipleSetOperation(ObjectModelAttribute attribute, + String collectionInterface, + String collectionImpl) { String attrName = getPropertyName(attribute); String referenceType = getPropertyType(attribute);

1 0

r2115 - trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org 13 Sep '10

13 Sep '10

Author: tchemit Date: 2010-09-13 14:12:13 +0200 (Mon, 13 Sep 2010) New Revision: 2115 Url: http://nuiton.org/repositories/revision/topia/2115 Log: add header Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2010-09-09 16:14:12 UTC (rev 2114) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2010-09-13 12:12:13 UTC (rev 2115) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Service Replication + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.topia.replication; import org.apache.commons.logging.Log;

1 0

r2114 - trunk/topia-service-security/src/main/java/org/nuiton/topia/taas
by sletellier＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: sletellier Date: 2010-09-09 18:14:12 +0200 (Thu, 09 Sep 2010) New Revision: 2114 Url: http://nuiton.org/repositories/revision/topia/2114 Log: - Move prInit to fix npe on statup Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2010-09-09 16:12:51 UTC (rev 2113) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2010-09-09 16:14:12 UTC (rev 2114) @@ -38,6 +38,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -60,6 +62,8 @@ import javax.security.auth.Subject; import javax.security.auth.login.Configuration; import java.lang.reflect.Constructor; +import java.net.URL; +import java.net.URLClassLoader; import java.security.AccessController; import java.security.Permission; import java.util.*; @@ -136,8 +140,8 @@ @Override public boolean preInit(TopiaContextImplementor context) { + rootContext = context; - initSecurity(rootContext); try { org.hibernate.cfg.Configuration configuration = rootContext.getHibernateConfiguration(); @@ -177,13 +181,18 @@ throw new SecurityException("Init security error", e); } + // Do it after accessEntity instantiation + initSecurity(rootContext); + return true; } @Override public void beginTransaction(TopiaTransactionEvent event) { TopiaContext context = event.getSource(); - initSecurity(context); + if (subjectFinder != null) { + initSecurity(context); + } } /**

1 0

r2113 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by sletellier＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: sletellier Date: 2010-09-09 18:12:51 +0200 (Thu, 09 Sep 2010) New Revision: 2113 Url: http://nuiton.org/repositories/revision/topia/2113 Log: - Add log to show class in fail (when i18n is down :() Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-09-09 09:31:43 UTC (rev 2112) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-09-09 16:12:51 UTC (rev 2113) @@ -98,6 +98,8 @@ import java.util.WeakHashMap; import java.util.zip.GZIPInputStream; +import static org.nuiton.i18n.I18n._; + /** * TODO-fdesbois-20100507 : Need translation of javadoc. * <p/> @@ -627,8 +629,11 @@ try { clazz = Class.forName(classname); } catch (ClassNotFoundException eee) { - throw new TopiaNotFoundException(I18n._( - "topia.persistence.error.class.not.found", + if (log.isDebugEnabled()) { + log.debug("Class " + classname + " not found"); + } + throw new TopiaNotFoundException( + _("topia.persistence.error.class.not.found", classname)); } persistenceClasses.add(clazz);

1 0

r2112 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:31:43 +0200 (Thu, 09 Sep 2010) New Revision: 2112 Url: http://nuiton.org/repositories/revision/topia/2112 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 16:14:07 UTC (rev 2111) +++ trunk/pom.xml 2010-09-09 09:31:43 UTC (rev 2112) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <artifactId>topia</artifactId>

1 0