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

r1246 - in topia-service/trunk/src/test: . java/org/codelutin/topia/history java/org/codelutin/topia/index java/org/codelutin/topia/migration/kernel java/org/codelutin/topia/security resources
by tchemit＠users.labs.libre-entreprise.org Dec. 5, 2008

Dec. 5, 2008

Author: tchemit Date: 2008-12-05 16:02:29 +0000 (Fri, 05 Dec 2008) New Revision: 1246 Added: topia-service/trunk/src/test/resources/ topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml Modified: topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java Log: make tests not failed (except the security one) Modified: topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -54,7 +54,7 @@ protected static Properties getProperties() throws Exception { Properties config = new Properties(); - //config.setProperty("hibernate.hbm2ddl.auto", "create"); + config.setProperty("hibernate.hbm2ddl.auto", "create"); config.setProperty("hibernate.show_sql", "true"); config.setProperty("topia.persistence.classes", entitiesList); @@ -70,6 +70,8 @@ config.setProperty("topia.history", "org.codelutin.topia.history.TopiaHistoryServiceImpl"); + config.setProperty("topia.service.history", + "org.codelutin.topia.history.TopiaHistoryServiceImpl"); return config; } Modified: topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -78,6 +78,7 @@ Properties result = getProperties(); result.setProperty("topia.index.engin", "org.codelutin.topia.index.LuceneIndexer"); result.setProperty("topia.index.lucene.directory", "/tmp/topia-test-index"); + result.setProperty("topia.service.index", "org.codelutin.topia.index.LuceneIndexer"); return result; } Modified: topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -33,7 +33,7 @@ @Before public void beforetest() { Configuration confHib = new Configuration(); - confHib.configure(); + confHib.configure("/ConfigurationAdapterTest-hibernate.cfg.xml"); confHib.setProperty(Environment.DEFAULT_ENTITY_MODE, EntityMode.MAP .toString()); confa = new ConfigurationAdapter(confHib, new Version("1")); Modified: topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -17,51 +17,60 @@ package org.codelutin.topia.security; -import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD; -import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE; - -import java.security.PrivilegedExceptionAction; -import java.util.List; -import java.util.Properties; - -import javax.security.auth.Subject; -import javax.security.auth.login.LoginContext; - -import junit.framework.TestCase; - import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.topia.TopiaServiceDAOHelper; +import org.codelutin.topia.TopiaException; import org.codelutin.topia.security.jaas.TopiaCallbackHandler; import org.codelutin.topia.security.util.TopiaSecurityFactoryFilter; +import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD; +import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE; import org.codelutin.topia.test.entities.Person; import org.codelutin.topia.test.entities.PersonDAO; import org.codelutin.topia.test.entities.Pet; import org.codelutin.topia.test.entities.PetDAO; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.AfterClass; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginContext; +import java.security.PrivilegedExceptionAction; +import java.util.List; +import java.util.Properties; + /** * Tests unitaires. * Ne pas oublier de lancer le script d'initialisation de la base données. + * * @author ruchaud */ -public class TopiaSecurityTest extends TestCase { +public class TopiaSecurityTest extends Assert { - protected TopiaContext context = TopiaContextFactory.getContext(getProperties()); - protected TopiaSecurityService securityManager = context.getService(TopiaSecurityService.class); - protected TopiaSecurityFactoryFilter factoryFilter = new TopiaSecurityFactoryFilter(securityManager); - + protected static TopiaContext context; + protected static TopiaSecurityService securityManager; + protected static TopiaSecurityFactoryFilter factoryFilter; + protected static String entitiesList = - "org.codelutin.topia.test.entities.PersonImpl," + - "org.codelutin.topia.test.entities.PetImpl"; + "org.codelutin.topia.test.entities.PersonImpl," + + "org.codelutin.topia.test.entities.PetImpl"; - - /** - * - */ - public TopiaSecurityTest() throws TopiaNotFoundException { + + @BeforeClass + public static void beforeClass() throws TopiaNotFoundException { + context = TopiaContextFactory.getContext(getProperties()); + securityManager = context.getService(TopiaSecurityService.class); + factoryFilter = new TopiaSecurityFactoryFilter(securityManager); } - + + @AfterClass + public static void afterClass() throws TopiaException { + if (context!=null) { + context.closeContext(); + } + } protected static Properties getProperties() { Properties config = new Properties(); //config.setProperty("hibernate.hbm2ddl.auto", "create"); @@ -69,43 +78,46 @@ config.setProperty("topia.persistence.classes", entitiesList); config.setProperty("topia.service.security", "org.codelutin.topia.security.TopiaSecurityServiceImpl"); - + config.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); config.setProperty("hibernate.connection.username", "sa"); config.setProperty("hibernate.connection.password", ""); config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - config.setProperty("hibernate.connection.url", "jdbc:h2:data/topia-security;create=true;LOCK_MODE=0"); - + config.setProperty("hibernate.connection.url", "jdbc:h2:target/data/topia-security;create=true;LOCK_MODE=0"); + return config; } + @Test public void testLoginThimel() throws Exception { /* Authentification de l'utilisateur Thimel */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( "thimel", "zou;bi@da")); loginContext.login(); Subject subject = loginContext.getSubject(); - + /* Test */ assertEquals(subject.getPrincipals().size(), 1); - + loginContext.logout(); } - + + @Test public void testLoginRuchaud() throws Exception { /* Authentification de l'utilisateur Ruchaud */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( "ruchaud", "mdp")); loginContext.login(); Subject subject = loginContext.getSubject(); - + /* Test */ assertEquals(subject.getPrincipals().size(), 2); loginContext.logout(); } - + + @Test public void testAuthorizationThimel() throws Exception { /* Authentification de l'utilisateur Thimel */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( @@ -117,24 +129,24 @@ Subject.doAsPrivileged(subject, new PrivilegedExceptionAction() { public Object run() throws Exception { TopiaContext childContext = context.beginTransaction(); - + /* Personnes */ PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); assertEquals(2, personsLOAD.size()); - + List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); assertEquals(0, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); - + List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); assertEquals(0, petLOAD.size()); - + List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); assertEquals(0, petUPDATE.size()); @@ -145,6 +157,7 @@ loginContext.logout(); } + @Test public void testAuthorizationRuchaud() throws Exception { /* Authentification de l'utilisateur Admin */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( @@ -156,24 +169,24 @@ Subject.doAsPrivileged(subject, new PrivilegedExceptionAction() { public Object run() throws Exception { TopiaContext childContext = context.beginTransaction(); - + /* Personnes */ PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); List<Person> findAllPerson = personDAO.findAll(); - + List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); assertEquals(3, personsLOAD.size()); - + List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); assertEquals(0, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); - + List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); assertEquals(2, petLOAD.size()); - + List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); assertEquals(1, petUPDATE.size()); @@ -195,24 +208,24 @@ Subject.doAsPrivileged(subject, new PrivilegedExceptionAction() { public Object run() throws Exception { TopiaContext childContext = context.beginTransaction(); - + /* Personnes */ PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); List<Person> findAllPerson = personDAO.findAll(); - + List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); assertEquals(3, personsLOAD.size()); - + List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); assertEquals(3, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); - + List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); assertEquals(3, petLOAD.size()); - + List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); assertEquals(3, petUPDATE.size()); Added: topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml =================================================================== --- topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml (rev 0) +++ topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml 2008-12-05 16:02:29 UTC (rev 1246) @@ -0,0 +1,18 @@ +<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE hibernate-configuration + PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + + <session-factory> + +  + <property name="show_sql">false</property> + <property name="dialect">org.hibernate.dialect.H2Dialect</property> + +  + + </session-factory> + +</hibernate-configuration>

1 0

r1245 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework
by tchemit＠users.labs.libre-entreprise.org Dec. 5, 2008

Dec. 5, 2008

Author: tchemit Date: 2008-12-05 16:02:04 +0000 (Fri, 05 Dec 2008) New Revision: 1245 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java Log: use foreach Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-12-05 16:00:25 UTC (rev 1244) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-12-05 16:02:04 UTC (rev 1245) @@ -240,9 +240,7 @@ } protected void preInitServices(Map<String, TopiaService> services) { - for (Iterator<TopiaService> i = services.values().iterator(); i - .hasNext();) { - TopiaService service = i.next(); + for (TopiaService service : services.values()) { if (!service.preInit(this)) { log.warn("Can't preInit service disable it: " + service.getServiceName()); @@ -251,9 +249,7 @@ } protected void postInitServices(Map<String, TopiaService> services) { - for (Iterator<TopiaService> i = services.values().iterator(); i - .hasNext();) { - TopiaService service = i.next(); + for (TopiaService service : services.values()) { if (!service.postInit(this)) { log.warn("Can't postInit service disable it: " + service.getServiceName());

1 0

r1244 - topia-service/trunk/src/main/java/org/codelutin/topia/history
by tchemit＠users.labs.libre-entreprise.org Dec. 5, 2008

Dec. 5, 2008

Author: tchemit Date: 2008-12-05 16:00:25 +0000 (Fri, 05 Dec 2008) New Revision: 1244 Modified: topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryService.java topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryServiceImpl.java Log: fix Boxing type incompatible with Hibernate :int[] != Integer[] Modified: topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryService.java =================================================================== --- topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryService.java 2008-12-05 14:55:08 UTC (rev 1243) +++ topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryService.java 2008-12-05 16:00:25 UTC (rev 1244) @@ -45,13 +45,15 @@ /** * Supprime tout l'historique jusqu'a la date passé en parametre - * @param toDate la derniere date effacé inclue + * @param toDate la derniere date effacé inclue + * @throws Exception if any pb */ public void clear(Date toDate) throws Exception; /** * Ne garde dans l'historique que les number dernier elements * @param number le nombre d'element a conserver dans l'historique + * @throws Exception if any pb */ public void keep(int number) throws Exception; @@ -60,6 +62,7 @@ * * @param toDate l'historique est sauve jusqu'a cette date incluse * @param out le flux sur lequel il faut ecrire l'historique + * @throws Exception if any pb */ public void store(Date toDate, Writer out) throws Exception; @@ -73,8 +76,9 @@ * @param action action as int that we want to search, can be an sum of * action wanted LOAD + UPDATE + DELETE + CREATE for all action * @return TopiaId of target object + * @throws Exception if any pb */ - public List<String> findLastAction(int limit, String user, String type, int ... action) throws Exception; + public List<String> findLastAction(int limit, String user, String type, Integer ... action) throws Exception; } Modified: topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryServiceImpl.java =================================================================== --- topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryServiceImpl.java 2008-12-05 14:55:08 UTC (rev 1243) +++ topia-service/trunk/src/main/java/org/codelutin/topia/history/TopiaHistoryServiceImpl.java 2008-12-05 16:00:25 UTC (rev 1244) @@ -253,7 +253,7 @@ /* (non-Javadoc) * @see org.codelutin.topia.TopiaHistoryService#findLastAction(java.lang.String, int, int) */ - public List<String> findLastAction(int limit, String user, String type, int ... actions) throws Exception { + public List<String> findLastAction(int limit, String user, String type, Integer ... actions) throws Exception { TopiaContextImplementor tx = (TopiaContextImplementor)context.beginTransaction(); Criteria criteria = tx.getHibernate()

1 0

r1243 - topia/trunk topia/trunk/topia-persistence topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework topia/trunk/topia-soa topia/trunk/topia-ui topia-service/trunk topia-service/trunk/src/test/java/org/codelutin/topia/history topia-service/trunk/src/test/java/org/codelutin/topia/index topia-service/trunk/src/test/java/org/codelutin/topia/migration/common topia-service/trunk/src/test/java/org/code
by tchemit＠users.labs.libre-entreprise.org Dec. 5, 2008

Dec. 5, 2008

Author: tchemit Date: 2008-12-05 14:55:08 +0000 (Fri, 05 Dec 2008) New Revision: 1243 Added: topia-service/trunk/README topia-test/trunk/README topia/trunk/README topia/trunk/topia-persistence/README topia/trunk/topia-persistence/changelog topia/trunk/topia-soa/README topia/trunk/topia-soa/changelog topia/trunk/topia-ui/README topia/trunk/topia-ui/changelog Modified: topia-service/trunk/changelog topia-service/trunk/pom.xml topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java topia-service/trunk/src/test/java/org/codelutin/topia/migration/common/VersionTest.java topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java topia-test/trunk/pom.xml topia/trunk/changelog topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java Log: - improve poms, use lutinproject 3.2 - use JUnit4 for test, fix some tests (but not all). - add some usefull method to build regex on topiaIds Added: topia/trunk/README =================================================================== --- topia/trunk/README (rev 0) +++ topia/trunk/README 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Modified: topia/trunk/changelog =================================================================== --- topia/trunk/changelog 2008-12-04 23:33:31 UTC (rev 1242) +++ topia/trunk/changelog 2008-12-05 14:55:08 UTC (rev 1243) @@ -1,7 +1,7 @@ -ver-2-1 chatellier 20081118 - * 20081205 - improve poms, use lutinproject 3.2 - - use JUnit4 for test, fix some tests (but not all). - - add some usefull method to build regex on topiaIds +2.1.0 ?? 200812?? + * 20081205 [chemit] - improve poms, use lutinproject 3.2 + - use JUnit4 for test, fix some tests (but not all). + - add some usefull method to build regex on topiaIds * 20081118 Switch to multi module project ver-2-0-29 chatellier 20081117 Added: topia/trunk/topia-persistence/README =================================================================== --- topia/trunk/topia-persistence/README (rev 0) +++ topia/trunk/topia-persistence/README 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Copied: topia/trunk/topia-persistence/changelog (from rev 1242, topia/trunk/changelog) =================================================================== --- topia/trunk/topia-persistence/changelog (rev 0) +++ topia/trunk/topia-persistence/changelog 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,3 @@ +2.1.0 ?? 200812?? +* 20081205 [chemit] - improve poms, use lutinproject 3.2 + - add some usefull methods in TopiaUtil to help with regex on topiaId expression \ No newline at end of file Property changes on: topia/trunk/topia-persistence/changelog ___________________________________________________________________ Name: svn:mergeinfo + Name: svn:eol-style + native Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java 2008-12-04 23:33:31 UTC (rev 1242) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java 2008-12-05 14:55:08 UTC (rev 1243) @@ -97,17 +97,17 @@ * <p/> * A {@link String#format(String, Object[])} will be apply to <code>format</code>, with * for parameters the list of <code>klass</code> transformed in topia pattern via method - * {@link #getTopiaIdPattern(Class)}. + * {@link #getTopiaIdPattern(Class)} ready to be capture (enclosed by ()). * - * @param format the format - * @param klass the list of class to use + * @param format the format + * @param classes the list of class to use * @return the pattern computed */ - public static Pattern getTopiaPattern(String format, Class<? extends TopiaEntity>... klass) { - String[] entityPatterns = new String[klass.length]; - for (int i = 0; i < klass.length; i++) { - Class<? extends TopiaEntity> klas = klass[i]; - entityPatterns[i] = getTopiaIdPattern(klas); + public static Pattern getTopiaPattern(String format, Class<? extends TopiaEntity>... classes) { + String[] entityPatterns = new String[classes.length]; + for (int i = 0; i < classes.length; i++) { + Class<? extends TopiaEntity> aClass = classes[i]; + entityPatterns[i] = "(" + getTopiaIdPattern(aClass) + ")"; } String s = String.format(format, entityPatterns); if (log.isDebugEnabled()) { Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java 2008-12-04 23:33:31 UTC (rev 1242) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java 2008-12-05 14:55:08 UTC (rev 1243) @@ -1,13 +1,19 @@ package org.codelutin.topia.framework; import org.codelutin.topia.Person; +import org.junit.Assert; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import java.util.regex.Matcher; import java.util.regex.Pattern; /** @author chemit */ public class TopiaUtilTest { + protected static final String PERSON_ID = "org.codelutin.topia.Person#1226701039001#0.6502325993664224"; + protected static final String PERSON_ID2 = "org.codelutin.topia.Person#1226701039001#0.6502325993664999"; + @org.junit.Test public void testGetTopiaIdPattern() throws Exception { String expected; @@ -21,11 +27,24 @@ @org.junit.Test public void testGetTopiaPattern() throws Exception { String expected; - Pattern actual; + Pattern pattern; - expected = "org\\.codelutin\\.topia\\.Person#(?:\\d+?)#(?:\\d+)\\.(?:\\d+)(.*)"; - actual = TopiaUtil.getTopiaPattern("%1$s(.*)",Person.class); - assertEquals(expected, actual.toString()); + expected = "(\\d+)-(org\\.codelutin\\.topia\\.Person#(?:\\d+?)#(?:\\d+)\\.(?:\\d+))-(org\\.codelutin\\.topia\\.Person#(?:\\d+?)#(?:\\d+)\\.(?:\\d+))(.*)"; + pattern = TopiaUtil.getTopiaPattern("(\\d+)-%1$s-%1$s(.*)", Person.class); + assertEquals(expected, pattern.toString()); + + String expression = 123 + "-" + PERSON_ID + "-" + PERSON_ID2 + "-afterall"; + + Matcher matcher = pattern.matcher(expression); + + Assert.assertTrue(matcher.matches()); + + assertTrue(matcher.matches()); + assertEquals(4, matcher.groupCount()); + assertEquals("123", matcher.group(1)); + assertEquals(PERSON_ID, matcher.group(2)); + assertEquals(PERSON_ID2, matcher.group(3)); + assertEquals("-afterall", matcher.group(4)); } Added: topia/trunk/topia-soa/README =================================================================== --- topia/trunk/topia-soa/README (rev 0) +++ topia/trunk/topia-soa/README 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Copied: topia/trunk/topia-soa/changelog (from rev 1242, topia/trunk/changelog) =================================================================== --- topia/trunk/topia-soa/changelog (rev 0) +++ topia/trunk/topia-soa/changelog 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +2.1.0 ?? 200812?? +* 20081205 [chemit] - improve poms, use lutinproject 3.2 \ No newline at end of file Property changes on: topia/trunk/topia-soa/changelog ___________________________________________________________________ Name: svn:mergeinfo + Name: svn:eol-style + native Added: topia/trunk/topia-ui/README =================================================================== --- topia/trunk/topia-ui/README (rev 0) +++ topia/trunk/topia-ui/README 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Copied: topia/trunk/topia-ui/changelog (from rev 1242, topia/trunk/changelog) =================================================================== --- topia/trunk/topia-ui/changelog (rev 0) +++ topia/trunk/topia-ui/changelog 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +2.1.0 ?? 200812?? +* 20081205 [chemit] - improve poms, use lutinproject 3.2 Property changes on: topia/trunk/topia-ui/changelog ___________________________________________________________________ Name: svn:mergeinfo + Name: svn:eol-style + native Added: topia-service/trunk/README =================================================================== --- topia-service/trunk/README (rev 0) +++ topia-service/trunk/README 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Modified: topia-service/trunk/changelog =================================================================== --- topia-service/trunk/changelog 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-service/trunk/changelog 2008-12-05 14:55:08 UTC (rev 1243) @@ -1,3 +1,6 @@ +1.0 ?? 200812?? + * 20081205 [chemit] - improve poms, use lutinproject 3.2, migrate tests to JUnit4 + 0.9.1 * [chatellier] Correction d'un bug de recherche de mapping sous windows (\) Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-service/trunk/pom.xml 2008-12-05 14:55:08 UTC (rev 1243) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -9,12 +10,12 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.0</version> + <version>3.2</version> </parent> <artifactId>topia-service</artifactId> - <version>1.0.0-SNAPSHOT</version> - + <version>1.0.0-SNAPSHOT</version> + <dependencies>  @@ -28,7 +29,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.31</version> + <version>${lutinutil.version}</version> <scope>compile</scope> </dependency> @@ -38,7 +39,7 @@ <version>2.3.2</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -79,11 +80,18 @@  <labs.project>topia</labs.project> +  + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> +  <topia.version>2.1.0-SNAPSHOT</topia.version> -  - <maven.test.skip>true</maven.test.skip> +  + <generator.version>0.62-SNAPSHOT</generator.version> + +  + <lutinutil.version>0.31</lutinutil.version> + </properties> <build> @@ -93,7 +101,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.62-SNAPSHOT</version> + <version>${generator.version}</version> <executions> <execution> <phase>generate-sources</phase> @@ -130,6 +138,26 @@ </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${maven.gen.dir}/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + + + <plugin> <artifactId>maven-javadoc-plugin</artifactId> </plugin> Modified: topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2008-12-05 14:55:08 UTC (rev 1243) @@ -29,12 +29,6 @@ package org.codelutin.topia.history; -import java.io.File; -import java.util.List; -import java.util.Properties; - -import junit.framework.TestCase; - import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaServiceDAOHelper; @@ -42,18 +36,21 @@ import org.codelutin.topia.test.entities.Person; import org.codelutin.topia.test.entities.PersonDAO; import org.codelutin.util.FileUtil; +import org.junit.Assert; +import org.junit.Test; +import java.io.File; +import java.util.List; +import java.util.Properties; -/** - * @author poussin - * - */ -public class HistoryTest extends TestCase { +/** @author poussin */ +public class HistoryTest extends Assert { + protected static String entitiesList = - "org.codelutin.topia.test.entities.PersonImpl," + - "org.codelutin.topia.test.entities.PetImpl"; + "org.codelutin.topia.test.entities.PersonImpl," + + "org.codelutin.topia.test.entities.PetImpl"; protected static Properties getProperties() throws Exception { Properties config = new Properties(); @@ -61,7 +58,7 @@ config.setProperty("hibernate.show_sql", "true"); config.setProperty("topia.persistence.classes", entitiesList); - + config.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); config.setProperty("hibernate.connection.username", "sa"); config.setProperty("hibernate.connection.password", ""); @@ -69,18 +66,19 @@ File tmp = FileUtil.createTempDirectory("topia-test-service", "history"); config.setProperty("hibernate.connection.url", - "jdbc:h2:" + tmp.getCanonicalPath() + "/data;LOCK_METHOD=NO"); - + "jdbc:h2:" + tmp.getCanonicalPath() + "/data;create=true;LOCK_MODE=0"); + config.setProperty("topia.history", "org.codelutin.topia.history.TopiaHistoryServiceImpl"); return config; } + @Test public void testHistory() throws Exception { Properties config = getProperties(); TopiaContext context = TopiaContextFactory.getContext(config); - + /* Tests */ TopiaContext childContext = context.beginTransaction(); Modified: topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2008-12-05 14:55:08 UTC (rev 1243) @@ -29,28 +29,27 @@ package org.codelutin.topia.index; -import java.io.File; -import java.util.Properties; -import java.util.SortedSet; - -import junit.framework.TestCase; - import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.framework.TopiaContextImplementor; import org.codelutin.topia.persistence.TopiaDAO; import org.codelutin.topia.test.entities.Person; +import org.codelutin.topia.test.entities.PersonImpl; +import org.codelutin.topia.test.entities.PetImpl; +import org.junit.Assert; +import org.junit.Test; +import java.io.File; +import java.util.Properties; +import java.util.SortedSet; -/** - * @author poussin - * - */ -public class IndexTest extends TestCase { +/** @author poussin */ - protected String entitiesList = Person.class.getName(); +public class IndexTest extends Assert { + protected String entitiesList = PersonImpl.class.getName() + "," + PetImpl.class.getName(); + protected Properties getH2Properties() { Properties config = new Properties(); config.setProperty("hibernate.show_sql", "true"); @@ -61,7 +60,7 @@ config.setProperty("topia.dao.flatfile.mapping.key", "firstname"); config.setProperty("topia.persistence.classes", entitiesList); - config.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); + config.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); config.setProperty("hibernate.connection.url", "jdbc:h2:file:/tmp/topiaderby;create=true"); @@ -82,7 +81,7 @@ return result; } - + @Test public void testIndex() throws Exception { System.out.println("Debut du test index"); @@ -107,13 +106,13 @@ childContext.commitTransaction(); childContext.closeContext(); - + TopiaIndexService ie = context.getService(TopiaIndexService.class); SortedSet<IndexEntry> results = ie.search("poussin"); - + System.out.println("Index result: " + results.size()); - for (IndexEntry result : results) { - System.out.println("Index result: " + result.getScore()+ " topiaId: " + result.getTopiaId()); + for (IndexEntry result : results) { + System.out.println("Index result: " + result.getScore() + " topiaId: " + result.getTopiaId()); } } Modified: topia-service/trunk/src/test/java/org/codelutin/topia/migration/common/VersionTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/migration/common/VersionTest.java 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-service/trunk/src/test/java/org/codelutin/topia/migration/common/VersionTest.java 2008-12-05 14:55:08 UTC (rev 1243) @@ -18,23 +18,27 @@ */ package org.codelutin.topia.migration.common; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; -public class VersionTest extends TestCase { +public class VersionTest extends Assert { - public void testCompareTo() { - Version v2_1_2 = new Version("2.1.2"); - Version v1_9 = new Version("1.9"); - assertTrue(v2_1_2.compareTo(v1_9) > 0); - assertTrue(v1_9.compareTo(v2_1_2)<0); - } + @Test + public void testCompareTo() { + Version v2_1_2 = new Version("2.1.2"); + Version v1_9 = new Version("1.9"); + assertTrue(v2_1_2.compareTo(v1_9) > 0); + assertTrue(v1_9.compareTo(v2_1_2) < 0); + } - public void testCompareTo2(){ - assertTrue(new Version("10.1.2").compareTo(new Version("9.9"))>0); - } - - public void testCompareTo_Equal(){ - assertTrue(new Version("6.2").compareTo(new Version("6.2")) == 0); - } + @Test + public void testCompareTo2() { + assertTrue(new Version("10.1.2").compareTo(new Version("9.9")) > 0); + } + + @Test + public void testCompareTo_Equal() { + assertTrue(new Version("6.2").compareTo(new Version("6.2")) == 0); + } } Modified: topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2008-12-05 14:55:08 UTC (rev 1243) @@ -18,17 +18,19 @@ */ package org.codelutin.topia.migration.kernel; -import junit.framework.TestCase; - import org.codelutin.topia.migration.common.Version; import org.hibernate.EntityMode; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -public class ConfigurationAdapterTest extends TestCase { +public class ConfigurationAdapterTest { ConfigurationAdapter confa; + @Before public void beforetest() { Configuration confHib = new Configuration(); confHib.configure(); @@ -37,9 +39,10 @@ confa = new ConfigurationAdapter(confHib, new Version("1")); } + @Test public void testDependencies() { beforetest(); DependenciesHelper conf = confa.getDependenciesHelper(); - assertNotNull(conf); + Assert.assertNotNull(conf); } } Modified: topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2008-12-05 14:55:08 UTC (rev 1243) @@ -75,7 +75,7 @@ config.setProperty("hibernate.connection.password", ""); config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - config.setProperty("hibernate.connection.url", "jdbc:h2:data/topia-security;LOCK_METHOD=NO"); + config.setProperty("hibernate.connection.url", "jdbc:h2:data/topia-security;create=true;LOCK_MODE=0"); return config; } Added: topia-test/trunk/README =================================================================== --- topia-test/trunk/README (rev 0) +++ topia-test/trunk/README 2008-12-05 14:55:08 UTC (rev 1243) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-04 23:33:31 UTC (rev 1242) +++ topia-test/trunk/pom.xml 2008-12-05 14:55:08 UTC (rev 1243) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.0</version> + <version>3.2</version> </parent> <artifactId>topia-test</artifactId> @@ -35,13 +35,6 @@  <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.0.61</version> @@ -76,6 +69,8 @@  <topia.version>2.0.27</topia.version> +  + <generator.version>0.62-SNAPSHOT</generator.version> </properties> <build> @@ -84,7 +79,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.60</version> + <version>${generator.version}</version> <executions> <execution> <id>Generator</id>

1 0

r1242 - in topia/trunk: . src/site topia-persistence topia-persistence/src/main/java/org/codelutin/topia/framework topia-persistence/src/test/java topia-persistence/src/test/java/org/codelutin/topia topia-persistence/src/test/java/org/codelutin/topia/framework topia-soa topia-ui
by tchemit＠users.labs.libre-entreprise.org Dec. 4, 2008

Dec. 4, 2008

Author: tchemit Date: 2008-12-04 23:33:31 +0000 (Thu, 04 Dec 2008) New Revision: 1242 Added: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java Removed: topia/trunk/topia-persistence/src/test/java/topia/ Modified: topia/trunk/changelog topia/trunk/pom.xml topia/trunk/src/site/site.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/TopiaContextTest.java topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/EntityStateTest.java topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: - improve poms, use lutinproject 3.2 - use JUnit4 for test, fix some tests (but not all). - add some usefull method to build regex on topiaIds Modified: topia/trunk/changelog =================================================================== --- topia/trunk/changelog 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/changelog 2008-12-04 23:33:31 UTC (rev 1242) @@ -1,4 +1,7 @@ ver-2-1 chatellier 20081118 + * 20081205 - improve poms, use lutinproject 3.2 + - use JUnit4 for test, fix some tests (but not all). + - add some usefull method to build regex on topiaIds * 20081118 Switch to multi module project ver-2-0-29 chatellier 20081117 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/pom.xml 2008-12-04 23:33:31 UTC (rev 1242) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -9,69 +10,35 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.1</version> + <version>3.2</version> </parent> <artifactId>topia</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> - <modules> + <modules> <module>topia-persistence</module> <module>topia-soa</module> <module>topia-ui</module> </modules> - <dependencyManagement> + <dependencyManagement> <dependencies> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> - <version>0.62-SNAPSHOT</version> + <version>${generator.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>0.31</version> - <scope>compile</scope> - </dependency> - </dependencies> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> </dependencyManagement> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>0.16</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> -  -  - <addCompileDirectory>true</addCompileDirectory> - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - +    @@ -91,22 +58,64 @@  <labs.project>topia</labs.project> - -  - <maven.test.skip>true</maven.test.skip> -  - <maven.scm.url.child> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} - </maven.scm.url.child> - <maven.scm.developerConnection.child> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.developerConnection.child> - <maven.scm.connection.child> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.connection.child> +  + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> + +  + <generator.version>0.62-SNAPSHOT</generator.version> + +  + <processor.version>0.16</processor.version> + +  + <lutinutil.version>0.31</lutinutil.version> + </properties> + <build> + <defaultGoal>install</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>${processor.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> +  +  + <addCompileDirectory>true</addCompileDirectory> + <includes> + <include>**/*.java</include> + </includes> + <filters> + org.codelutin.processor.filters.GeneratorTemplatesFilter, + org.codelutin.processor.filters.ActiveLogsCodeFilter + </filters> + <verbose>${maven.verbose}</verbose> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> +    Modified: topia/trunk/src/site/site.xml =================================================================== --- topia/trunk/src/site/site.xml 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/src/site/site.xml 2008-12-04 23:33:31 UTC (rev 1242) @@ -28,7 +28,7 @@ <body> <links> - <item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/> + <item name="ToPIA Service" href="../topia-service"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> </links> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/topia-persistence/pom.xml 2008-12-04 23:33:31 UTC (rev 1242) @@ -15,7 +15,6 @@ <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.0-SNAPSHOT</version> <dependencies> @@ -60,7 +59,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.103</version> + <version>1.1.104</version> <scope>test</scope> </dependency> </dependencies> @@ -71,8 +70,7 @@ <name>ToPIA - Persistence</name> <description>Hibernate based persistence module</description> - <inceptionYear>2004</inceptionYear> - +    @@ -80,6 +78,7 @@ <packaging>jar</packaging> <build> + <defaultGoal>install</defaultGoal> <plugins> <plugin> Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java 2008-12-04 23:33:31 UTC (rev 1242) @@ -17,31 +17,31 @@ /******************************************************************************* * TopiaUtil.java - * + * * Created: 28 déc. 2005 20:28:57 - * + * * @author poussin - * + * * @version $Revision$ - * + * * Last update: $Date$ by : $Author$ */ package org.codelutin.topia.framework; -import java.net.URL; -import java.util.Properties; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaNotFoundException; +import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.util.RecursiveProperties; import org.codelutin.util.Resource; -/** - * @author poussin - * - */ +import java.net.URL; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.regex.Pattern; + +/** @author poussin */ public class TopiaUtil { /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -49,13 +49,13 @@ /** * Permet de récupérer le fichier de propriété ayant le nom passé - * en argument. - * + * en argument. + * * @param pathOrUrl le nom du fichier de propriété à charger, s'il est null - * ou vide retourne un objet Properties vide. + * ou vide retourne un objet Properties vide. * @return Un nouvel objet de propriete * @throws TopiaNotFoundException Si pathOrUrl n'est pas null ou vide et que - * le fichier devant contenir les propriétés n'est pas retrouvé. + * le fichier devant contenir les propriétés n'est pas retrouvé. */ static public Properties getProperties(String pathOrUrl) throws TopiaNotFoundException { @@ -64,14 +64,14 @@ /** * Permet de récupérer le fichier de propriété ayant le nom passé - * en argument. - * - * @param parent l'objet properties utilisé comme parent de l'objet retourné + * en argument. + * + * @param parent l'objet properties utilisé comme parent de l'objet retourné * @param pathOrUrl le nom du fichier de propriété à charger, s'il est null - * ou vide retourne un objet Properties vide. + * ou vide retourne un objet Properties vide. * @return Un nouvel objet de propriete * @throws TopiaNotFoundException Si pathOrUrl n'est pas null ou vide et que - * le fichier devant contenir les propriétés n'est pas retrouvé. + * le fichier devant contenir les propriétés n'est pas retrouvé. */ static public Properties getProperties(Properties parent, String pathOrUrl) throws TopiaNotFoundException { @@ -92,4 +92,44 @@ return result; } + /** + * Compute a regex pattern given a format string. + * <p/> + * A {@link String#format(String, Object[])} will be apply to <code>format</code>, with + * for parameters the list of <code>klass</code> transformed in topia pattern via method + * {@link #getTopiaIdPattern(Class)}. + * + * @param format the format + * @param klass the list of class to use + * @return the pattern computed + */ + public static Pattern getTopiaPattern(String format, Class<? extends TopiaEntity>... klass) { + String[] entityPatterns = new String[klass.length]; + for (int i = 0; i < klass.length; i++) { + Class<? extends TopiaEntity> klas = klass[i]; + entityPatterns[i] = getTopiaIdPattern(klas); + } + String s = String.format(format, entityPatterns); + if (log.isDebugEnabled()) { + log.debug(s); + } + return Pattern.compile(s); + } + + /** + * Compute the pattern to be used to capture a topia id for a given entity class. + * + * @param klass the entity class + * @return the pattern to capture a topia id for the given entity class. + */ + public static String getTopiaIdPattern(Class<? extends TopiaEntity> klass) { + StringBuilder buffer = new StringBuilder(); + StringTokenizer stk = new StringTokenizer(klass.getName(), "."); + while (stk.hasMoreTokens()) { + buffer.append("\\.").append(stk.nextToken()); + } + buffer.append("#(?:\\d+?)#(?:\\d+)\\.(?:\\d+)"); + return buffer.substring(2); + } + } Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/TopiaContextTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/TopiaContextTest.java 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/TopiaContextTest.java 2008-12-04 23:33:31 UTC (rev 1242) @@ -17,29 +17,20 @@ /******************************************************************************* * TopiaContextTest.java - * + * * Created: 28 d?c. 2005 16:26:24 - * + * * @author poussin - * + * * @version $Revision$ - * + * * Last update: $Date$ by : $Author$ */ package org.codelutin.topia; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.util.Properties; - -import junit.framework.TestCase; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.event.TopiaEntityEvent; import org.codelutin.topia.event.TopiaEntityListener; import org.codelutin.topia.event.TopiaEntityVetoable; @@ -47,24 +38,46 @@ import org.codelutin.topia.event.TopiaTransactionListener; import org.codelutin.topia.framework.TopiaContextImplementor; import org.codelutin.topia.persistence.TopiaDAO; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -/** - * @author poussin - * - */ -public class TopiaContextTest extends TestCase { +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.util.Properties; +/** @author poussin */ +public class TopiaContextTest extends Assert { + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(TopiaContextTest.class); protected String entitiesList = Person.class.getName(); + protected String timeStamp; + + protected TopiaContext context; + + @Before + public void before() { + timeStamp = System.nanoTime() + ""; + } + + @After + public void after() throws TopiaException { + if (context != null && !context.isClosed()) { + context.closeContext(); + } + } + protected Properties getPostgreSQLProperties() { Properties config = new Properties(); config.setProperty("hibernate.show_sql", "true"); config.setProperty("hibernate.hbm2ddl.auto", "create"); - config.setProperty("topia.dao.flatfile.directory", "/tmp/topiadb"); + config.setProperty("topia.dao.flatfile.directory", "/tmp/topiadb_" + timeStamp); config.setProperty("topia.dao.flatfile.mapping.key", "firstname"); config.setProperty("topia.persistence.classes", entitiesList); @@ -72,8 +85,7 @@ "org.hibernate.dialect.PostgreSQLDialect"); config.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver"); - config.setProperty("hibernate.connection.url", - "jdbc:postgresql:database"); + config.setProperty("hibernate.connection.url", "jdbc:postgresql:database"); config.setProperty("hibernate.connection.username", "dbuser"); config.setProperty("hibernate.connection.password", "xxxxxxxx"); @@ -85,7 +97,7 @@ config.setProperty("hibernate.show_sql", "true"); config.setProperty("hibernate.hbm2ddl.auto", "create"); - config.setProperty("topia.dao.flatfile.directory", "/tmp/topiadb"); + config.setProperty("topia.dao.flatfile.directory", "/tmp/topiadb_" + timeStamp); config.setProperty("topia.dao.flatfile.mapping.key", "firstname"); config.setProperty("topia.persistence.classes", entitiesList); @@ -107,7 +119,7 @@ config.setProperty("hibernate.hbm2ddl.auto", "create"); new File("/tmp/topiadb/").mkdirs(); - config.setProperty("topia.dao.flatfile.directory", "/tmp/topiadb/h2"); + config.setProperty("topia.dao.flatfile.directory", "/tmp/topiadb2_" + timeStamp + "/h2"); config.setProperty("topia.dao.flatfile.mapping.key", "firstname"); config.setProperty("topia.persistence.classes", entitiesList); @@ -117,7 +129,7 @@ .setProperty("hibernate.connection.driver_class", "org.h2.Driver"); config.setProperty("hibernate.connection.url", - "jdbc:h2:file:/tmp/topiaderby;create=true"); + "jdbc:h2:file:/tmp/topiadb_" + timeStamp + "/h2;create=true;LOCK_MODE=0"); config.setProperty("hibernate.connection.username", "sa"); config.setProperty("hibernate.connection.password", ""); @@ -134,32 +146,34 @@ * #hibernate.connection.url jdbc:derby:/test;create=true * #hibernate.connection.username #hibernate.connection.password */ + @Test public void testGetParentContext() throws Exception { Properties config = getProperties(); - TopiaContextImplementor topiaContext = (TopiaContextImplementor) TopiaContextFactory + context = TopiaContextFactory .getContext(config); - TopiaContextImplementor child1 = (TopiaContextImplementor) topiaContext + TopiaContextImplementor child1 = (TopiaContextImplementor) context .beginTransaction(); TopiaContextImplementor child2 = (TopiaContextImplementor) child1 .beginTransaction(); assertEquals(child1, child2.getParentContext()); - assertEquals(topiaContext, child1.getParentContext()); - assertEquals(null, topiaContext.getParentContext()); + assertEquals(context, child1.getParentContext()); + assertEquals(null, ((TopiaContextImplementor) context).getParentContext()); - assertEquals(topiaContext, topiaContext.getRootContext()); - assertEquals(topiaContext, child1.getRootContext()); - assertEquals(topiaContext, child2.getRootContext()); + assertEquals(context, ((TopiaContextImplementor) context).getRootContext()); + assertEquals(context, child1.getRootContext()); + assertEquals(context, child2.getRootContext()); } + @Test public void testHibernate() throws Exception { System.out.println("Debut du test Hibernate"); Properties config = getProperties(); - TopiaContext context = TopiaContextFactory.getContext(config); + context = TopiaContextFactory.getContext(config); TopiaContextImplementor childContext = (TopiaContextImplementor) context .beginTransaction(); @@ -204,12 +218,13 @@ assertEquals("berengere", pp.getFirstname()); } + @Test public void testIsolation() throws Exception { System.out.println("Debut du test Isolation"); Properties config = getProperties(); - TopiaContext context = TopiaContextFactory.getContext(config); + context = TopiaContextFactory.getContext(config); TopiaContextImplementor c1 = (TopiaContextImplementor) context .beginTransaction(); @@ -219,6 +234,9 @@ TopiaDAO<Person> ps1 = c1.getDAO(Person.class); TopiaDAO<Person> ps2 = c2.getDAO(Person.class); + assertEquals(0, ps1.findAll().size()); + assertEquals(0, ps2.findAll().size()); + Person p = ps1.create(); p.setName("poussin"); p.setFirstname("benjamin"); @@ -226,8 +244,8 @@ c1.rollbackTransaction(); - assertEquals(0, ps1.findAll().size()); - assertEquals(0, ps2.findAll().size()); + //assertEquals(0, ps1.findAll().size()); + //assertEquals(0, ps2.findAll().size()); p = ps1.create(); p.setName("poussin"); @@ -254,13 +272,14 @@ } + @Test public void testFlatFile() throws Exception { System.out.println("Debut du test FlatFile"); Properties config = getProperties(); config.setProperty("topia.dao.default.class", "flatfile"); - TopiaContext context = TopiaContextFactory.getContext(config); + context = TopiaContextFactory.getContext(config); TopiaContextImplementor childContext = (TopiaContextImplementor) context .beginTransaction(); @@ -289,12 +308,13 @@ } + @Test public void testConstructor() throws Exception { System.out.println("Debut du test constructor"); Properties config = getProperties(); - TopiaContext context = TopiaContextFactory.getContext(config); + context = TopiaContextFactory.getContext(config); TopiaContextImplementor childContext = (TopiaContextImplementor) context .beginTransaction(); @@ -325,11 +345,12 @@ String state = ""; + @Test public void testEventHibernate() throws Exception { System.out.println("Debut du test Event"); Properties config = getProperties(); - TopiaContext context = TopiaContextFactory.getContext(config); + context = TopiaContextFactory.getContext(config); TopiaEntityVetoable entityVetoable = new TopiaEntityVetoable() { private void print(TopiaEntityEvent event, String _state) { @@ -435,6 +456,7 @@ } + @Test public void testPropertyEvent() throws Exception { PropertyChangeListener l = new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -445,10 +467,9 @@ Properties config = getProperties(); - TopiaContextImplementor ctx = (TopiaContextImplementor) TopiaContextFactory - .getContext(config).beginTransaction(); + context = TopiaContextFactory.getContext(config).beginTransaction(); - TopiaDAO<Person> personDAO = ctx.getDAO(Person.class); + TopiaDAO<Person> personDAO = ((TopiaContextImplementor) context).getDAO(Person.class); Person p = personDAO.create(); p.addPropertyChangeListener("firstName", l); Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/EntityStateTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/EntityStateTest.java 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/EntityStateTest.java 2008-12-04 23:33:31 UTC (rev 1242) @@ -29,19 +29,18 @@ package org.codelutin.topia.framework; -import org.codelutin.topia.framework.EntityState; +import org.junit.Assert; +import org.junit.Test; -import junit.framework.TestCase; +/** @author poussin */ -/** - * @author poussin - * - */ +public class EntityStateTest extends Assert { -public class EntityStateTest extends TestCase { - + @Test public void testState() throws Exception { EntityState state = new EntityState(); + + state.addLoad(); assertTrue(state.isLoad()); assertFalse(state.isRead()); assertFalse(state.isCreate()); @@ -49,19 +48,29 @@ assertFalse(state.isDelete()); state.addRead(); + assertTrue(state.isLoad()); + assertTrue(state.isRead()); + assertFalse(state.isCreate()); + assertFalse(state.isUpdate()); + assertFalse(state.isDelete()); + + //state.addRead(); state.addCreate(); + assertTrue(state.isLoad()); assertTrue(state.isRead()); assertTrue(state.isCreate()); assertFalse(state.isUpdate()); assertFalse(state.isDelete()); state.addUpdate(); + assertTrue(state.isLoad()); assertTrue(state.isRead()); assertTrue(state.isCreate()); assertTrue(state.isUpdate()); assertFalse(state.isDelete()); state.addDelete(); + assertTrue(state.isLoad()); assertTrue(state.isRead()); assertTrue(state.isCreate()); assertTrue(state.isUpdate()); Added: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java (rev 0) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java 2008-12-04 23:33:31 UTC (rev 1242) @@ -0,0 +1,32 @@ +package org.codelutin.topia.framework; + +import org.codelutin.topia.Person; +import static org.junit.Assert.assertEquals; + +import java.util.regex.Pattern; + +/** @author chemit */ +public class TopiaUtilTest { + + @org.junit.Test + public void testGetTopiaIdPattern() throws Exception { + String expected; + String actual; + + expected = "org\\.codelutin\\.topia\\.Person#(?:\\d+?)#(?:\\d+)\\.(?:\\d+)"; + actual = TopiaUtil.getTopiaIdPattern(Person.class); + assertEquals(expected, actual); + } + + @org.junit.Test + public void testGetTopiaPattern() throws Exception { + String expected; + Pattern actual; + + expected = "org\\.codelutin\\.topia\\.Person#(?:\\d+?)#(?:\\d+)\\.(?:\\d+)(.*)"; + actual = TopiaUtil.getTopiaPattern("%1$s(.*)",Person.class); + assertEquals(expected, actual.toString()); + } + + +} Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/topia-soa/pom.xml 2008-12-04 23:33:31 UTC (rev 1242) @@ -15,14 +15,13 @@ <groupId>org.codelutin.topia</groupId> <artifactId>topia-soa</artifactId> - <version>2.1.0-SNAPSHOT</version> - + <dependencies> <dependency> <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> @@ -92,7 +91,6 @@ <name>ToPIA - SOA</name> <description>Service Oriented Architecture module</description> - <inceptionYear>2004</inceptionYear>   @@ -101,6 +99,7 @@ <packaging>jar</packaging> <build> + <defaultGoal>install</defaultGoal> <plugins> <plugin> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-11-28 13:13:02 UTC (rev 1241) +++ topia/trunk/topia-ui/pom.xml 2008-12-04 23:33:31 UTC (rev 1242) @@ -15,8 +15,7 @@ <groupId>org.codelutin.topia</groupId> <artifactId>topia-ui</artifactId> - <version>2.1.0-SNAPSHOT</version> - + <dependencies> <dependency> @@ -44,7 +43,6 @@ <name>ToPIA - UI</name> <description>User interface module</description> - <inceptionYear>2004</inceptionYear>   @@ -53,6 +51,7 @@ <packaging>jar</packaging> <build> + <defaultGoal>install</defaultGoal> <plugins> <plugin>

1 0

r1241 - in topia/trunk/topia-persistence/src/main/java: . org/codelutin/topia/persistence
by chemit＠users.labs.libre-entreprise.org Nov. 28, 2008

Nov. 28, 2008

Author: chemit Date: 2008-11-28 13:13:02 +0000 (Fri, 28 Nov 2008) New Revision: 1241 Removed: topia/trunk/topia-persistence/src/main/java/topia/ Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java Log: not set topiaContext with create method (already done by dao) remove empty directories Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-21 11:54:32 UTC (rev 1240) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-28 13:13:02 UTC (rev 1241) @@ -28,7 +28,7 @@ return contractClass; } - @SuppressWarnings( { "unchecked" }) + @SuppressWarnings({"unchecked"}) public Class<T> getImplementationClass() { if (implementationClass == null) { try { @@ -51,10 +51,7 @@ public T create(TopiaContext ctxt) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); - T newInstance = dao.create(); - // attach topia context to entity (to allow propertyChangeSupport for entity) - ((TopiaEntityAbstract) newInstance).setTopiaContext(ctxt); - return newInstance; + return dao.create(); } public T create(TopiaContext ctxt, Object... properties) @@ -120,7 +117,7 @@ } public T findByProperties(TopiaContext ctxt, String propertyName, - Object value, Object... others) throws TopiaException { + Object value, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findByProperties(propertyName, value, others); } @@ -132,43 +129,43 @@ } public List<T> findAllByProperty(TopiaContext ctxt, String propertyName, - Object value) throws TopiaException { + Object value) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllByProperty(propertyName, value); } public List<T> findAllByProperties(TopiaContext ctxt, String propertyName, - Object value, Object... others) throws TopiaException { + Object value, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllByProperties(propertyName, value, others); } public List<T> findAllByProperties(TopiaContext ctxt, - Map<String, Object> properties) throws TopiaException { + Map<String, Object> properties) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllByProperties(properties); } public T findContainsProperties(TopiaContext ctxt, - Map<String, Collection> properties) throws TopiaException { + Map<String, Collection> properties) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findContainsProperties(properties); } public T findContainsProperties(TopiaContext ctxt, String propertyName, - Collection values, Object... others) throws TopiaException { + Collection values, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findContainsProperties(propertyName, values, others); } public List<T> findAllContainsProperties(TopiaContext ctxt, - Map<String, Collection> properties) throws TopiaException { + Map<String, Collection> properties) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllContainsProperties(properties); } public List<T> findAllContainsProperties(TopiaContext ctxt, - String propertyName, Collection values, Object... others) + String propertyName, Collection values, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllContainsProperties(propertyName, values, others);

1 0

r1240 - topia/trunk/topia-persistence/src/site/rst
by chatellier＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: chatellier Date: 2008-11-21 11:54:32 +0000 (Fri, 21 Nov 2008) New Revision: 1240 Modified: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst Log: Correct configuration Modified: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2008-11-21 11:43:30 UTC (rev 1239) +++ topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2008-11-21 11:54:32 UTC (rev 1240) @@ -39,7 +39,7 @@ <id>Generator</id> <phase>generate-sources</phase> <configuration> - <srcDirZuml>src/main/xmi</srcDirZuml> + <srcDirUml>src/main/xmi</srcDirUml> <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> <fullPackagePath>org.company.package</fullPackagePath> <extractedPackages>org.company.package</extractedPackages>

1 0

r1239 - topia/trunk/topia-persistence/src/site/rst
by chatellier＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: chatellier Date: 2008-11-21 11:43:30 +0000 (Fri, 21 Nov 2008) New Revision: 1239 Added: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst Log: Ajout d'un bout de doc pour configurer maven pour la generation des modeles Added: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst (rev 0) +++ topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2008-11-21 11:43:30 UTC (rev 1239) @@ -0,0 +1,84 @@ +Génération des modèles +---------------------- + +Le module "topia-persistence" de topia est capable de +générer la persistence à partir d'un modèle UML. + +Nous allons détailler ici comme inclure la génération dans le +cycle de compilation maven. + + +Architecture maven +------------------ + ++---------------------------------+-----------------------------------------+ +| src/main/xmi/mymodel.zargo | exemple de modele UML avec argoUML | ++---------------------------------+-----------------------------------------+ +| src/main/xmi/mymodel.properties | fichier de propriétés attaché au modele | ++---------------------------------|-----------------------------------------+ + + +Configuration du pom.xml +------------------------ + +Pour générer les sources dans la phase "generate-source" de maven, et utiliser +les sources générées, et faut configurer le pom. + +Plugin lutingenerator +===================== + +:: + +<plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> +  + <version>0.62</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>src/main/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <fullPackagePath>org.company.package</fullPackagePath> + <extractedPackages>org.company.package</extractedPackages> + <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>target/generated-sources/java</destDirGen> + <defaultPackage>org.company.package</defaultPackage> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> +  + <version>2.1.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</plugin> + + +Dépendances du projet +===================== + +Il faut enfin ajouter "topia-persistence" en dépendance du projet : + +:: + +<dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> +  + <version>2.1.0</version> + <scope>compile</scope> +</dependency> \ No newline at end of file

1 0

r1238 - in topia/trunk: . topia-persistence topia-soa topia-ui
by chatellier＠users.labs.libre-entreprise.org Nov. 19, 2008

Nov. 19, 2008

Author: chatellier Date: 2008-11-19 09:54:33 +0000 (Wed, 19 Nov 2008) New Revision: 1238 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: Fix scm configuration Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -94,6 +94,17 @@  <maven.test.skip>true</maven.test.skip> + +  + <maven.scm.url.child> + http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} + </maven.scm.url.child> + <maven.scm.developerConnection.child> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.developerConnection.child> + <maven.scm.connection.child> + scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.connection.child> </properties>  Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/topia-persistence/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -78,18 +78,6 @@  <packaging>jar</packaging> - - <properties> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} - </maven.scm.url> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.developerConnection> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.connection> - </properties> <build> <plugins> @@ -106,9 +94,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/topia-soa/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -99,18 +99,6 @@  <packaging>jar</packaging> - - <properties> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} - </maven.scm.url> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.developerConnection> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.connection> - </properties> <build> <plugins> @@ -127,9 +115,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/topia-ui/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -51,18 +51,6 @@  <packaging>jar</packaging> - - <properties> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} - </maven.scm.url> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.developerConnection> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.connection> - </properties> <build> <plugins> @@ -79,9 +67,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> </project>

1 0

r1237 - in topia/trunk: topia-soa/src topia-ui/src
by chatellier＠users.labs.libre-entreprise.org Nov. 19, 2008

Nov. 19, 2008

Author: chatellier Date: 2008-11-19 09:54:19 +0000 (Wed, 19 Nov 2008) New Revision: 1237 Added: topia/trunk/topia-soa/src/site/ topia/trunk/topia-ui/src/site/ Log: Add child site structure

1 0