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

r1366 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 11:17:11 +0000 (Thu, 12 Feb 2009) New Revision: 1366 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java Log: pas de generation, si pas d'entite a generer Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java 2009-02-12 09:41:17 UTC (rev 1365) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java 2009-02-12 11:17:11 UTC (rev 1366) @@ -43,6 +43,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.codelutin.generator.models.object.ObjectModelClass; /** * Cette classe est un Generateur qui constitue le point d'entree dans ToPIA. @@ -122,6 +123,15 @@ //On n'empeche pas la génération si le modèle n'est pas valide validateModel(model); + // test before all if there is some entities to generate + List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); + + if (classes.isEmpty()) { + // no entity to generate, can stop safely + log.warn("no entity to generate, " + getClass().getName() + " is skipped"); + return; + } + generatePersistence(model, destDir); } @@ -131,7 +141,7 @@ ObjectModelGenerator generator; if (excludeTemplates.contains(generatorClass.getName())) { // exclude generator - log.info("exclude generateur " + generatorClass); + log.info("exclude generator " + generatorClass); continue; } try {

1 0

r1365 - in topia/trunk/topia-ui/src/test/java/org/codelutin: test/web topiauitest/entities
by chatellier＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: chatellier Date: 2009-02-12 09:41:17 +0000 (Thu, 12 Feb 2009) New Revision: 1365 Removed: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/ Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java Log: Fix javadoc Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java 2009-02-12 09:29:46 UTC (rev 1364) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java 2009-02-12 09:41:17 UTC (rev 1365) @@ -50,8 +50,9 @@ } /** - * @param nom - * @param prenom + * @param id + * @param name + * @param firstName * @param age * @param fonction */ @@ -121,7 +122,7 @@ } /** - * @param prenom the prenom to set + * @param firstName the prenom to set */ public void setFirstName(String firstName) { this.firstName = firstName; Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java 2009-02-12 09:29:46 UTC (rev 1364) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java 2009-02-12 09:41:17 UTC (rev 1365) @@ -33,7 +33,7 @@ private String name; - private String adress; + private String address; /** * @@ -45,27 +45,27 @@ /** * @param id * @param name - * @param adresse + * @param address */ - public Society(String id, String name, String adress) { + public Society(String id, String name, String address) { this(); this.id = id; this.name = name; - this.adress = adress; + this.address = address; } /** - * @return the adresse + * @return the address */ - public String getAdress() { - return adress; + public String getAddress() { + return address; } /** - * @param adresse the adresse to set + * @param address the adresse to set */ - public void setAdress(String adress) { - this.adress = adress; + public void setAddress(String address) { + this.address = address; } /**

1 0

12 Feb '09

Author: chatellier Date: 2009-02-12 09:29:46 +0000 (Thu, 12 Feb 2009) New Revision: 1364 Added: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/ContactDAO.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/SocietyDAO.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/utils/ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/utils/HibernateUtils.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/LoginForm.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ Removed: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/LoginForm.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ Modified: topia/trunk/topia-ui/pom.xml topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/BasePage.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/SessionBean.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/ContextLink.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/Layout.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactForm.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactList.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactView.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyForm.java topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyView.java topia/trunk/topia-ui/src/test/xmi/contact.zargo Log: Suppression de topia-persistence en dependance test scope. Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-12 09:09:04 UTC (rev 1363) +++ topia/trunk/topia-ui/pom.xml 2009-02-12 09:29:46 UTC (rev 1364) @@ -20,13 +20,6 @@ <dependencies> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> </dependency> @@ -41,6 +34,23 @@ <artifactId>tapestry-core</artifactId> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> </dependencies>  @@ -69,37 +79,15 @@ <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> - <configuration> - <testPhase>true</testPhase> - <fullPackagePath>org.codelutin.test</fullPackagePath> - <extractedPackages>org.codelutin.test</extractedPackages> - </configuration> <executions> - <execution> - <id>generate-objectmodel</id> - <phase>generate-test-sources</phase> - <configuration> -  - <defaultPackage>org.codelutin.test</defaultPackage> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> <execution> <id>generate-statemodel</id> <phase>generate-test-sources</phase> <configuration> -  + <testPhase>true</testPhase> + <fullPackagePath>org.codelutin.topiauitest</fullPackagePath> + <extractedPackages>org.codelutin.topiauitest</extractedPackages> <includes>**/*.statemodel</includes> <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> <extraClassPathDirectory>target/classes</extraClassPathDirectory> @@ -111,16 +99,7 @@ </goals> </execution> </executions> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> -  -  - </dependency> - </dependencies> + </plugin> </plugins> Deleted: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/LoginForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/LoginForm.java 2009-02-12 09:09:04 UTC (rev 1363) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/LoginForm.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,88 +0,0 @@ -/* *##% - * Copyright (C) 2006 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package org.codelutin.test.web.pages; - -import org.apache.tapestry5.annotations.Component; -import org.apache.tapestry5.annotations.Persist; -import org.codelutin.test.web.components.Layout; - -/** - * ProjectForm.java - * - * @author chatellier - * @version $Revision: 1.1 $ - * - * Last update : $Date: 2007/05/14 07:56:43 $ - * By : $Author: E023931M $ - * - * Based on authentication tutorial : - * http://new2java.blogspot.com/2007/05/tsa503pageslogin-step-01.html - */ -public class LoginForm { - - /** layout */ - @SuppressWarnings("unused") - @Component - private Layout layout; - - @Persist - private String user; - private String password; - - /** - * Form validation - */ - Object onSuccess() { - - /*if(user.equals("demo") && password.equals("demo")) { - String sessionBeanAttr = "aso:" + SessionBean.class.getName(); - ((SessionBean)_request.getSession(true).getAttribute(sessionBeanAttr)).setLogged(true); - }*/ - - return null; - } - - /** - * @return the password - */ - public String getPassword() { - return password; - } - - /** - * @param password the password to set - */ - public void setPassword(String password) { - this.password = password; - } - - /** - * @return the user - */ - public String getUser() { - return user; - } - - /** - * @param user the user to set - */ - public void setUser(String user) { - this.user = user; - } -} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -0,0 +1,150 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.topiauitest.entities; + +/** + * Contact.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class Contact { + + private String id; + + private String name; + + private String firstName; + + private int age; + + private String fonction; + + private Society society; + + + /** + * + */ + public Contact() { + super(); + } + + /** + * @param nom + * @param prenom + * @param age + * @param fonction + */ + public Contact(String id, String name, String firstName, int age, String fonction) { + this(); + this.id = id; + this.name = name; + this.firstName = firstName; + this.age = age; + this.fonction = fonction; + } + + /** + * @return the age + */ + public int getAge() { + return age; + } + + /** + * @param age the age to set + */ + public void setAge(int age) { + this.age = age; + } + + /** + * @return the fonction + */ + public String getFonction() { + return fonction; + } + + /** + * @param fonction the fonction to set + */ + public void setFonction(String fonction) { + this.fonction = fonction; + } + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * @return the nom + */ + public String getName() { + return name; + } + + /** + * @return the prenom + */ + public String getFirstName() { + return firstName; + } + + /** + * @param prenom the prenom to set + */ + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + /** + * @return the society + */ + public Society getSociety() { + return society; + } + + /** + * @param society the society to set + */ + public void setSociety(Society society) { + this.society = society; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/ContactDAO.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/ContactDAO.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/ContactDAO.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -0,0 +1,92 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ +package org.codelutin.topiauitest.entities; + +import java.util.List; + +import org.codelutin.topiauitest.utils.HibernateUtils; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; + + +/** + * SocietyDAO.java + * + * @author chatellier + * @version $Revision: 1.1 $ + * + * Last update : $Date: 2007/05/14 07:56:43$ + * By : $Author: chatellier $ + */ +public class ContactDAO { + + /** + * Session factory + */ + private SessionFactory sf; + + private Session session; + + public ContactDAO() { + sf = HibernateUtils.getSessionFactory(); + } + + public void beginTransaction() { + session = sf.getCurrentSession(); + session.beginTransaction(); + } + + public void commit() { + session.getTransaction().commit(); + } + + @SuppressWarnings("unchecked") + public Contact getContactById(String ID) { + + List<Contact> lm = (List<Contact>) session + .createCriteria(Contact.class).add(Restrictions.eq("id", ID)).list(); + Contact c = null; + if (lm.size() == 1) { + c = lm.get(0); + } + + return c; + } + + @SuppressWarnings("unchecked") + public List<Contact> getContactList() { + + List<Contact> lc = (List<Contact>) session + .createCriteria(Contact.class).list(); + + return lc; + } + + public void delete(Contact c) { + session.delete(c); + } + + public void create(Contact c) { + session.save(c); + } + + public void update(Contact c) { + session.saveOrUpdate(c); + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -0,0 +1,98 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.topiauitest.entities; + +/** + * Society.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class Society { + + private String id; + + private String name; + + private String adress; + + /** + * + */ + public Society() { + super(); + } + + /** + * @param id + * @param name + * @param adresse + */ + public Society(String id, String name, String adress) { + this(); + this.id = id; + this.name = name; + this.adress = adress; + } + + /** + * @return the adresse + */ + public String getAdress() { + return adress; + } + + /** + * @param adresse the adresse to set + */ + public void setAdress(String adress) { + this.adress = adress; + } + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/SocietyDAO.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/SocietyDAO.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/SocietyDAO.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -0,0 +1,93 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ +package org.codelutin.topiauitest.entities; + +import java.util.List; + +import org.codelutin.topiauitest.utils.HibernateUtils; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; + + +/** + * SocietyDAO.java + * + * @author chatellier + * @version $Revision: 1.1 $ + * + * Last update : $Date: 2007/05/14 07:56:43$ + * By : $Author: chatellier $ + */ +public class SocietyDAO { + + /** + * Session factory + */ + private SessionFactory sf; + + private Session session; + + public SocietyDAO() { + sf = HibernateUtils.getSessionFactory(); + } + + public void beginTransaction() { + session = sf.getCurrentSession(); + session.beginTransaction(); + } + + public void commit() { + session.getTransaction().commit(); + } + + @SuppressWarnings("unchecked") + public Society getSocietyById(String ID) { + + List<Society> lm = (List<Society>) session + .createCriteria(Society.class).add(Restrictions.eq("id", ID)).list(); + Society s = null; + if (lm.size() == 1) { + s = lm.get(0); + } + + return s; + } + + public void delete(Society s) { + session.delete(s); + } + + public void create(Society s) { + session.save(s); + } + + public void update(Society s) { + session.saveOrUpdate(s); + } + + /** + * @return + */ + @SuppressWarnings("unchecked") + public List<Society> getSocietiesList() { + List<Society> lc = (List<Society>) session + .createCriteria(Society.class).list(); + return lc; + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/utils/HibernateUtils.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/utils/HibernateUtils.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/utils/HibernateUtils.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -0,0 +1,52 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.topiauitest.utils; + +import org.hibernate.SessionFactory; +import org.hibernate.cfg.Configuration; + +public class HibernateUtils { + + private static final SessionFactory sessionFactory; + + static { + try { + Configuration cfg = new Configuration(); + + cfg.configure("hibernate.cfg.xml"); + + // creer le schema en base + // ca creer la base + //SchemaExport schemaExport = new SchemaExport(cfg); + //schemaExport.create(false, true); + + // Create the SessionFactory from hibernate.cfg.xml + sessionFactory = cfg.buildSessionFactory(); + + } catch (Throwable ex) { + // Make sure you log the exception, as it might be swallowed + System.err.println("Initial SessionFactory creation failed." + ex); + throw new ExceptionInInitializerError(ex); + } + } + + public static SessionFactory getSessionFactory() { + return sessionFactory; + } +} Copied: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base (from rev 1362, topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base) Property changes on: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base ___________________________________________________________________ Name: svn:mergeinfo + Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/BasePage.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/BasePage.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/BasePage.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.base; +package org.codelutin.topiauitest.web.base; /** Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/SessionBean.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/SessionBean.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/SessionBean.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.base; +package org.codelutin.topiauitest.web.base; import java.io.Serializable; Copied: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components (from rev 1362, topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components) Property changes on: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components ___________________________________________________________________ Name: svn:mergeinfo + Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/ContextLink.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/ContextLink.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/ContextLink.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.components; +package org.codelutin.topiauitest.web.components; import org.apache.tapestry5.MarkupWriter; import org.apache.tapestry5.annotations.Parameter; Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/Layout.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/Layout.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/Layout.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.components; +package org.codelutin.topiauitest.web.components; import java.util.Locale; Copied: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/LoginForm.java (from rev 1362, topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/LoginForm.java) =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/LoginForm.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/LoginForm.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -0,0 +1,88 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.topiauitest.web.pages; + +import org.apache.tapestry5.annotations.Component; +import org.apache.tapestry5.annotations.Persist; +import org.codelutin.topiauitest.web.components.Layout; + +/** + * ProjectForm.java + * + * @author chatellier + * @version $Revision: 1.1 $ + * + * Last update : $Date: 2007/05/14 07:56:43 $ + * By : $Author: E023931M $ + * + * Based on authentication tutorial : + * http://new2java.blogspot.com/2007/05/tsa503pageslogin-step-01.html + */ +public class LoginForm { + + /** layout */ + @SuppressWarnings("unused") + @Component + private Layout layout; + + @Persist + private String user; + private String password; + + /** + * Form validation + */ + Object onSuccess() { + + /*if(user.equals("demo") && password.equals("demo")) { + String sessionBeanAttr = "aso:" + SessionBean.class.getName(); + ((SessionBean)_request.getSession(true).getAttribute(sessionBeanAttr)).setLogged(true); + }*/ + + return null; + } + + /** + * @return the password + */ + public String getPassword() { + return password; + } + + /** + * @param password the password to set + */ + public void setPassword(String password) { + this.password = password; + } + + /** + * @return the user + */ + public String getUser() { + return user; + } + + /** + * @param user the user to set + */ + public void setUser(String user) { + this.user = user; + } +} Property changes on: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/LoginForm.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement (from rev 1362, topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement) Property changes on: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement ___________________________________________________________________ Name: svn:mergeinfo + Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactForm.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactForm.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,12 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.pages.contactManagement; +package org.codelutin.topiauitest.web.pages.contactManagement; import java.util.ArrayList; import java.util.List; -import org.apache.tapestry5.Link; import org.apache.tapestry5.OptionGroupModel; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; @@ -29,16 +28,10 @@ import org.apache.tapestry5.ValueEncoder; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.internal.OptionModelImpl; -import org.codelutin.test.TapestryTestDAOHelper; -import org.codelutin.test.entities.Contact; -import org.codelutin.test.entities.ContactDAO; -import org.codelutin.test.entities.ContactImpl; -import org.codelutin.test.entities.Society; -import org.codelutin.test.entities.SocietyDAO; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; +import org.codelutin.topiauitest.entities.Contact; +import org.codelutin.topiauitest.entities.ContactDAO; +import org.codelutin.topiauitest.entities.Society; +import org.codelutin.topiauitest.entities.SocietyDAO; /** @@ -66,7 +59,7 @@ public ContactForm() { societyDao = new SocietyDAO(); contactDao = new ContactDAO(); - contact = new ContactImpl(); + contact = new Contact(); use_for_new = true; } @@ -107,21 +100,16 @@ public Object onSubmit() { // store contact // chech if update !!! - - try { - TopiaContext context = TopiaContextFactory.getContext(); - // FIXME get proper DAO - contact.setSociety(society); - if(use_for_new) { - contactDao.create(contact); - } - else { - contactDao.update(contact); - } - context.commitTransaction(); - } catch (TopiaException e) { - // TODO log - } + + contactDao.beginTransaction(); + contact.setSociety(society); + if(use_for_new) { + contactDao.create(contact); + } + else { + contactDao.update(contact); + } + contactDao.commit(); return super.onActionFromContactStore(); } @@ -131,7 +119,7 @@ */ public void setEmptyContact() { - contact = new ContactImpl(); + contact = new Contact(); use_for_new = true; } @@ -164,18 +152,9 @@ * @return */ public List<Society> getSocieties() { - - List<Society> lp = null; - - try { - TopiaContext context = TopiaContextFactory.getContext(); - context.beginTransaction(); - lp = societyDao.findAll(); - context.commitTransaction(); - } catch (TopiaException e) { - // TODO log - } - + societyDao.beginTransaction(); + List<Society> lp = societyDao.getSocietiesList(); + societyDao.commit(); return lp; } Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactList.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactList.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactList.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.pages.contactManagement; +package org.codelutin.topiauitest.web.pages.contactManagement; import java.util.List; -import org.codelutin.test.entities.Contact; -import org.codelutin.test.entities.ContactDAO; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; +import org.codelutin.topiauitest.entities.Contact; +import org.codelutin.topiauitest.entities.ContactDAO; /** * ContactList.java @@ -71,16 +68,9 @@ * @return */ public List<Contact> getContacts() { - List<Contact> lc = null; - try { - TopiaContext context = TopiaContextFactory.getContext(); - context.beginTransaction(); - lc = dao.findAll(); - context.commitTransaction(); - } catch (TopiaException e) { - // TODO log - } - + dao.beginTransaction(); + List<Contact> lc = dao.getContactList(); + dao.commit(); return lc; } @@ -97,17 +87,10 @@ public Object onActionFromViewer(String id) { - Contact c = null; - - try { - TopiaContext context = TopiaContextFactory.getContext(); - context.beginTransaction(); - c = dao.findByTopiaId(id); - c.getSociety().getName(); // lazy exception - context.commitTransaction(); - } catch (TopiaException e) { - // TODO log - } + dao.beginTransaction(); + Contact c = dao.getContactById(id); + c.getSociety().getName(); // lazy exception + dao.commit(); getContactView().setContact(c); Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactView.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactView.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactView.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,14 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.pages.contactManagement; +package org.codelutin.topiauitest.web.pages.contactManagement; import org.apache.tapestry5.annotations.Persist; -import org.codelutin.test.entities.Contact; -import org.codelutin.test.entities.ContactDAO; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; +import org.codelutin.topiauitest.entities.Contact; +import org.codelutin.topiauitest.entities.ContactDAO; /** * ContactView.java @@ -84,14 +81,9 @@ @Override public Object onActionFromDelete() { - try { - TopiaContext context = TopiaContextFactory.getContext(); - context.beginTransaction(); - contactDAO.delete(contact); - context.commitTransaction(); - } catch (TopiaException e) { - // TODO log - } + contactDAO.beginTransaction(); + contactDAO.delete(contact); + contactDAO.commit(); return super.onActionFromDelete(); } Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyForm.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyForm.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,15 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.pages.contactManagement; +package org.codelutin.topiauitest.web.pages.contactManagement; import org.apache.tapestry5.annotations.Persist; -import org.codelutin.test.entities.Society; -import org.codelutin.test.entities.SocietyDAO; -import org.codelutin.test.entities.SocietyImpl; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; +import org.codelutin.topiauitest.entities.Society; +import org.codelutin.topiauitest.entities.SocietyDAO; /** * SocietyForm.java @@ -47,7 +43,7 @@ public SocietyForm() { super(); - society = new SocietyImpl(); + society = new Society(); societyDAO = new SocietyDAO(); } @@ -70,7 +66,7 @@ * */ public void setEmptySociety() { - society = new SocietyImpl(); + society = new Society(); use_for_new = true; } @@ -85,17 +81,12 @@ public Object onSubmit() { - try { - TopiaContext context = TopiaContextFactory.getContext(); - context.beginTransaction(); - if(use_for_new) - societyDAO.create(society); - else - societyDAO.update(society); - context.commitTransaction(); - } catch (TopiaException e) { - // TODO log - } + societyDAO.beginTransaction(); + if(use_for_new) + societyDAO.create(society); + else + societyDAO.update(society); + societyDAO.commit(); return super.onActionFromSocietyStore(); } Modified: topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyView.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyView.java 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyView.java 2009-02-12 09:29:46 UTC (rev 1364) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 Code Lutin + * Copyright (C) 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.test.web.pages.contactManagement; +package org.codelutin.topiauitest.web.pages.contactManagement; import org.apache.tapestry5.annotations.Persist; -import org.codelutin.test.entities.Society; +import org.codelutin.topiauitest.entities.Society; /** * SocietyList.java Modified: topia/trunk/topia-ui/src/test/xmi/contact.zargo =================================================================== (Binary files differ)

1 0

r1363 - topia/trunk/topia-persistence/src/site
by jcouteau＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: jcouteau Date: 2009-02-12 09:09:04 +0000 (Thu, 12 Feb 2009) New Revision: 1363 Modified: topia/trunk/topia-persistence/src/site/site.xml Log: Add entries in topia-persistence menu for site Modified: topia/trunk/topia-persistence/src/site/site.xml =================================================================== --- topia/trunk/topia-persistence/src/site/site.xml 2009-02-12 00:15:30 UTC (rev 1362) +++ topia/trunk/topia-persistence/src/site/site.xml 2009-02-12 09:09:04 UTC (rev 1363) @@ -53,6 +53,11 @@ <item name="Isolation" href="Isolation.html"/> <item name="Schema migration" href="SchemaMigration.html"/> <item name="Securité" href="security.html"/> + <item name="How-to" href="howto.html"/> + <item name="Génération des modèles" href="ModelGeneration.html"/> + <item name="TopiaContextFactory" href="Devel.html"/> + <item name="FAQ" href="FAQ.html"/> + <item name="Projets similaires" href="project.html"/> </menu> <menu ref="reports"/>

1 0

r1362 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:15:30 +0000 (Thu, 12 Feb 2009) New Revision: 1362 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java Log: reformat + javadoc Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-12 00:03:21 UTC (rev 1361) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-12 00:15:30 UTC (rev 1362) @@ -99,7 +99,8 @@ }*/ List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); /*{ /** - *) + * no instance for this helper + *) protected <%=daoClazzName%>() { } }*/ @@ -109,8 +110,8 @@ String clazzName = clazz.getName(); /*{ public static <%=clazzFQN%>DAO get<%=clazzName%>DAO(TopiaContext context) throws TopiaException { - TopiaContextImplementor ci = (TopiaContextImplementor)context; - <%=clazzFQN%>DAO result = (<%=clazzFQN%>DAO)ci.getDAO(<%=clazzFQN%>.class); + TopiaContextImplementor ci = (TopiaContextImplementor) context; + <%=clazzFQN%>DAO result = (<%=clazzFQN%>DAO) ci.getDAO(<%=clazzFQN%>.class); return result; } }*/ @@ -118,7 +119,7 @@ /*{ @SuppressWarnings({"unchecked"}) public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(TopiaContext context, Class<T> klass) throws TopiaException { - TopiaContextImplementor ci = (TopiaContextImplementor)context; + TopiaContextImplementor ci = (TopiaContextImplementor) context; <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); D dao = (D) ci.getDAO(constant.getContractClass()); return dao; @@ -173,7 +174,7 @@ } /* - * Enumeration of all types of entitties dealed by this helper. + * Enumeration of all types of entities managed by this helper. *) public enum <%=entityEnumName%> { }*/ @@ -214,7 +215,7 @@ try { implementationClass = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); } catch (ClassNotFoundException e) { - throw new RuntimeException("could not find class "+implementationFQN); + throw new RuntimeException("could not find class " + implementationFQN); } } return implementationClass; @@ -249,8 +250,10 @@ } else { /*{ /** - * @eprecated (prefer use {@link #getImplementationClassesAsString()} - *) + * use {@link #getImplementationClassesAsString()} + * + * @deprecated (will be removed soon). + *) public static final String entitiesList = "" + }*/

1 0

r1361 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:03:21 +0000 (Thu, 12 Feb 2009) New Revision: 1361 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java Log: the DAOHelper now integrates the EntityEnum Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java 2009-02-12 00:02:35 UTC (rev 1360) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java 2009-02-12 00:03:21 UTC (rev 1361) @@ -139,7 +139,7 @@ public void delete(E entity) throws TopiaException { }*/ String modelName = GeneratorUtil.capitalize(model.getName()); - String providerFQN = getProperty("defaultPackage") + "." + modelName + "EntityEnum.getImplementationClass"; + String providerFQN = getProperty("defaultPackage") + "." + modelName + "DAOHelper.getImplementationClass"; for (ObjectModelAttribute attr : clazz.getAttributes()) { String attrType = attr.getType(); String reverseAttrName = attr.getReverseAttributeName(); Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-12 00:02:35 UTC (rev 1360) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-12 00:03:21 UTC (rev 1361) @@ -46,10 +46,12 @@ /** * Ce generateur permet d'avoir une classe permettant de recuperer les DAO * sans cast. + * + * La classe générée contient aussi une énumération nommée <code>EntityEnum</code> qui permet + * d'avoir facilement les types d'entités gérées par ce dao. + * * @author poussin - * @see Deprecated you should prefer use the {@link EntityEnumGenerator} */ -@Deprecated public class DAOHelperGenerator extends ObjectModelGenerator { private Log log = LogFactory.getLog(DAOHelperGenerator.class); @@ -81,28 +83,179 @@ }*/ } String modelName = GeneratorUtil.capitalize(model.getName()); + String daoClazzName = modelName+"DAOHelper"; + String entityEnumName = modelName+"EntityEnum"; + /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.TopiaContext; +import org.codelutin.topia.TopiaException; import org.codelutin.topia.framework.TopiaContextImplementor; -import org.codelutin.topia.TopiaException; +import org.codelutin.topia.persistence.TopiaDAO; +import org.codelutin.topia.persistence.TopiaEntity; -public class <%=modelName%>DAOHelper { +public class <%=daoClazzName%> { }*/ + List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); +/*{ /** + *) + protected <%=daoClazzName%>() { + } +}*/ + + for (ObjectModelClass clazz : classes) { + String clazzFQN = clazz.getQualifiedName(); + String clazzName = clazz.getName(); +/*{ + public static <%=clazzFQN%>DAO get<%=clazzName%>DAO(TopiaContext context) throws TopiaException { + TopiaContextImplementor ci = (TopiaContextImplementor)context; + <%=clazzFQN%>DAO result = (<%=clazzFQN%>DAO)ci.getDAO(<%=clazzFQN%>.class); + return result; + } +}*/ + } +/*{ + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(TopiaContext context, Class<T> klass) throws TopiaException { + TopiaContextImplementor ci = (TopiaContextImplementor)context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + D dao = (D) ci.getDAO(constant.getContractClass()); + return dao; + } + + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(TopiaContext context, T entity) throws TopiaException { + TopiaContextImplementor ci = (TopiaContextImplementor)context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(entity); + D dao = (D) ci.getDAO(constant.getContractClass()); + return dao; + } + + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity> Class<T> getContractClass(Class<T> klass) throws TopiaException { + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getContractClass(); + } + + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity> Class<T> getImplementationClass(Class<T> klass) throws TopiaException { + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getImplementationClass(); + } + + @SuppressWarnings({"unchecked"}) + public static Class<? extends TopiaEntity>[] getContractClasses() { + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) java.lang.reflect.Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getContractClass(); + } + return result; + } + + @SuppressWarnings({"unchecked"}) + public static Class<? extends TopiaEntity>[] getImplementationClasses() { + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) java.lang.reflect.Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getImplementationClass(); + } + return result; + } + + public static String getImplementationClassesAsString() { + StringBuilder buffer = new StringBuilder(); + for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { + buffer.append(',').append(aClass.getName()); + } + return buffer.substring(1); + } + + /* + * Enumeration of all types of entitties dealed by this helper. + *) + public enum <%=entityEnumName%> { +}*/ + for (Iterator<ObjectModelClass> i=classes.iterator(); i.hasNext();) { + ObjectModelClass clazz = i.next(); + String clazzFQN = clazz.getQualifiedName(); + String clazzName = clazz.getName(); +/*{ + <%=clazzName%>(<%=clazzFQN%>.class)<%=(i.hasNext() ? "," : ";")%>}*/ + } +/*{ + + /** the contract of the entity *) + private Class<? extends TopiaEntity> contractClass; + + /** the fully qualified name of the implementation of the entity *) + private String implementationFQN; + + /** the implementation class of the entity (will be lazy computed at runtime)*) + private Class<? extends TopiaEntity> implementationClass; + + <%=entityEnumName%>(Class<? extends TopiaEntity > contractClass) { + this.contractClass = contractClass; + this.implementationFQN = contractClass.getName()+"Impl"; + } + + public Class<? extends TopiaEntity> getContractClass() { + return contractClass; + } + + public String getImplementationFQN() { + return implementationFQN; + } + + @SuppressWarnings({"unchecked"}) + public Class<? extends TopiaEntity> getImplementationClass() { + if (implementationClass == null) { + try { + implementationClass = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); + } catch (ClassNotFoundException e) { + throw new RuntimeException("could not find class "+implementationFQN); + } + } + return implementationClass; + } + + public static <%=entityEnumName%> valueOf(TopiaEntity entity) { + return valueOf(entity.getClass()); + } + + public static <%=entityEnumName%> valueOf(Class<?> klass) { + if (klass.isInterface()) { + return <%=entityEnumName%>.valueOf(klass.getSimpleName()); + } + for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { + if (entityEnum.getContractClass().isAssignableFrom(klass)) { + //todo check it works for inheritance + return entityEnum; + } + } + throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + java.util.Arrays.toString(<%=entityEnumName%>.values())); + } + } +}*/ String entitiesList = ""; - List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); if (classes.isEmpty()) { /*{ + /** + * @eprecated (prefer use {@link #getImplementationClassesAsString()} + *) public static final String entitiesList = ""; }*/ } else { /*{ + /** + * @eprecated (prefer use {@link #getImplementationClassesAsString()} + *) public static final String entitiesList = "" + }*/ for (Iterator<ObjectModelClass> i=classes.iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); + ObjectModelClass clazz = i.next(); String doType = TopiaGeneratorUtil.getDOType(clazz, model); entitiesList += doType + (i.hasNext()?",":""); /*{ "<%=doType%><%=(i.hasNext()?",\" +":"\";")%> @@ -112,25 +265,9 @@ if (log.isDebugEnabled()) { log.debug("Full entities list : " + entitiesList); } -/*{ /** - *) - protected <%=modelName%>DAOHelper() { - } -}*/ - for (ObjectModelClass clazz : classes) { - String clazzFQN = clazz.getQualifiedName(); - String clazzName = clazz.getName(); /*{ - static public <%=clazzFQN%>DAO get<%=clazzName%>DAO(TopiaContext context) throws TopiaException { - TopiaContextImplementor ci = (TopiaContextImplementor)context; - <%=clazzFQN%>DAO result = (<%=clazzFQN%>DAO)ci.getDAO(<%=clazzFQN%>.class); - return result; - } +} //<%=daoClazzName%> }*/ - } -/*{ -} //<%=modelName%>DAOHelper -}*/ } } //DAOHelperGenerator

1 0

r1360 - in topia/trunk/topia-persistence/src/main/java/org/codelutin/topia: generator persistence
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:02:35 +0000 (Thu, 12 Feb 2009) New Revision: 1360 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java Log: mark as deprecated Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2009-02-12 00:02:03 UTC (rev 1359) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2009-02-12 00:02:35 UTC (rev 1360) @@ -44,6 +44,7 @@ * @author chemit * @see org.codelutin.topia.persistence.TopiaEntityEnumEntry */ +@Deprecated public class EntityEnumGenerator extends ObjectModelGenerator { private static Log log = LogFactory.getLog(EntityEnumGenerator.class); @@ -91,7 +92,9 @@ import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.persistence.TopiaEntityEnumEntry; - +/** + @deprecated <%=className%> will be removed in future ToPIA version + *) @SuppressWarnings({"unchecked"}) public enum <%=className%> { }*/ Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2009-02-12 00:02:03 UTC (rev 1359) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2009-02-12 00:02:35 UTC (rev 1360) @@ -77,20 +77,21 @@ }*/ } String modelName = GeneratorUtil.capitalize(model.getName()); + String clazzName = modelName + "EntityProvider"; + /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.persistence.TopiaEntity; import java.util.Map; import java.util.HashMap; -import java.util.Collections; /** - * <%=modelName%>EntityProvider. + * <%=clazzName%> * - * @deprecated <%=modelName%>EntityProvider will be removed in future ToPIA version + * @deprecated <%=clazzName%> will be removed in future ToPIA version *) @SuppressWarnings({"unchecked"}) -public class <%=modelName%>EntityProvider { +public class <%=clazzName%> { protected static Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> cache; @@ -134,16 +135,16 @@ throw new RuntimeException("could not find entity implementation class " + implFQN); } } - <%=modelName%>EntityProvider.cache = Collections.unmodifiableMap(cache); + <%=clazzName%>.cache = java.util.Collections.unmodifiableMap(cache); } /** * should have no instance *) - protected <%=modelName%>EntityProvider() { + protected <%=clazzName%>() { } -} //<%=modelName%>EntityProvider +} //<%=clazzName%> }*/ } 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 2009-02-12 00:02:03 UTC (rev 1359) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2009-02-12 00:02:35 UTC (rev 1360) @@ -8,7 +8,11 @@ import java.util.List; import java.util.Map; -/** @author chemit */ +/** + * @deprecated This class is used in deprecated generator {@link org.codelutin.topia.generator.EntityEnumGenerator} + * + * @author chemit */ +@Deprecated public class TopiaEntityEnumEntry<T extends TopiaEntity> implements java.io.Serializable {

1 0

r1359 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:02:03 +0000 (Thu, 12 Feb 2009) New Revision: 1359 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java Log: use foreach Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-02-11 19:58:38 UTC (rev 1358) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-02-12 00:02:03 UTC (rev 1359) @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,9 +93,7 @@ Collection cValue = (Collection)value; if(cValue != null && !cValue.isEmpty()) { - Iterator itOnValues = cValue.iterator(); - while(itOnValues.hasNext()) { - Object currentValue = itOnValues.next(); + for (Object currentValue : cValue) { visit(e, type, currentValue); } }

1 0

r1358 - in topia/trunk: . topia-persistence topia-soa topia-ui
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 19:58:38 +0000 (Wed, 11 Feb 2009) New Revision: 1358 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: suppression du plugin build-helper-maven-plugin car generator gere desormais la generation en phase test (utiliser la propriete testPhase) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -217,33 +217,10 @@ <srcDirZuml>src/test/xmi</srcDirZuml> <srcXmiDest>${test.gen.dir}/xmi/</srcXmiDest> <srcGenDest>${test.gen.dir}/models/</srcGenDest> - <destDirGen>${test.gen.dir}/java</destDirGen> -  + <destDirGen>${test.gen.dir}/java</destDirGen> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>process-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${test.gen.dir}/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </pluginManagement> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-persistence/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -100,18 +100,7 @@ <artifactId>maven-processor-plugin</artifactId> </plugin> -  <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> @@ -120,6 +109,7 @@ <id>Test Generator</id> <phase>generate-test-sources</phase> <configuration> + <testPhase>true</testPhase> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> <fullPackagePath>org.codelutin.topia</fullPackagePath> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-soa/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -42,52 +42,35 @@ <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-server</artifactId> -  </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> -  </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> -  </dependency> <dependency> <groupId>org.codehaus.xfire</groupId> <artifactId>xfire-java5</artifactId> -  -  -  </dependency>  <dependency> <groupId>jetty</groupId> <artifactId>jetty</artifactId> -  </dependency>  <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> -  </dependency> + </dependencies>  @@ -112,23 +95,7 @@ <artifactId>maven-processor-plugin</artifactId> </plugin> -  <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>process-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> @@ -137,6 +104,7 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> + <testPhase>true</testPhase> <fullPackagePath>org.codelutin.soatest</fullPackagePath> <extractedPackages>org.codelutin.soatest</extractedPackages> <defaultPackage>org.codelutin.soatest</defaultPackage> @@ -153,7 +121,7 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> <scope>compile</scope> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-ui/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -60,18 +60,7 @@ <plugins> -  <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-processor-plugin</artifactId> </plugin> @@ -80,16 +69,22 @@ <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> + <configuration> + <testPhase>true</testPhase> + <fullPackagePath>org.codelutin.test</fullPackagePath> + <extractedPackages>org.codelutin.test</extractedPackages> + </configuration> <executions> <execution> <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> +  + <defaultPackage>org.codelutin.test</defaultPackage> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <defaultPackage>org.codelutin.test</defaultPackage> </configuration> <goals> <goal>zargo2xmi</goal> @@ -102,8 +97,9 @@ <id>generate-statemodel</id> <phase>generate-test-sources</phase> <configuration> +  <includes>**/*.statemodel</includes> <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> <extraClassPathDirectory>target/classes</extraClassPathDirectory> @@ -121,7 +117,8 @@ <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> - <scope>runtime</scope> +  +  </dependency> </dependencies> </plugin>

1 0

r1357 - topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 19:57:01 +0000 (Wed, 11 Feb 2009) New Revision: 1357 Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java Log: pourles tests, il faut que la base estun nom different a chaque fois (car quand on fait un mvn install iste ?\195?\167a peut planter lors de la seconde execution des tests...) Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java 2009-02-11 19:53:42 UTC (rev 1356) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java 2009-02-11 19:57:01 UTC (rev 1357) @@ -69,7 +69,7 @@ config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); config.setProperty(Environment.DIALECT,"org.hibernate.dialect.H2Dialect"); config.setProperty(Environment.DRIVER,"org.h2.Driver"); - config.setProperty(Environment.URL,"jdbc:h2:file:/tmp/db/data"); + config.setProperty(Environment.URL, "jdbc:h2:file:/tmp/" + TopiaTestCase.class + "/db/data_" + System.currentTimeMillis()); } /**

1 0